X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=parrot.py;h=d3039a4a432711ec2c4a79683e03a184a84d1df2;hb=a140e55d58b6af4b50c1cd83a78aa387f78e1a80;hp=236cf1b225f767e2d128052143a8c6f51ada2658;hpb=e4a8875d6a305772ae5fa07781e786e6026dd0d9;p=bots%2Fparrot.git

diff --git a/parrot.py b/parrot.py
index 236cf1b..d3039a4 100755
--- a/parrot.py
+++ b/parrot.py
@@ -26,7 +26,8 @@ import errors
 #: Module de gestion des quotes
 import quotes
 
-quote_pattern = re.compile(config.quote_regexp)
+# Je veux pouvoir éditer ce que crée ce bot
+os.umask(002)
 
 def get_config_logfile(serveur):
     """Renvoie le nom du fichier de log en fonction du ``serveur`` et de la config."""
@@ -85,7 +86,8 @@ class Parrot(ircbot.SingleServerIRCBot):
         self.last_perdu = 0
         
         self.quotedb = quotes.QuoteDB()
-        self.quotedb.load()
+        self.reload_quotes()
+
     
     ### Utilitaires
     def _getnick(self):
@@ -122,10 +124,15 @@ class Parrot(ircbot.SingleServerIRCBot):
         quit_message = random.choice(config.quit_messages)
         self.die(msg=quit_message.encode("utf8"))
     
+    def reload_quotes(self):
+        """ Recharge la base de données des quotes et recompile la regexp de quote """
+        self.quotedb.load()
+        self.quote_pattern = re.compile(config.quote_regexp, flags=re.UNICODE)
+
     def execute_reload(self, auteur=None):
         """Recharge la config."""
         reload(config)
-        isit.regexp_compile()
+        self.reload_quotes()
         if auteur in [None, "SIGHUP"]:
             towrite = "Config reloaded" + " (SIGHUP received)" * (auteur == "SIGHUP")
             for to in config.report_bugs_to:
@@ -155,11 +162,24 @@ class Parrot(ircbot.SingleServerIRCBot):
             self.serv.privmsg(place, message)
         log(self.serveur, place, auteur, something + "%r" % params + ("[successful]" if success else "[failed]"))
     
-    ### Gestion des quotes
-    def enregistrer(self, author, content, timestamp):
-        
-        quotes.save(self.quotelist, config.quote_file)
     
+    def acknowledge(self, asked_by, asked_where, message):
+        """Répond quelque chose au demandeur d'une action.
+           ``asked_where=None`` signifie en privé."""
+        if asked_where is None:
+            self.serv.privmsg(asked_by, message)
+        else:
+            self.serv.privmsg(asked_where, "%s: %s" % (asked_by, message))
+    
+    def dump(self, asked_by, asked_where=None):
+        """Dumpe les quotes.  ``asked_where=None`` signifie en privé."""
+        quotes.dump(self.quotedb)
+        self.acknowledge(asked_by, asked_where, "Quotes dumpées")
+    
+    def restore(self, asked_by, asked_where=None):
+        """Restaure les quotes à partir du dump.  ``asked_where=None`` signifie en privé."""
+        self.quotedb = quotes.restore()
+        self.acknowledge(asked_by, asked_where, "Quotes restaurées à partir du dump (pas de backup effectué).")
     
     ### Surcharge des events du Bot
     def on_welcome(self, serv, ev):
@@ -343,6 +363,10 @@ class Parrot(ircbot.SingleServerIRCBot):
                 serv.privmsg(auteur, " ".join(self.overops))
             else:
                 notunderstood = True
+        elif cmd == u"dump" and auteur in self.ops:
+            self.dump(asked_by=auteur)
+        elif cmd == u"restore" and auteur in self.overops:
+            self.restore(asked_by=auteur)
         else:
             notunderstood = True
         if notunderstood:
@@ -394,9 +418,15 @@ class Parrot(ircbot.SingleServerIRCBot):
     
             elif cmd in [u"ping"] and not canal in self.quiet_channels:
                 serv.privmsg(canal, "%s: pong" % (auteur))
+            elif cmd in [u"dump"]:
+                self.dump(asked_by=auteur, asked_where=canal)
+            elif cmd in [u"restore"] and auteur in self.overops:
+                self.restore(asked_by=auteur, asked_where=canal)
+            elif cmd in [u"display"]:
+                self.serv.privmsg(canal, "%s: %s" % (auteur, config.quote_display_url.encode("utf-8")))
         else:
             # Vu que ce bot est prévu pour parser des quotes il va falloir bosser ici
-            match = quote_pattern.match(message)
+            match = self.quote_pattern.match(message)
             if match:
                 d = match.groupdict()
                 if self.quotedb.store(d["author"], d["content"]):
@@ -416,6 +446,15 @@ class Parrot(ircbot.SingleServerIRCBot):
                         serv.privmsg(canal, (u"Pas de quote de %s en mémoire." % author).encode("utf-8"))
                         return
                     serv.privmsg(canal, str(q))
+            elif message.startswith(u"!author"):
+                words = message.split()
+                cmd = words[0].lstrip("!")
+                regexp = cmd in ["author-r", "authorreg", "author-reg", "author-regex"]:
+                search = u" ".join(words[1:])
+                authors = self.quotedb.search_authors(search, regexp)
+                if len(authors) > config.search_max_authors:
+                    authors = authors[:config.search_max_authors+1] + [unicode(len(authors) - config.search_max_authors)]
+                serv.privmsg(canal, "%s: %s" % (auteur, (u" ".join(authors)).encode("utf-8")))
 
     def on_action(self, serv, ev):
         """À la réception d'une action."""
@@ -439,7 +478,7 @@ class Parrot(ircbot.SingleServerIRCBot):
         victime = ev.arguments()[0]
         raison = ev.arguments()[1]
         if victime == self.nick:
-            log(self.serveur, u"%s kické de %s par %s (raison : %s)" % (victime, channel.decode("utf-8"), auteur, raison))
+            log(self.serveur, "%s kické de %s par %s (raison : %s)" % (victime, channel, auteur, raison))
             time.sleep(2)
             serv.join(channel)