From 5d5c9d3e7c127de858102edde810f5749823fafa Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Wed, 27 Apr 2022 12:08:32 +0200 Subject: [PATCH] Can include post-scriptum --- check.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/check.py b/check.py index 852e885..70bb46e 100755 --- a/check.py +++ b/check.py @@ -104,7 +104,7 @@ running for nemunaire@nemunai.re""") smtp.send_message(msg, to_addrs=["peret-report@nemunai.re" if initial_to is None else initial_to + "-report@nemunai.re"]) -def respondmail(to, subject, ref, checks, initial_to=None): +def respondmail(to, subject, ref, checks, initial_to=None, ps=""): from email.message import EmailMessage if not isinstance(checks, list): @@ -157,6 +157,9 @@ def respondmail(to, subject, ref, checks, initial_to=None): else: fmt += '\nAfter analyzing your e-mail, I\'ve decided to ' + final_decision + ' it.' + if ps is not None and len(ps) > 0 and final_decision == "ACCEPT": + fmt += '\n\n' + ps + msg.set_content("""Hi! This is the automatic e-mail analyzer in charge of checking your work. @@ -318,6 +321,9 @@ if __name__ == '__main__': parser.add_argument('-l', '--students-list', nargs='*', help="students list(s) to use for the check") + parser.add_argument('-ps', '--ps', + help="Include a PostScriptum info when valid") + args = parser.parse_args() if args.refresh_keys: @@ -342,4 +348,4 @@ if __name__ == '__main__': if args.issue_thunderbird91: respondissueemail(frm, subject, ref, initial_to=to) else: - respondmail(frm, subject, ref, [c for c in check_mail(gpgmail, cnt, submissions_dir=args.submissions, check_content=not args.sign, check_submission_hash=args.expected_submission_hash, skip_public_key=args.skip_public_key)], initial_to=to) + respondmail(frm, subject, ref, [c for c in check_mail(gpgmail, cnt, submissions_dir=args.submissions, check_content=not args.sign, check_submission_hash=args.expected_submission_hash, skip_public_key=args.skip_public_key)], initial_to=to, ps=args.ps)