tobru/pylokid
1
0
Fork 0
Code Pull requests Releases Activity

more robust mail parsing
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Tobias Brunner 2021-12-09 20:51:02 +01:00
parent 63482d5f2e
commit 3753c1210b
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pylokid/library/emailhandling.py
View file

@ -14,7 +14,7 @@ _EMAIL_SUBJECTS = '(OR OR SUBJECT "Einsatzausdruck_FW" SUBJECT "Einsatzprotokoll
class EmailHandling: class EmailHandling:
""" Email handling """ """Email handling"""
def __init__(self, server, username, password, mailbox, tmp_dir): def __init__(self, server, username, password, mailbox, tmp_dir):
self.logger = logging.getLogger(__name__) self.logger = logging.getLogger(__name__)
@ -34,7 +34,7 @@ class EmailHandling:
self.logger.info("IMAP connection successful") self.logger.info("IMAP connection successful")
def search_emails(self): def search_emails(self):
""" searches for emails matching the configured subject """ """searches for emails matching the configured subject"""
msg_ids = [] msg_ids = []
@ -63,10 +63,13 @@ class EmailHandling:
self.logger.error("Error fetching subject") self.logger.error("Error fetching subject")
msg_id_subject[msg_id] = "unknown" msg_id_subject[msg_id] = "unknown"
else: else:
mail = email.message_from_string(str(msg_data[0][1], "utf-8")) try:
subject = mail["subject"] mail = email.message_from_string(str(msg_data[0][1], "utf-8"))
self.logger.info("Message ID %s has subject '%s'", msg_id, subject) subject = mail["subject"]
msg_id_subject[msg_id] = subject self.logger.info("Message ID %s has subject '%s'", msg_id, subject)
msg_id_subject[msg_id] = subject
except TypeError:
self.logger.error("Could not decode mail - %s", msg_data[0][1])
# Deduplicate messages - usually the same message arrives multiple times # Deduplicate messages - usually the same message arrives multiple times
self.logger.info("Deduplicating messages") self.logger.info("Deduplicating messages")
@ -85,7 +88,7 @@ class EmailHandling:
return msg_id_subject_deduplicated return msg_id_subject_deduplicated
def store_attachment(self, msg_id): def store_attachment(self, msg_id):
""" stores the attachment to filesystem """ """stores the attachment to filesystem"""
# download message from imap # download message from imap
typ, msg_data = self.imap.fetch(msg_id, "(BODY.PEEK[])") typ, msg_data = self.imap.fetch(msg_id, "(BODY.PEEK[])")
@ -132,7 +135,7 @@ class EmailHandling:
self.imap.store(msg_id, "+FLAGS", "(\\Seen)") self.imap.store(msg_id, "+FLAGS", "(\\Seen)")
def parse_subject(self, subject): def parse_subject(self, subject):
""" extract f id and type from subject """ """extract f id and type from subject"""
# This regex matches the subjects filtered already in IMAP search # This regex matches the subjects filtered already in IMAP search
parsed = re.search("([a-zA-Z_]*):? ?(F[0-9].*)?", subject) parsed = re.search("([a-zA-Z_]*):? ?(F[0-9].*)?", subject)