diff --git a/src/mail/mail_reader.py b/src/mail/mail_reader.py index caf5325..399ceec 100755 --- a/src/mail/mail_reader.py +++ b/src/mail/mail_reader.py @@ -23,7 +23,7 @@ HERMES_EMAIL = "no-reply@hermes.com" EMAIL_ADDRESS_REGEX = r'\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,7}\b' date_format = "%d-%b-%Y" # DD-Mon-YYYY e.g., 3-Mar-2014 -REDIRECTION_MAILS = "chenpeijun@aol.com,hongjiang176@aol.com,ciyuexie@aol.com,ciccidaniel@aol.com,armasgoodman@aol.com,wknd.gemerine@aol.com,rafmail1981@aol.com,tonovichivanenaki@aol.com,hetland.ari@aol.com,mateusiversen@aol.com,anasida76@aol.com,sen70zib@aol.com,mezeiderrick@aol.com,stanisl49avchic@aol.com,damcvrobaneuron@aol.com,suyzanna_fleona@aol.com,dxealing.dissa@aol.com,hogg.karen@aol.com,obocharovamarina@aol.com,buchholzjohann@aol.com,orn.cecchini@aol.com,percivaltorgersen@aol.com,candalgudrun@aol.com,filimonis.76@aol.com,bengann_100@aol.com,axelhanne@aol.com,tiffanylarochelle@aol.com,nicoleta.r@aol.com,eichenbaum.1963@aol.com,samognat32@aol.com,edem_headshot@aol.com,kozmakuzmich1960@aol.com,anders.riva@aol.com,yasiaforever.1971@aol.com,mo90nroe@aol.com,blonde.87@aol.com,dimidrol.1969@aol.com,duwei1998@gmx.com" +REDIRECTION_MAILS = "chenpeijun@aol.com,hongjiang176@aol.com,ciyuexie@aol.com,ciccidaniel@aol.com,armasgoodman@aol.com,wknd.gemerine@aol.com,rafmail1981@aol.com,tonovichivanenaki@aol.com,hetland.ari@aol.com,mateusiversen@aol.com,anasida76@aol.com,sen70zib@aol.com,mezeiderrick@aol.com,stanisl49avchic@aol.com,damcvrobaneuron@aol.com,suyzanna_fleona@aol.com,dxealing.dissa@aol.com,hogg.karen@aol.com,obocharovamarina@aol.com,buchholzjohann@aol.com,orn.cecchini@aol.com,percivaltorgersen@aol.com,candalgudrun@aol.com,filimonis.76@aol.com,bengann_100@aol.com,axelhanne@aol.com,tiffanylarochelle@aol.com,nicoleta.r@aol.com,eichenbaum.1963@aol.com,samognat32@aol.com,edem_headshot@aol.com,kozmakuzmich1960@aol.com,anders.riva@aol.com,yasiaforever.1971@aol.com,mo90nroe@aol.com,dimidrol.1969@aol.com,duwei1998@gmx.com" def check_email_address(email): diff --git a/src/person_name/contact_manager.py b/src/person_name/contact_manager.py index 1ea76f9..fa568b1 100755 --- a/src/person_name/contact_manager.py +++ b/src/person_name/contact_manager.py @@ -5,6 +5,7 @@ from pathlib import Path import xlsxwriter from src.db.mongo_manager import MONGO_STORE_MANAGER +from src.person_name.cython_extract_methods import filter_already_validated_contacts, read_pinyin_list_from_file from src.pojo.contact_pojo import ContactPojo from src.utils.contacts.generate_random_passport_id import get_random_passport_id_number from src.utils.excel_reader import read_contacts, fr_phone_number_prefix, get_random_fr_phone_numbers, ExcelHelper @@ -12,7 +13,7 @@ from src.utils.excel_reader import read_contacts, fr_phone_number_prefix, get_ra # from src.person_name.cython_extract_methods import filter_already_validated_contacts, read_pinyin_list_from_file -DEFAULT_SERIAL = "47e7e36b" +DEFAULT_SERIAL_TO_IGNORE = ["47e7e36b", "bitbrowser"] def upload_contacts_list(): @@ -88,7 +89,7 @@ def write_new_contacts_to_excel(valid_contacts: list, file_name=str(datetime.dat def generate_valid_contact_list_for_day(segment_number=1): - _collection_name = "2024-12-13" + _collection_name = "2024-12-26" _valid_contact_list = MONGO_STORE_MANAGER.get_all_successful_items_for_one_day(_collection_name) _all_contacts = MONGO_STORE_MANAGER.get_all_contacts_to_book() _contact_to_save = [] @@ -120,6 +121,13 @@ def generate_valid_contact_list_for_day(segment_number=1): if _need_to_save: _contact_to_save.append(_contact) _contact_to_save_list = _contact_to_save + _contact_serial_map = MONGO_STORE_MANAGER.get_all_contact_serial_list() + for contact in _contact_to_save_list: + if contact.serial in DEFAULT_SERIAL_TO_IGNORE: + for _contact_serial in _contact_serial_map: + if _contact_serial.mail == contact.mail: + contact.serial = _contact_serial.serial + break write_new_contacts_to_excel(_contact_to_save_list, file_name=_collection_name) for i in range(0, segment_number): _step = int(len(_contact_to_save_list) / segment_number) @@ -136,7 +144,7 @@ def merge_contact_list_files(file_list: list, final_file_name="merged_contact_li _con.store = "random" _contact_serial_map = MONGO_STORE_MANAGER.get_all_contact_serial_list() for contact in _all_contact_list: - if contact.serial == DEFAULT_SERIAL: + if contact.serial == DEFAULT_SERIAL_TO_IGNORE: for _contact_serial in _contact_serial_map: if _contact_serial.mail == contact.mail: contact.serial = _contact_serial.serial @@ -213,7 +221,7 @@ if __name__ == '__main__': # contacts_to_book = upload_contacts_list() # MONGO_STORE_MANAGER.upload_contact_list(contacts_to_book) # print("start at {}".format(datetime.datetime.now())) - # generate_valid_contact_list_for_day(segment_number=2) + generate_valid_contact_list_for_day(segment_number=2) # generate_contact_from_mail_list("/Users/lpan/Downloads/邮箱及密码.xlsx") # print("end at {}".format(datetime.datetime.now())) # update_contact_list_not_received_mail() @@ -221,10 +229,10 @@ if __name__ == '__main__': # get_old_validated_contact_list() # print("end at {}".format(datetime.datetime.now())) # generate_all_contact_list() - merge_contact_list_files( - ["/Users/lpan/Desktop/contact_list_2024-11-04.xlsx", - "/Users/lpan/Desktop/contact_list_2024-11-07.xlsx", - "/Users/lpan/Desktop/contact_list_2024-11-08.xlsx", - "/Users/lpan/Desktop/contact_list_2024-11-06.xlsx" - ]) + # merge_contact_list_files( + # ["/Users/lpan/Desktop/contact_list_2024-11-04.xlsx", + # "/Users/lpan/Desktop/contact_list_2024-11-07.xlsx", + # "/Users/lpan/Desktop/contact_list_2024-11-08.xlsx", + # "/Users/lpan/Desktop/contact_list_2024-11-06.xlsx" + # ]) # fix_phone_number_format("/Users/lpan/Desktop/15_05_to_test.xlsx")