From 013db2e4ecef2bc504c4f16da33c3c00d70bd9d6 Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Wed, 24 Aug 2022 20:47:28 +0200 Subject: [PATCH] correction sur l'envoi de mail --- src/mail/mail_confirmation.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/mail/mail_confirmation.py b/src/mail/mail_confirmation.py index d1203ab..2869189 100644 --- a/src/mail/mail_confirmation.py +++ b/src/mail/mail_confirmation.py @@ -1,22 +1,18 @@ import datetime import email import imaplib -import re from concurrent.futures import ThreadPoolExecutor from email.header import decode_header from email.message import Message from builtins import list -from src import params from src.db.mirgration.migration_tools import migre_accepted_appointment from src.db.mongo_manager import MONGO_STORE_MANAGER -from src.notification.AcceptedResultPojo import get_accepted_result_from, AcceptedResultPojo +from src.notification.AcceptedResultPojo import get_accepted_result_from from src.notification.mailer import Mailer from src.pojo.ResultEnum import ResultEnum -from src.pojo.mail.mail_pojo import MailPojo, MailAddress -from src.proxy.proxy_type import ProxyType -from src.workers.link_validator import LinkValidator +from src.pojo.mail.mail_pojo import MailPojo AOL_IMAP_SERVER = "imap.aol.com" IMAP_SERVER_163 = "imap.163.com" @@ -148,7 +144,7 @@ def read_mails_and_find_confirmation_contacts(): # mail_list = [mail_address3] mails_messages = [] # read all the emails - with ThreadPoolExecutor(max_workers=20) as executor: + with ThreadPoolExecutor(max_workers=30) as executor: for mail in mail_list: mail_reader = MailConfirmationReader(mail.mail, mail.password) executor.submit(mail_reader.read_emails, mails_messages) @@ -160,7 +156,7 @@ def read_mails_and_find_confirmation_contacts(): for item in successful_items: if item.id in message_body: accepted_appointment_list.append(item) - elif "10:30" in message_body and item.email == mail.mail_address: + elif "10:30" in message_body and (item.email == mail.mail_address or item.email in message_body): accepted_appointment_list.append(item) print(mail.mail_address) print(mail.subject)