panleicim/appointment_tool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mail reader optimization

Browse Source
This commit is contained in:
PAN Lei
2024-05-09 10:08:16 +02:00
parent 1950cac9cb
commit cdb887bc61
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mail/mail_reader.py
+2 -4
View File
@@ -243,9 +243,6 @@ def read_mails():
# excel_reader = ExcelHelper() # excel_reader = ExcelHelper()
# mail_list = excel_reader.read_email_pojo(file_name="/Users/panlei/Downloads/hotmail_list.xlsx") # mail_list = excel_reader.read_email_pojo(file_name="/Users/panlei/Downloads/hotmail_list.xlsx")
# mail_address1 = MailAddress(mail="quaveraidv@hotmail.com", password="2iB60x20") # mail_address1 = MailAddress(mail="quaveraidv@hotmail.com", password="2iB60x20")
# mail_address1 = MailAddress(mail="chenpeijun@aol.com", password="ytifuwguknzifqyb")
# mail_address3 = MailAddress(mail="ciyuexie@aol.com", password="czezlmmyypokdfce")
# mail_address3 = MailAddress(mail="shenpeiyun@naver.com", password="Rdv@20222021")
# mail_list = [mail_address1] # mail_list = [mail_address1]
successful_items = MONGO_STORE_MANAGER.get_all_successful_items_for_day() successful_items = MONGO_STORE_MANAGER.get_all_successful_items_for_day()
mails_messages = [] mails_messages = []
@@ -256,6 +253,7 @@ def read_mails():
mail_reader = MailReader(mail.mail, mail.password) mail_reader = MailReader(mail.mail, mail.password)
executor.submit(mail_reader.read_emails, mails_messages) executor.submit(mail_reader.read_emails, mails_messages)
# get ip_country info # get ip_country info
_refreshed_successful_items = MONGO_STORE_MANAGER.get_all_successful_items_for_day()
_all_contact_list = MONGO_STORE_MANAGER.get_all_contacts_to_book() _all_contact_list = MONGO_STORE_MANAGER.get_all_contacts_to_book()
with ThreadPoolExecutor(max_workers=10) as executor: with ThreadPoolExecutor(max_workers=10) as executor:
for mail in mails_messages: for mail in mails_messages:
@@ -269,7 +267,7 @@ def read_mails():
# url = "https://rendezvousparis.hermes.com/" + url_to_validate.replace("3D", "") # url = "https://rendezvousparis.hermes.com/" + url_to_validate.replace("3D", "")
# else: # else:
url = match.group(0) url = match.group(0)
if need_to_valid_url(url, successful_items): if need_to_valid_url(url, _refreshed_successful_items):
MONGO_STORE_MANAGER.save_links_to_validate(url, mail.to_address, _all_contact_list) MONGO_STORE_MANAGER.save_links_to_validate(url, mail.to_address, _all_contact_list)
# url_validator = LinkValidator(url) # url_validator = LinkValidator(url)
print("need to validate url: " + url) print("need to validate url: " + url)
src/mail/mail_reader_all_contacts.py
+5 -7
View File
@@ -206,16 +206,12 @@ def need_to_valid_url(url: str, successful_items) -> bool:
parts = url.split('/') parts = url.split('/')
id = parts[5] id = parts[5]
if len(id) == 6: if len(id) == 6:
if id == "CS93VB":
print("found")
for item in successful_items: for item in successful_items:
if item.id == id: if item.id == id:
if item.url_validated is not None: if item.url_validated is not None:
return not item.url_validated return not item.url_validated
else: else:
# if url_validated is None # if url_validated is None
if item.url_validated is not None:
return not item.url_validated
return True return True
return True return True
else: else:
@@ -280,7 +276,8 @@ def read_all_mails():
if need_to_check_email(mail.mail, successful_items): if need_to_check_email(mail.mail, successful_items):
mail_reader = MailReader(mail.mail, mail.password) mail_reader = MailReader(mail.mail, mail.password)
executor.submit(mail_reader.read_emails, mails_messages) executor.submit(mail_reader.read_emails, mails_messages)
# 在读邮件时候，可能会有其他的约会提交或者约会的链接确认，所以需要刷新一下成功的列表
_refreshed_successful_items = MONGO_STORE_MANAGER.get_all_successful_items_for_day()
with ThreadPoolExecutor(max_workers=10) as executor: with ThreadPoolExecutor(max_workers=10) as executor:
for mail in mails_messages: for mail in mails_messages:
# if mail.isImapClient: # if mail.isImapClient:
@@ -293,9 +290,10 @@ def read_all_mails():
# url = "https://rendezvousparis.hermes.com/" + url_to_validate.replace("3D", "") # url = "https://rendezvousparis.hermes.com/" + url_to_validate.replace("3D", "")
# else: # else:
url = match.group(0) url = match.group(0)
if need_to_valid_url(url, successful_items): if need_to_valid_url(url, _refreshed_successful_items):
print("need to validate url: " + url) print("need to validate url: " + url)
MONGO_STORE_MANAGER.save_links_to_validate(url, mail.to_address,_all_contact_list=contact_to_book_list) MONGO_STORE_MANAGER.save_links_to_validate(url, mail.to_address,
_all_contact_list=contact_to_book_list)
# url_validator = LinkValidator(url) # url_validator = LinkValidator(url)
# executor.submit(url_validator.start_page, params.get_proxy(ProxyType.OXYLABS), False) # executor.submit(url_validator.start_page, params.get_proxy(ProxyType.OXYLABS), False)
else: else: