support file list

queue_message/appointmentrequestsender.py

@@ -64,18 +64,16 @@ def is_open():
 
 class AppointmentRequestSender(threading.Thread):
     def __init__(self, sub_contact_list: list, logger, cookiesPublisher: CookiesPublisher,
-                 just_send=False,
                  queue_name=REQUEST_DATA_QUEUE):
         super().__init__()
         self.connection = None
-        self.just_send = just_send
         self.logger = logger
         self.already_tried_contact_list = []
         self.cookiesPublisher = cookiesPublisher
         self.channel = None
         self.valid_csrf = None
         self.list_to_retrieve_mails = sub_contact_list
-        self.initial_contact_list = sub_contact_list
+        self.initial_contact_list = sub_contact_list.copy()
         self.contact_list = sub_contact_list
         self.queue_name = queue_name
         self.proxy_manager = ProxyManager(logger)
@@ -112,10 +110,7 @@ class AppointmentRequestSender(threading.Thread):
                                  rs_w=_received_dict['rs_w'], rs_cd=_received_dict['rs_cd'])
             _received_cookies = _received_dict["cookiesStr"]
             # remove already sent contacts
-            if self.just_send:
-                self.contact_list = filter_contacts(self.contact_list, self.already_tried_contact_list)
-            else:
-                self.contact_list = filter_contacts(self.contact_list)
+            self.contact_list = filter_contacts(self.contact_list, self.already_tried_contact_list)
             # remove already booked contacts
             random.shuffle(self.contact_list)
             if len(self.contact_list) > 0 and is_open():
@@ -222,6 +217,7 @@ class AppointmentRequestSender(threading.Thread):
         self.channel.start_consuming()
 
     def retrieve_invalidate_urls(self):
+        # 如果没有已读邮件，而且需要读邮件的联系人表不为空，就读取未读邮件
         if not self.already_read_emails and len(self.list_to_retrieve_mails) > 0:
             self.logger.info("will retrieve validate urls")
             time.sleep(30)
@@ -238,9 +234,13 @@ class AppointmentRequestSender(threading.Thread):
         else:
             self.logger.info("already read emails, is there any contacts to use")
             self.logger.info("reset already_tried_contact_list")
+            # 重置已尝试的联系人
             self.already_tried_contact_list = []
             self.contact_list = filter_contacts(self.initial_contact_list, self.already_tried_contact_list)
             self.logger.info("contact_list size is " + str(len(self.contact_list)))
             if len(self.contact_list) > 0:
                 self.logger.info("set already_read_emails to False")
                 self.already_read_emails = False
+            else:
+                self.logger.info("already read emails, no contact to use -> stop")
+                self.channel.stop_consuming()