X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=parrot.py;h=17a24a0264c17758dfdd6ee9aff83a8a867678c3;hb=a77f390a0d8cc9a4d4e0f66c012c05c1ad189f30;hp=01ed82adecb1070b80b7d6c86928723b6ba46a2f;hpb=f86d3f62f5e99220deeba536d62eb710df78f333;p=bots%2Fparrot.git

diff --git a/parrot.py b/parrot.py
index 01ed82a..17a24a0 100755
--- a/parrot.py
+++ b/parrot.py
@@ -161,11 +161,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):
@@ -349,6 +362,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:
@@ -400,6 +417,10 @@ 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)
         else:
             # Vu que ce bot est prévu pour parser des quotes il va falloir bosser ici
             match = quote_pattern.match(message)
@@ -445,7 +466,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)