diff --git a/gestion/spam_cablages.py b/gestion/spam_cablages.py index d24d1898..e0c64441 100755 --- a/gestion/spam_cablages.py +++ b/gestion/spam_cablages.py @@ -5,8 +5,12 @@ import psycopg2 from collections import defaultdict +import sys +sys.path.append('/usr/scripts/') +import utils.sendmail + TEMPLATE = u""" -Cablages a effectuer : +Câblages à effectuer : %(cablages)s --\u0020 L'intranet du Cr@ns""" @@ -28,14 +32,16 @@ def get_cablages(): CABLAGES = get_cablages() -if not CABLAGES: - exit(1) - -CORPS_BATIMENTS = [] - -for batiment in sorted(CABLAGES.keys()): - ubatiment = batiment.upper() - prises = ", ".join(["%s%s" % (ubatiment, chambre) for chambre in sorted(CABLAGES[batiment])]) - CORPS_BATIMENTS.append(TEMPLATE_BATIMENT % { "prises": prises, "batiment": ubatiment }) - -print (TEMPLATE % { "cablages": "".join(CORPS_BATIMENTS) }) +if CABLAGES: + CORPS_BATIMENTS = [] + for batiment in sorted(CABLAGES.keys()): + ubatiment = batiment.upper() + prises = ", ".join(["%s%s" % (ubatiment, chambre) for chambre in sorted(CABLAGES[batiment])]) + CORPS_BATIMENTS.append(TEMPLATE_BATIMENT % { "prises": prises, "batiment": ubatiment }) + + message = TEMPLATE % { "cablages": "".join(CORPS_BATIMENTS) } + if "--mail" in sys.argv: + utils.sendmail.sendmail(u"intranet-bugreport@crans.org", u"respbats@lists.crans.org", + u"[Câblage] Résumé des câblages à effectuer", message, more_headers={u"X-Crans-Intranet" : u"cablage", u"X-Mailer" : u"/usr/scripts/spam_cablages.py"}) + else: + print message diff --git a/gestion/spam_cablages.sh b/gestion/spam_cablages.sh deleted file mode 100755 index c36341c0..00000000 --- a/gestion/spam_cablages.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if /usr/scripts/gestion/spam_cablages.py &> /dev/null; then - /usr/scripts/gestion/spam_cablages.py | mail \ - -a "X-Crans-Intranet: cablage" \ - -a "From: \"L'intranet du Cr@ns\" " \ - -s "[Câblage] Résumé des câblages à effectuer" respbats@crans.org -fi