adminsys
/
spamotron
8
0
Fork 0
Code Pull Requests Releases Wiki Activity

refactor le style avec black

This commit is contained in:
François Poulain 2020-08-24 18:15:45 +02:00
parent f2dcc790da
commit 1064e517be
1 changed files with 73 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
mailing.py
View File

@ -31,13 +31,17 @@ from email.message import EmailMessage
# displays usage of the program, then quit # displays usage of the program, then quit
# #
def usage(returncode): def usage(returncode):
print("""SYNTAX: print(
""", sys.argv[0], """ -t tofile -b bodyfile [-p attachedfile] """SYNTAX:
""",
sys.argv[0],
""" -t tofile -b bodyfile [-p attachedfile]
tofile : sort of CSV file containing addresses of recipients tofile : sort of CSV file containing addresses of recipients
bodyfile : template of the mail to be sent bodyfile : template of the mail to be sent
attachedfile : optionnal attachment attachedfile : optionnal attachment
""") """,
)
sys.exit(returncode) sys.exit(returncode)
@ -50,7 +54,7 @@ JOINFILE = None
def read_recipients(): def read_recipients():
recipientfile = open(TOFILE) recipientfile = open(TOFILE)
lines = recipientfile.readlines() lines = recipientfile.readlines()
return [line[:-1].split('|') for line in lines] return [line[:-1].split("|") for line in lines]
def read_body(): def read_body():
@ -60,23 +64,25 @@ def read_body() :
body = body + line body = body + line
return body return body
def read_join(): def read_join():
try: try:
with open(JOINFILE, 'rb') as fp: with open(JOINFILE, "rb") as fp:
ctype, encoding = mimetypes.guess_type(JOINFILE) ctype, encoding = mimetypes.guess_type(JOINFILE)
if ctype is None or encoding is not None: if ctype is None or encoding is not None:
ctype = 'application/octet-stream' ctype = "application/octet-stream"
maintype, subtype = ctype.split('/', 1) maintype, subtype = ctype.split("/", 1)
metadata = { metadata = {
'filename': JOINFILE, "filename": JOINFILE,
'maintype': maintype, "maintype": maintype,
'subtype': subtype, "subtype": subtype,
} }
return (fp.read(), metadata) return (fp.read(), metadata)
except Exception as e: except Exception as e:
print("read error: %s" % e) print("read error: %s" % e)
exit(1) exit(1)
def replace_values(bodytemplate, values): def replace_values(bodytemplate, values):
body = bodytemplate body = bodytemplate
@ -96,17 +102,20 @@ CCPATTERN = re.compile(r"^Cc: *(.*)")
BCCPATTERN = re.compile(r"^Bcc: *(.*)") BCCPATTERN = re.compile(r"^Bcc: *(.*)")
REPLYTOPATTERN = re.compile(r"^Reply-To: *(.*)") REPLYTOPATTERN = re.compile(r"^Reply-To: *(.*)")
def qencode_subject(message): def qencode_subject(message):
subjectmatches = re.search(r"^Subject: *(.*)$", message, re.MULTILINE) subjectmatches = re.search(r"^Subject: *(.*)$", message, re.MULTILINE)
if (subjectmatches == None): return message if subjectmatches == None:
return message
subjectstr = subjectmatches.group(1) subjectstr = subjectmatches.group(1)
h = Header(subjectstr, 'utf-8') h = Header(subjectstr, "utf-8")
qsubjectstr = h.encode() qsubjectstr = h.encode()
return message.replace(subjectstr, qsubjectstr, 1) return message.replace(subjectstr, qsubjectstr, 1)
def send_message(message, to, attachment): def send_message(message, to, attachment):
lines = message.split('\n') lines = message.split("\n")
# identify headers in the template # identify headers in the template
fromvalue = None fromvalue = None
@ -117,7 +126,7 @@ def send_message(message, to, attachment) :
for index, line in enumerate(lines): for index, line in enumerate(lines):
if not line: if not line:
body = '\n'.join(lines[index+1:]) body = "\n".join(lines[index + 1 :])
break break
frommatches = FROMPATTERN.match(line) frommatches = FROMPATTERN.match(line)
@ -146,42 +155,45 @@ def send_message(message, to, attachment) :
dests.append(bccvalue) dests.append(bccvalue)
msg = EmailMessage() msg = EmailMessage()
msg['Subject'] = subjectvalue msg["Subject"] = subjectvalue
msg['From'] = fromvalue msg["From"] = fromvalue
msg['To'] = to msg["To"] = to
if replytovalue: if replytovalue:
msg['Reply-To'] = replytovalue msg["Reply-To"] = replytovalue
if ccvalue: if ccvalue:
msg['Cc'] = ccvalue msg["Cc"] = ccvalue
msg.set_content(body) msg.set_content(body)
if attachment: if attachment:
msg.add_attachment(attachment[0], **attachment[1]) msg.add_attachment(attachment[0], **attachment[1])
print("Sending : %s, from %s to %s, dests : %s" % (subjectvalue, fromvalue, dests[0], repr(dests))) print(
"Sending : %s, from %s to %s, dests : %s"
% (subjectvalue, fromvalue, dests[0], repr(dests))
)
# sending the mail to its recipients using the local mailer via SMTP # sending the mail to its recipients using the local mailer via SMTP
server = smtplib.SMTP('localhost','25') server = smtplib.SMTP("localhost", "25")
server.set_debuglevel(1) server.set_debuglevel(1)
server.send_message(msg) server.send_message(msg)
server.quit() server.quit()
if __name__ == "__main__":
if __name__ == '__main__' :
# handle options of the program # handle options of the program
try: try:
opts, args = getopt.getopt(sys.argv[1:], 't:b:p:') opts, args = getopt.getopt(sys.argv[1:], "t:b:p:")
except getopt.error as msg: except getopt.error as msg:
print("getopt error: %s" % msg) print("getopt error: %s" % msg)
usage(1) usage(1)
for name, value in opts: for name, value in opts:
if name == '-t': TOFILE = value if name == "-t":
elif name == '-b': BODYFILE = value TOFILE = value
elif name == '-p': JOINFILE = value elif name == "-b":
BODYFILE = value
elif name == "-p":
JOINFILE = value
else: else:
print("argument: ", name, " invalid") print("argument: ", name, " invalid")
usage(1) usage(1)
@ -223,4 +235,3 @@ if __name__ == '__main__' :
counter = 0 counter = 0
print("suspending execution for 5 secs") print("suspending execution for 5 secs")
time.sleep(5) time.sleep(5)