X-Git-Url: http://gitweb.pimeys.fr/?p=today.git;a=blobdiff_plain;f=today.py;h=9f9759419e9dcaffce0f73640336155b8a750387;hp=81cc8b8e6f7e43133c5aae90336ffbf7d8dbe6cd;hb=aa26043027e42c11cc80da39de9e4f1029da3b7a;hpb=03ed1ffcef304a06564c1bb974401aa25f9c5e8c diff --git a/today.py b/today.py index 81cc8b8..9f97594 100755 --- a/today.py +++ b/today.py @@ -23,7 +23,9 @@ class Config(object): self.red = u"" self.green = u"" else: - self.endcolor=self.blue=self.red=self.green="" + self.endcolor = self.blue = self.red = self.green = "" + #: Faut-il contacter le serveur distant + self.do_remote = True #: Serveur distant où aller récupérer les checks self.distant_server = "pimeys" #: path de today-server.py sur le serveur distant @@ -110,13 +112,6 @@ def get_timers(): timers = add_title(u"Timers", timers) return timers -def exists(l): - """Renvoie True si au moins un élément de l est vrai""" - for i in l: - if i: - return True - return False - def get_birthdays(*search): """Obtenir la liste des anniversaires à venir, ou la liste des anniversaires correspondants à une recherche""" @@ -143,7 +138,7 @@ def get_birthdays(*search): search = [i.lower() for i in search] tous = ("--all" in search) for date, nom in liste: - if tous or exists([term.lower() in nom.lower() for term in search]): + if tous or any([term.lower() in nom.lower() for term in search]): thisyeardate = datetime.datetime(now.year, date.month, date.day) delta = thisyeardate - now + datetime.timedelta(1) age = now.year - date.year @@ -181,13 +176,20 @@ def get_saints(): now = get_now() saints = {} saints["today"] = _parse_saint(sourcesaints[now.month - 1][now.day - 1]) - saints["tomorrow"] = _parse_saint(sourcesaints[now.month - 1][now.day]) + nbdays = len(sourcesaints[now.month - 1]) + if now.day == nbdays: # il faut regarder le mois suivant + if now.month == 12: # il faut regarder l'année suivante + saints["tomorrow"] = _parse_saint(sourcesaints[0][0]) + else: + saints["tomorrow"] = _parse_saint(sourcesaints[now.month][0]) + else: + saints["tomorrow"] = _parse_saint(sourcesaints[now.month - 1][now.day]) firstnames = _get_firstnames() towish = {"today" : [], "tomorrow" : []} for day in ["today", "tomorrow"]: ssaints = saints[day] for (sexe, saint) in ssaints: - if exists([firstname.lower() in saint.lower().split() for firstname in firstnames]): + if any([firstname.lower() in saint.lower().split() for firstname in firstnames]): towish[day].append(sexe + saint) ttowish = [] if towish["today"]: @@ -228,7 +230,7 @@ def get_dtc(*args): cmd = "~/bin/dtc %s %s --json" % (args[0], args[1]) else: return None - proc = subprocess.Popen(["ssh", config.distant_server, cmd], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + proc = subprocess.Popen(["ssh", "-4", config.distant_server, cmd], stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, err = proc.communicate() out += err quotes = json.loads(out) @@ -285,7 +287,7 @@ THINGS = { def check_all(): """Vérifie si il y a des derniers trucs non lus/vus.""" cmd = "%s whatsup" % (config.path_today_server,) - proc = subprocess.Popen(["ssh", config.distant_server, cmd], stdout=subprocess.PIPE) + proc = subprocess.Popen(["ssh", "-4", config.distant_server, cmd], stdout=subprocess.PIPE) out, err = proc.communicate() news = json.loads(out) seen = get_last_seen() @@ -303,8 +305,9 @@ def check_all(): return checks def get_everything(): - """Récupère toutes les infos""" - work = [action() for action in AUTOMATED_ACTIONS.values()] + """Récupère toutes les infos.""" + work = [action() for (keyword, action) in AUTOMATED_ACTIONS.iteritems() + if (config.do_remote or not keyword in REMOTE_ACTIONS)] chain = u"\n\n".join([result for result in work if result]) return chain @@ -335,7 +338,8 @@ def _update_lasttime(when): def ping(): """Dit juste si il y a quelque chose à voir. - La première exécution de la journée peut être lente parce qu'elle va bosser avnt de répondre.""" + La première exécution de la journée peut être lente parce qu'elle va bosser avant de répondre. + """ now = get_now() lasttime = _get_lasttime() if (lasttime.date() < now.date()): @@ -352,7 +356,7 @@ def ping(): return u"You have something in %stoday%s" % (config.red, config.endcolor) def affiche(): - """Action par défaut, affiche toutes les infos""" + """Action par défaut, affiche toutes les infos.""" out = print_date() out += get_everything() _there_is_something_in_today(False) @@ -369,7 +373,7 @@ def initialize(): for ifile in range(len(files)): namefile = files[ifile] if os.path.isfile(namefile): - print "%s exists, skipping." % (namefile,) + print (u"%s exists, skipping." % (namefile,)).encode("utf-8") else: f = open(namefile, "w") f.write(contents[ifile].encode("utf-8")) @@ -380,7 +384,7 @@ def sync(): 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], + proc = subprocess.Popen(["ssh", "-4", config.distant_server, cmd], stdin = subprocess.PIPE, stdout=subprocess.PIPE, close_fds = True) lasts_raw = json.dumps(lasts) @@ -389,7 +393,7 @@ def sync(): out = proc.stdout.read() newdict = json.loads(out) update_last_seen(newdict) - print u"Nouvel état : %r" % newdict + print (u"Nouvel état : %r" % newdict).encode("utf-8") @@ -421,6 +425,9 @@ OTHER_ACTIONS = { "init" : initialize, } +#: Les actions qui nécessitent un accès au serveur distant +REMOTE_ACTIONS = ["check", "sync"] + #: Toutes les actions ACTIONS = dict(AUTOMATED_ACTIONS) ACTIONS.update(OTHER_ACTIONS) @@ -431,6 +438,10 @@ if __name__ == "__main__": import sys if "--no-color" in sys.argv: config.endcolor, config.red, config.blue = u"", u"", u"" + sys.argv.remove("--no-color") + if "--no-remote" in sys.argv: + config.do_remote = False + sys.argv.remove("--no-remote") if len(sys.argv) == 1: # Juste un today output = ACTIONS[None]() @@ -439,4 +450,4 @@ if __name__ == "__main__": args = sys.argv[2:] output = ACTIONS[commande](*args) if output: - print output + print output.encode("utf-8")