X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=today.py;h=c8a9e3194d6c1a9062a883e38c00cc62c6df4a2a;hb=76969cd0e6992178db5f553250c6fa7d17a4c35f;hp=9e0fbc211bdbad6e809369df0e5d3cc467c07c21;hpb=dc6c0ac3a1ac2631324461590c79bac47e5e25f3;p=today.git

diff --git a/today.py b/today.py
index 9e0fbc2..c8a9e31 100755
--- a/today.py
+++ b/today.py
@@ -6,10 +6,8 @@
  or that kind of stuff"""
 
 import time, datetime
-import re
 import os
 import sys
-import urllib
 import subprocess
 import json
 os.chdir('/home/vincent/scripts/today/')
@@ -19,12 +17,28 @@ class Config(object):
     """Configuration (pas de couleurs si on n'output pas dans un terminal"""
     def __init__(self, color=True):
         if color:
-            self.endcolor = ""
-            self.blue = ""
-            self.red = ""
-            self.green = ""
+            self.endcolor = u""
+            self.blue = u""
+            self.red = u""
+            self.green = u""
         else:
             self.endcolor=self.blue=self.red=self.green=""
+        #: Serveur distant où aller récupérer les checks
+        self.distant_server = "pimeys"
+        #: path de today-server.py sur le serveur distant
+        self.path_today_server = "/home/vincent/scripts/today/today_server.py"
+        #: Fichier contenant les anniversaires
+        self.birthdays_file = "birthdays.txt"
+        #: Fichier contenant les évènements à venir
+        self.timers_file = "timers.txt"
+        #: Fichier contenant les fêtes à souhaiter
+        self.saints_file = "saints.txt"
+        #: Fichier contenant les ids des derniers trucs vus/lus
+        self.last_seen_file = "lasts"
+        #: Fichier contenant le timestamp de dernière exécution
+        self.lasttime_file = ".lasttime"
+        #: Fichier contenant un booléen mémorisant si il y a quelquechose dans le today du jour et qu'il n'a pas encore été regardé
+        self.something_file = ".something"
 
 if "--color" in sys.argv:
     sys.argv.remove("--color")
@@ -46,7 +60,7 @@ def print_date(timestamp=None,color=True):
 def add_title(titre, texte):
     """Ajoute un titre à la partie si il y a quelque chose dedans"""
     if texte:
-        texte = "            %s%s :%s\n" % (config.green, titre, config.endcolor) + texte + "\n"
+        texte = u"            %s%s :%s\n" % (config.green, titre, config.endcolor) + texte + "\n"
     return texte
 
 def get_now():
@@ -57,35 +71,42 @@ def get_now():
 
 def get_last_seen():
     """Récupère la liste des derniers trucs vus/lus"""
-    with open("lasts") as f:
+    with open(config.last_seen_file) as f:
         return json.loads(f.read())
     
-def update_lasts(what, value):
+def update_last_seen(newdict):
     """Met à jour un des derniers trucs vus/lus"""
     lasts = get_last_seen()
-    if not what in lasts.keys():
-        print """%r n'est pas un "truc vu/lu" valide""" % (what,)
-        return
-    lasts[what] = value
-    with open("lasts", "w") as f:
+    lasts.update(newdict)
+    with open(config.last_seen_file, "w") as f:
         f.write(json.dumps(lasts))
 
+def parse_datefile(namefile):
+    """Ouvre et parse un fichier avec des lignes de la forme
+       jj/mm/aaaa	Truc
+       """
+    with open(namefile) as f:
+        rawdata = [l.strip().decode("utf8") for l in f.readlines()[1:] if not l.strip().startswith("#") and not l.strip() == '']
+    data = []
+    for l in rawdata:
+        date, truc = l.split("\t",1)
+        date = datetime.datetime(*time.strptime(date, "%d/%m/%Y")[:7])
+        data.append([date, truc])
+    return data
+
+
 def get_timers():
     """Obtenir la liste des évènements à venir (J-n)"""
     now = get_now()
-    f=open("timers.txt", "r")
-    data = [l.strip("\n").decode("utf8") for l in f.readlines()[1:]]
-    f.close()
+    data = parse_datefile(config.timers_file)
     timers = []
-    for l in data:
-        date, event = l.split("\t",1)
-        date = datetime.datetime(*time.strptime(date,"%d/%m/%Y")[:7])
+    for [date, event] in data:
         delta = date - now + datetime.timedelta(1)
         if delta > datetime.timedelta(0):
             timers.append([event,delta.days])
     eventsize = max([0]+[len(l[0]) for l in timers])
-    timers = "\n".join([("%%-%ss        J-%%s" % eventsize) % (event, timer) for event,timer in timers])
-    timers = add_title("Timers", timers)
+    timers = u"\n".join([(u"%%-%ss        J-%%s" % eventsize) % (event, timer) for event,timer in timers])
+    timers = add_title(u"Timers", timers)
     return timers
 
 def exists(l):
@@ -99,12 +120,7 @@ def get_birthdays(*search):
     """Obtenir la liste des anniversaires à venir,
        ou la liste des anniversaires correspondants à une recherche"""
     now = get_now()
-    text = open("birthdays.txt","r").readlines()
-    liste = [l.decode("utf8").split() for l in text if not l.startswith("#")]
-    liste = [[l[0], " ".join(l[1:])] for l in liste if l!=[]]
-    liste = [ [datetime.datetime(*time.strptime(l[0],"%d/%m/%Y")[:7]),
-               l[1]]
-            for l in liste]
+    liste = parse_datefile(config.birthdays_file)
     birthdays = []
     if len(search) == 0:
         # Simple demande d'anniversaires courants
@@ -114,13 +130,13 @@ def get_birthdays(*search):
             if delta > datetime.timedelta(0):
                 age = now.year - date.year
                 if abs(delta) < datetime.timedelta(1):
-                    birthdays.append([config.red,"%s a %s ans AUJOURD'HUI !"%(nom,age),0,config.endcolor])
+                    birthdays.append([config.red, u"%s a %s ans AUJOURD'HUI !" % (nom, age), 0, config.endcolor])
                 elif delta < datetime.timedelta(7):
-                    birthdays.append([config.red,"%s va avoir %s ans"%(nom,age),-delta.days,config.endcolor])
+                    birthdays.append([config.red, u"%s va avoir %s ans" % (nom, age), -delta.days, config.endcolor])
                 elif delta < datetime.timedelta(14):
-                    birthdays.append(["","%s va avoir %s ans"%(nom,age),-delta.days,""])
+                    birthdays.append([u"", u"%s va avoir %s ans" % (nom, age), -delta.days, u""])
                 elif datetime.timedelta(30-4) < delta < datetime.timedelta(30+4):
-                    birthdays.append(["","%s va avoir %s ans"%(nom,age),-delta.days,""])
+                    birthdays.append([u"", u"%s va avoir %s ans" % (nom, age), -delta.days, u""])
     else:
         # Recherche spécifique
         search = [i.lower() for i in search]
@@ -131,34 +147,34 @@ def get_birthdays(*search):
                 delta = thisyeardate - now + datetime.timedelta(1)
                 age = now.year - date.year
                 if delta.days<0:
-                    birthdays.append(["", "%s a eu %s ans"%(nom,age), -delta.days, ""])
+                    birthdays.append([u"", u"%s a eu %s ans" % (nom, age), -delta.days, ""])
                 else:
-                    birthdays.append(["", "%s va avoir %s ans"%(nom,age), -delta.days, ""])
+                    birthdays.append([u"", u"%s va avoir %s ans" % (nom, age), -delta.days, ""])
     birthdays.sort(lambda x,y: -cmp(x[2], y[2]))
     eventsize = max([0]+[len(l[1]) for l in birthdays])
-    template = ("%%s%%-%ss        J%%+d%%s" % eventsize)
-    birthdays = "\n".join([template % tuple(tup) for tup in birthdays])
-    birthdays = add_title("Anniversaires", birthdays)
+    template = (u"%%s%%-%ss        J%%+d%%s" % eventsize)
+    birthdays = u"\n".join([template % tuple(tup) for tup in birthdays])
+    birthdays = add_title(u"Anniversaires", birthdays)
     return birthdays
 
 def check_birthdays():
     """Compte combien il y a d'anniversaires à afficher"""
     birthdays = get_birthdays()
     if birthdays:
-        n = birthdays.count("\n") - 1
+        n = birthdays.count(u"\n") - 1
     else:
         n = 0
     return n
 
 def format_quotes(liste):
     """Formate les quotes de dicos à texte"""
-    t = ("\n" + "_"*80 + "\n").join(["%(id)s (%(date)s)\n%(quote)s" % q for q in liste])
+    t = (u"\n" + u"_"*80 + u"\n").join([u"%(id)s (%(date)s)\n%(quote)s" % q for q in liste])
     return t
 
 def get_dtc(*args):
     """Récupère les quotes DTC non lues"""
     if len(args) == 0:
-        last_dtc = get_last_seen()["dtc"]
+        last_dtc = get_last_seen().get("dtc", 0)
         cmd = "~/bin/dtc %s + --json" % (last_dtc+1,)
     elif len(args) == 1:
         cmd = "~/bin/dtc %s --json" % args[0]
@@ -166,68 +182,81 @@ def get_dtc(*args):
         cmd = "~/bin/dtc %s %s --json" % (args[0], args[1])
     else:
         return None
-    proc = subprocess.Popen(["ssh", "pimeys", cmd], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    proc = subprocess.Popen(["ssh", config.distant_server, cmd], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     out, err = proc.communicate()
     out += err
     quotes = json.loads(out)
     if quotes:
         last_id = max([q["id"] for q in quotes])
-        update_lasts("dtc", last_id)
+        update_last_seen({"dtc" : last_id})
     textquotes = format_quotes(quotes)
     return textquotes
 
 def update_xkcd(newid):
-    update_lasts("xkcd", int(newid))
+    update_last_seen({"xkcd" : int(newid)})
+
+def update_xantah(newid):
+    update_last_seen({"xantah" : int(newid)})
 
+def update_visiteur(newid):
+    update_last_seen({"visiteur" : int(newid)})
+
+THINGS = {
+          "dtc" : u"Quotes DTC",
+          "xkcd" : u"Épisodes de XKCD",
+          "xantah" : u"Épisodes de La Légende de Xantah",
+          "visiteur" : u"Épisodes du Visiteur du Futur",
+
+          "birthdays" : u"Anniversaires à souhaiter",
+         }
 
 def check_all():
     """Vérifie si il y a des derniers trucs non lus/vus."""
-    cmd = "/home/vincent/scripts/today/today-server.py whatsup"
-    proc = subprocess.Popen(["ssh", "pimeys", cmd], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    cmd = "%s whatsup" % (config.path_today_server,)
+    proc = subprocess.Popen(["ssh", config.distant_server, cmd], stdout=subprocess.PIPE)
     out, err = proc.communicate()
     news = json.loads(out)
     seen = get_last_seen()
-    n_birth = check_birthdays()
-    n_dtc = news["dtc"] - seen["dtc"]
-    n_xkcd = news["xkcd"] - seen["xkcd"]
-    l = [["Anniversaires", n_birth],
-         ["Quotes DTC", n_dtc],
-         ["XKCD non lus", n_xkcd]]
+    news["birthdays"] = check_birthdays()
     checks = []
-    for (text, n) in l:
+    for (thing, comm) in THINGS.iteritems():
+        n = news[thing] - seen.get(thing, 0)
         if type(n) != int:
             print n
         elif n > 0:
-            checks.append("%s : %s" % (text, n))
-    checks = "\n".join(checks)
-    checks = add_title("Checks", checks)
+            checks.append("%s : %s" % (comm, n))
+    checks = u"\n".join(checks)
+    checks = add_title(u"Checks", checks)
     return checks
 
 def get_everything():
     """Récupère toutes les infos"""
     work = [action() for action in AUTOMATED_ACTIONS.values()]
-    chain = "\n\n".join([result for result in work if result])
+    chain = u"\n\n".join([result for result in work if result])
     return chain
 
 def _is_there_something_in_today():
     """Teste si il y a des choses non lue dans le today"""
-    return open(".something", "r").read() == "True"
+    return open(config.something_file, "r").read() == "True"
 
 def _there_is_something_in_today(something):
     """Met à jour le something"""
-    f = open(".something", "w")
+    f = open(config.something_file, "w")
     f.write(str(bool(something)))
     f.close()
 
 def _get_lasttime():
     """Récupère la dernière fois que today a été exécuté"""
-    lasttime = open(".lasttime", "r").read()
+    if os.path.isfile(config.lasttime_file):
+        lasttime = open(config.lasttime_file, "r").read()
+    else:
+        lasttime = 0
     lasttime = datetime.datetime(*time.localtime(float(lasttime))[:7])
     return lasttime
 
 def _update_lasttime(when):
     """Met à jour le timestamp de dernière exécution de today"""
-    f = open(".lasttime", "w")
+    f = open(config.lasttime_file, "w")
     f.write(str(time.mktime(when.timetuple())))
     f.close()
 
@@ -242,12 +271,12 @@ def ping():
         something = get_everything()
         _there_is_something_in_today(something)
         if something:
-            return "You have something in %stoday%s" % (config.red, config.endcolor)
+            return u"You have something in %stoday%s" % (config.red, config.endcolor)
         else:
-            return "Nothing in today"
+            return u"Nothing in today"
     else:
         if _is_there_something_in_today():
-            return "You have something in %stoday%s" % (config.red, config.endcolor)
+            return u"You have something in %stoday%s" % (config.red, config.endcolor)
 
 def affiche():
     """Action par défaut, affiche toutes les infos"""
@@ -256,6 +285,41 @@ def affiche():
     _there_is_something_in_today(False)
     return out
 
+def initialize():
+    """Crée les fichiers (vides) nécessaires au fonctionnement du script"""
+    files = [config.birthdays_file, config.timers_file, config.saints_file,
+             config.last_seen_file]
+    contents = [u"# Anniversaires\n#jj/mm/aaaa	Prénom Nom\n",
+                u"# Évènements à venir\n#jj/mm/aaaa	Évènement\n",
+                u"# Fêtes\n#jj/mm/aaaa	Saint\n",
+                u"{}"]
+    for ifile in range(len(files)):
+        namefile = files[ifile]
+        if os.path.isfile(namefile):
+            print "%s exists, skipping." % (namefile,)
+        else:
+            f = open(namefile, "w")
+            f.write(contents[ifile].encode("utf-8"))
+            f.close()
+
+def sync():
+    """Synchronise les last_seen avec le serveur distant qui en garde une copie,
+       le maximum de chaque truc vu est gardé des deux côtés."""
+    lasts = get_last_seen()
+    cmd = "%s sync" % (config.path_today_server,)
+    proc = subprocess.Popen(["ssh", config.distant_server, cmd],
+                            stdin = subprocess.PIPE, stdout=subprocess.PIPE,
+                            close_fds = True)
+    lasts_raw = json.dumps(lasts)
+    proc.stdin.write(lasts_raw)
+    proc.stdin.close()
+    out = proc.stdout.read()
+    newdict = json.loads(out)
+    update_last_seen(newdict)
+    print u"Nouvel état : %r" % newdict
+    
+    
+
 #: Les actions effectuées lors d'un appel sans paramètres
 AUTOMATED_ACTIONS = {
            "timers" : get_timers,
@@ -266,9 +330,15 @@ AUTOMATED_ACTIONS = {
 #: Les actions qu'on peut effectuer en rajoutant des paramètres
 OTHER_ACTIONS = {
            "xkcd" : update_xkcd,
+           "xantah" : update_xantah,
+           "visiteur" : update_visiteur,
+           
            "dtc" : get_dtc,
            "ping" : ping,
            "show" : affiche,
+           "sync" : sync,
+           
+           "init" : initialize,
            }
 
 #: Toutes les actions
@@ -280,7 +350,7 @@ ACTIONS[None] = affiche # action par défaut
 if __name__ == "__main__":
     import sys
     if "--no-color" in sys.argv:
-        config.endcolor, config.red, config.blue = "","",""
+        config.endcolor, config.red, config.blue = u"", u"", u""
     if len(sys.argv) == 1:
         # Juste un today
         output = ACTIONS[None]()
@@ -289,4 +359,4 @@ if __name__ == "__main__":
         args = sys.argv[2:]
         output = ACTIONS[commande](*args)
     if output:
-        print output.encode("utf-8")
+        print output