From 4d9ac08a899bd3550796b4306684ce678f77ee9b Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Thu, 26 Oct 2017 00:22:11 +0200 Subject: [PATCH] New option to review mail to be send --- check.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/check.py b/check.py index 5a0b92d..b1656b6 100755 --- a/check.py +++ b/check.py @@ -12,6 +12,7 @@ SOFT_MAX_SUBMISSION = None HARD_MAX_SUBMISSION = None FROM = "Automatic VIRLI Mail Checker " SEND_TO_REALUSER = False +REVIEW_BEFORE_SEND = False BETA = False ALTERNATE_RESOLUTIONS = False @@ -107,11 +108,17 @@ running for nemunaire@nemunai.re""") import smtplib with smtplib.SMTP("localhost") as smtp: smtp.starttls() + if not SEND_TO_REALUSER or REVIEW_BEFORE_SEND: + print(msg.as_string()) + if REVIEW_BEFORE_SEND: + import time + for i in range(15): + sys.stdout.write(".") + sys.stdout.flush() + time.sleep(1) if SEND_TO_REALUSER: smtp.send_message(msg) smtp.send_message(msg, to_addrs=["virli-report@nemunai.re"]) - else: - print(msg.as_string()) def readmail(fp): @@ -214,6 +221,9 @@ if __name__ == '__main__': parser.add_argument('--expected-submission-hash', help="imposed tarball hash") + parser.add_argument('--review-before-send', action="store_true", + help="Review the e-mail to be sent before sending it") + parser.add_argument('--beta', action="store_true", help="enable beta features") @@ -231,6 +241,7 @@ if __name__ == '__main__': ALTERNATE_RESOLUTIONS = args.alternate_resolutions SEND_TO_REALUSER = args.real_send + REVIEW_BEFORE_SEND = args.review_before_send BETA = args.beta cnt, frm, subject, ref = readmail(sys.stdin.buffer)