diff --git a/src/mail/mail_reader.py b/src/mail/mail_reader.py index d20b150..1b19660 100644 --- a/src/mail/mail_reader.py +++ b/src/mail/mail_reader.py @@ -10,7 +10,7 @@ from email.message import Message from src.db.mongo_manager import MONGO_STORE_MANAGER from src.logs.AppLogging import init_logger from src.mail.mail_constants import DOMAIN_HOTMAIL, create_imap -from src.pojo.mail.mail_pojo import MailPojo +from src.pojo.mail.mail_pojo import MailPojo, MailAddress from src.utils.timeutiles import is_time_between VALIDATION_URL_SUBJECT_fr = 'Validation de votre demande de rendez-vous' @@ -28,10 +28,12 @@ class MailReader(): self.password = password @staticmethod - def show_folders(imap): + def show_folders(imap) -> list: + folders = [] for i in imap.list()[1]: l = i.decode().split(' "/" ') - print(l[0] + " = " + l[1]) + folders.append(l[1]) + return folders def read_emails(self, mails_messages: list) -> list: # create an IMAP4 class with SSL @@ -41,7 +43,7 @@ class MailReader(): print("type is {} for {}".format(type, self.login)) mail_list = [] print("read mails from {}".format(self.login)) - # self.show_folders(imap) + folder_list = self.show_folders(imap) # total number of emails # get mails from inbox # (\Archive \HasNoChildren) = "Archive" @@ -50,8 +52,10 @@ class MailReader(): # (\HasNoChildren) = "Inbox" # (\Sent \HasNoChildren) = "Sent" # (\Trash \HasNoChildren) = "Trash" - mail_list.extend(self._get_messages_from_folder(imap, subject=VALIDATION_URL_SUBJECT_fr)) - mail_list.extend(self._get_messages_from_folder(imap, subject=VALIDATION_URL_SUBJECT_EN)) + for folder in folder_list: + mail_list.extend(self._get_messages_from_folder(imap, subject=VALIDATION_URL_SUBJECT_fr, folder=folder)) + mail_list.extend(self._get_messages_from_folder(imap, subject=VALIDATION_URL_SUBJECT_EN, folder=folder)) + print("folder is {}".format(folder)) if DOMAIN_HOTMAIL in self.login: mail_list.extend(self._get_messages_from_folder(imap, subject=VALIDATION_URL_SUBJECT_EN, folder="Junk")) # mail_list.extend(self._get_messages_from_folder(imap, subject=VALIDATION_URL_SUBJECT_EN, folder="Bulk")) @@ -86,6 +90,7 @@ class MailReader(): from_address, subject_encoded = decode_header(msg.get("From"))[0] if isinstance(from_address, bytes): from_address = from_address.decode(subject_encoded) + print("Email:", self.login) print("From:", from_address) print("Subject:", subject) # if the email message is multipart @@ -155,8 +160,8 @@ def read_mails(): 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="appointment2022@aol.com", password="gyilpmvyyvlcaviq") - # # mail_address2 = MailAddress(mail="chenpeijun@aol.com", password="ytifuwguknzifqyb") + # mail_address1 = MailAddress(mail="vincenzoditaranto@tim.it", password="severiana") + # 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") @@ -165,7 +170,7 @@ def read_mails(): # mail_list = [mail_address1] successful_items = MONGO_STORE_MANAGER.get_all_successful_items_for_day() mails_messages = [] - with ThreadPoolExecutor(max_workers=20) as executor: + with ThreadPoolExecutor(max_workers=200) as executor: for mail in mail_list: # check whether we need to read mail if need_to_check_email(mail.mail, successful_items):