From c2de4376ecf2ef07a0f0e7a32a7c8bb5be8cee02 Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Fri, 7 Apr 2023 22:46:39 +0200 Subject: [PATCH] use utf-8 to decode pl emails --- src/mail/mail_reader.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/mail/mail_reader.py b/src/mail/mail_reader.py index 89fcacf..efca782 100644 --- a/src/mail/mail_reader.py +++ b/src/mail/mail_reader.py @@ -61,11 +61,10 @@ class MailReader(): mail_list.extend(self._get_messages_from_folder(imap, subject=VALIDATION_URL_SUBJECT_EN, folder=folder)) else: - mail_list.extend(self._get_messages_from_folder_for_imapclient(imap, subject=VALIDATION_URL_SUBJECT_fr)) - mail_list.extend(self._get_messages_from_folder_for_imapclient(imap, subject=VALIDATION_URL_SUBJECT_EN)) + mail_list.extend(self._get_messages_from_folder_for_imapclient(imap)) if DOMAIN_HOTMAIL in self.login: mail_list.extend( - self._get_messages_from_folder_for_imapclient(imap, subject=VALIDATION_URL_SUBJECT_EN, folder="Junk")) + self._get_messages_from_folder_for_imapclient(imap, folder="Junk")) if not isImapClient: imap.close() imap.logout() @@ -121,7 +120,7 @@ class MailReader(): mail_messages.append(mail) return mail_messages - def _get_messages_from_folder_for_imapclient(self, imap, subject, folder="INBOX") -> list: + def _get_messages_from_folder_for_imapclient(self, imap, folder="INBOX") -> list: mail_messages = [] search_terms = 'SINCE "{}"'.format( datetime.datetime.today().strftime( @@ -198,17 +197,13 @@ def need_to_check_email(mail: str, successful_items) -> bool: def read_mails(): # check time before start checking emails - if is_time_between(time(7, 30), time(23, 30)): + if is_time_between(time(7, 30), time(19, 30)): # get email address - # mail_list = MONGO_STORE_MANAGER.get_destination_emails() - mail_address1 = MailAddress(mail="enasremor1973@onet.pl", password=")ozBUE0RjZ8N") + mail_list = MONGO_STORE_MANAGER.get_destination_emails() + # mail_address1 = MailAddress(mail="enasremor1973@onet.pl", password=")ozBUE0RjZ8N") # mail_address1 = MailAddress(mail="chenpeijun@aol.com", password="ytifuwguknzifqyb") - # # mail_address2 = MailAddress(mail="sdfgfhgf1986@aol.com", password="fjwcgvhxxlywqfwm") # # mail_address3 = MailAddress(mail="ciyuexie@aol.com", password="czezlmmyypokdfce") - # # mail_address4 = MailAddress(mail="hongjiang176@aol.com", password="ftzpscgzvwneelmn") - # mail_address4 = MailAddress(mail="ryan_meacham2856@yahoo.com", password="ulgggkodxqbvrpgm") - # mail_list = [mail_address3, mail_address2, mail_address1, mail_address4] - mail_list = [mail_address1] + # mail_list = [mail_address1] successful_items = MONGO_STORE_MANAGER.get_all_successful_items_for_day() mails_messages = [] with ThreadPoolExecutor(max_workers=200) as executor: @@ -225,7 +220,7 @@ def read_mails(): # else: match = re.search(VALIDATION_URL_REGEX, mail.body) if match: - url_to_validate = match.group(0) + # url_to_validate = match.group(0) # if mail.isImapClient: # url = "https://rendezvousparis.hermes.com/" + url_to_validate.replace("3D", "") # else: