X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fsaturnin.git;a=blobdiff_plain;f=saturnin.py;h=848019c2ea51a4001b4295f0862eb468ddb1fae8;hp=a99fb15cc175011ac8b36d11d8c6a3625bab98a5;hb=HEAD;hpb=b216d6663a2ed6b814b5b3b43867653aa959cca8

diff --git a/saturnin.py b/saturnin.py
index a99fb15..848019c 100755
--- a/saturnin.py
+++ b/saturnin.py
@@ -6,8 +6,6 @@
 # Un bot IRC pour remplacer le canard.
 # parce que le canard, c'est le bien et que braice ne pong pas
 
-import irclib
-import ircbot
 import threading
 import random
 import time
@@ -15,8 +13,15 @@ import socket, ssl, json
 import pickle
 import re
 import os
+import signal
+import sys
 from commands import getstatusoutput as ex
 
+# Oui, j'ai recodé ma version d'irclib pour pouvoir rattrapper les SIGHUP
+sys.path.insert(0, "/home/vincent/scripts/python-myirclib")
+import irclib
+import ircbot
+
 # on récupère la config
 import config
 
@@ -52,6 +57,18 @@ regexp_pan = re.compile(u".*(" + "|".join(config.killwords) + u").*")
 def is_pan(chain):
     return regexp_pan.match(unicode(chain,"utf8").lower())
 
+def ignore_event(serv, ev):
+    """Retourne ``True`` si il faut ignorer cet évènement."""
+    for (blackmask, exceptmask) in config.blacklisted_masks:
+        usermask = ev.source()
+        if exceptmask is None:
+            exceptit = False
+        else:
+            exceptit = bool(irclib.mask_matches(usermask, exceptmask))
+        blackit = bool(irclib.mask_matches(usermask, blackmask))
+        if blackit and not exceptit:
+            return True
+
 class UnicodeBotError(Exception):
     pass
 def bot_unicode(chain):
@@ -111,6 +128,8 @@ class Saturnin(ircbot.SingleServerIRCBot):
             return (False,message)
     
     def on_privmsg(self, serv, ev):
+        if ignore_event(serv, ev):
+            return
         message=ev.arguments()[0]
         auteur = irclib.nm_to_n(ev.source())
         try:
@@ -185,6 +204,8 @@ class Saturnin(ircbot.SingleServerIRCBot):
                         helpmsg+="\n"+helpmsgs[2]
                     else:
                         helpmsg=helpmsgs[2]
+                if not helpmsg: # Un non-op a demandé de l'aide sur une commande dont il n'est pas censé connaître l'existence
+                    helpmsg = "Commande inacessible."
             for ligne in helpmsg.split("\n"):
                 serv.privmsg(auteur,ligne)
         elif cmd=="join":
@@ -301,6 +322,11 @@ class Saturnin(ircbot.SingleServerIRCBot):
                         log(self.serveur,"priv",auteur," ".join(message)+"[failed]")
             else:
                 notunderstood=True
+        elif cmd=="status":
+            if auteur in self.ops:
+                serv.privmsg(auteur,"Status : %s" % (self.status, ))
+            else:
+                notunderstood=True
         elif cmd=="spawn":
             if auteur in self.ops:
                 if len(message)>1:
@@ -350,8 +376,8 @@ class Saturnin(ircbot.SingleServerIRCBot):
                 notunderstood=True
         elif cmd=="reload":
             if auteur in self.ops:
-                reload(config)
-                serv.privmsg(auteur,"done")
+                self.reload(auteur)
+                log(self.serveur,"priv",auteur," ".join(message)+"[successful]")
             else:
                 notunderstood=True
         elif cmd=="score":
@@ -381,6 +407,13 @@ class Saturnin(ircbot.SingleServerIRCBot):
                         self.add_score(de,-asked)
                         self.add_score(to,asked)
                         serv.privmsg(auteur,"Transfert de %s points de %s à %s"%(asked,de,to))
+                elif len(message) == 2:
+                    scores = self.get_scores()
+                    asked = message[1]
+                    if asked in scores:
+                        serv.privmsg(auteur, "Score de %s : %s" % (asked, scores[asked]))
+                    else:
+                        serv.privmsg(auteur, "%s n'a encore jamais joué (avec succès)." % (asked,))
                 else:
                     serv.privmsg(auteur,"Syntaxe : SCORE TRANSFERT <pseudo> [<n>]")
             else:
@@ -428,17 +461,33 @@ class Saturnin(ircbot.SingleServerIRCBot):
     def sendscore(self, to):
         self.serv.privmsg(to, "Votre score : %s"%(self.get_scores().get(to,0)) )
     
+    def _sendscores(self, to, scores):
+        message = ''
+        for [nick, score] in scores:
+            score = '{}: {}'.format(nick, score)
+            if len(message) < config.MAX_LENGTH - len(score):
+                message += ' ' + score
+            else:
+                self.serv.privmsg(to, message)
+                message = score
+        if message:
+            self.serv.privmsg(to, message)
+
     def sendscores(self, to):
         scores=self.get_scores().items()
         # trie par score
         scores.sort(lambda x,y:cmp(x[1],y[1]))
         scores.reverse()
-        self.serv.privmsg(to, "Scores by score : "+" ; ".join(["%s %s"%(i[0],i[1]) for i in scores]))
+        self.serv.privmsg(to, "Scores by score : ")
+        self._sendscores(to, scores)
         # trie par pseudo
         scores.sort(lambda x,y:cmp(x[0].lower(),y[0].lower()))
-        self.serv.privmsg(to, "Scores by pseudo : "+" ; ".join(["%s %s"%(i[0],i[1]) for i in scores]))
+        self.serv.privmsg(to, "Scores by pseudo : ")
+        self._sendscores(to, scores)
     
     def on_pubmsg(self, serv, ev):
+        if ignore_event(serv, ev):
+            return
         auteur = irclib.nm_to_n(ev.source())
         channel = ev.target()
         message = ev.arguments()[0]
@@ -462,6 +511,10 @@ class Saturnin(ircbot.SingleServerIRCBot):
                 else:
                     serv.privmsg(channel,("%s: %s"%(auteur,random.choice(config.quit_fail_messages))).encode("utf8"))
                     log(self.serveur,channel,auteur,message+"[failed]")
+            elif cmd == "reload":
+                if auteur in self.ops:
+                    log(self.serveur, channel, auteur, message+"[successful]")
+                    self.reload(channel)
             elif cmd in ["part","leave","dégage","va-t-en","tut'tiresailleurs,c'estmesgalets"]:
                 if auteur in self.ops and (not (channel in self.stay_channels)
                                            or auteur in self.overops):
@@ -476,11 +529,17 @@ class Saturnin(ircbot.SingleServerIRCBot):
                 self.sendscore(auteur)
             elif cmd == "scores":
                 self.sendscores(auteur)
-        else:
-            if is_pan(message):
-                self.shot(channel, auteur)
+            elif cmd in [u"deviens", u"pseudo"]:
+                if auteur in self.ops:
+                    become = args
+                    serv.nick(become)
+                    log(self.serveur, channel, auteur, message + "[successful]")
+        if is_pan(message):
+            self.shot(channel, auteur)
     
     def on_action(self, serv, ev):
+        if ignore_event(serv, ev):
+            return
         action = ev.arguments()[0]
         auteur = irclib.nm_to_n(ev.source())
         channel = ev.target()
@@ -577,26 +636,88 @@ class Saturnin(ircbot.SingleServerIRCBot):
     def _getnick(self):
         return self.serv.get_nickname()
     nick=property(_getnick)
+    
+    def reload(self, auteur=None):
+        reload(config)
+        if auteur in [None, "SIGHUP"]:
+            towrite = "Config reloaded" + " (SIGHUP received)"*(auteur == "SIGHUP")
+            for to in config.report_bugs_to:
+                self.serv.privmsg(to, towrite)
+            log(self.serveur, towrite)
+        else:
+            self.serv.privmsg(auteur,"Config reloaded")
+    
+    def start_as_daemon(self, outfile):
+        sys.stderr = Logger(outfile)
+        self.start()
+
+
+class Logger(object):
+    """Pour écrire ailleurs que sur stdout"""
+    def __init__(self, filename="saturnin.full.log"):
+        self.filename = filename
+
+    def write(self, message):
+        f = open(self.filename, "a")
+        f.write(message)
+        f.close()
 
 
 if __name__=="__main__":
     import sys
     if len(sys.argv)==1:
-        print "Usage : saturnin.py <serveur> [--debug]"
+        print "Usage : saturnin.py <serveur> [--debug] [--no-output] [--daemon [--pidfile]] [--outfile]"
+        print "        --outfile sans --no-output ni --daemon n'a aucun effet"
         exit(1)
     serveur=sys.argv[1]
+    if "--daemon" in sys.argv:
+        thisfile = os.path.realpath(__file__)
+        thisdirectory = thisfile.rsplit("/", 1)[0]
+        os.chdir(thisdirectory)
+        daemon = True
+    else:
+        daemon = False
     if "debug" in sys.argv or "--debug" in sys.argv:
         debug=True
     else:
         debug=False
+    if "--no-output" in sys.argv or "--daemon" in sys.argv:
+        outfile = "/var/log/bots/saturnin.full.log"
+        for arg in sys.argv:
+            arg = arg.split("=")
+            if arg[0].strip('-') in ["out", "outfile", "logfile"]:
+                outfile = arg[1]
+        sys.stdout = Logger(outfile)
     if "--quiet" in sys.argv:
         config.debug_stdout=False
     serveurs={"a♡":"acoeur.crans.org","acoeur":"acoeur.crans.org","acoeur.crans.org":"acoeur.crans.org",
-              "irc":"irc.crans.org","crans":"irc.crans.org","irc.crans.org":"irc.crans.org"}
+              "irc":"irc.crans.org","crans":"irc.crans.org","irc.crans.org":"irc.crans.org",
+              "local":"localhost"}
     try:
         serveur=serveurs[serveur]
     except KeyError:
         print "Server Unknown : %s"%(serveur)
         exit(404)
-    bot = Saturnin(serveur,debug)
-    bot.start()
+    saturnin = Saturnin(serveur,debug)
+    # Si on reçoit un SIGHUP, on reload la config
+    def sighup_handler(signum, frame):
+        saturnin.reload("SIGHUP")
+    signal.signal(signal.SIGHUP, sighup_handler)
+    if daemon:
+        child_pid = os.fork()
+        if child_pid == 0:
+            os.setsid()
+            saturnin.start_as_daemon(outfile)
+        else:
+            # on enregistre le pid de saturnin
+            pidfile = "/var/run/bots/saturnin.pid"
+            for arg in sys.argv:
+                arg = arg.split("=")
+                if arg[0].strip('-') in ["pidfile"]:
+                    pidfile = arg[1]
+            f = open(pidfile, "w")
+            f.write("%s\n" % child_pid)
+            f.close()
+    else:
+        saturnin.start()
+