diff --git a/workers/link_validator_with_provided_list.py b/workers/link_validator_with_provided_list.py index bb9af8a..ab6b2fe 100644 --- a/workers/link_validator_with_provided_list.py +++ b/workers/link_validator_with_provided_list.py @@ -26,15 +26,15 @@ init_logger() logger = logging.getLogger() -def filter_link_pojo_list_with_serial(_received_dict, link_to_validate_list): +def filter_link_pojo_list_with_model(_received_dict, link_to_validate_list): _serial = _received_dict["serial"] _model = _received_dict["model"] - # _bit_browser_list = list(filter(lambda link_pojo: link_pojo.serial == "requests", link_to_validate_list)) - _bit_browser_list = link_to_validate_list - if len(_bit_browser_list) > 0: - return _bit_browser_list + _links_filtered_by_model = list(filter(lambda link_pojo: link_pojo.model == _model, link_to_validate_list)) + _links_filtered_by_model = link_to_validate_list + if len(_links_filtered_by_model) > 0: + return _links_filtered_by_model else: - _to_return = filter(lambda link_pojo: link_pojo.serial == _serial, link_to_validate_list) + _to_return = filter(lambda link_pojo: link_pojo.model == _model, link_to_validate_list) return list(_to_return) @@ -156,7 +156,7 @@ class LinkValidatorWithProvidedList(threading.Thread): _received_dict = json.loads(_received_object) _received_cookies = _received_dict["cookiesStr"] self.cookie_str = _received_cookies - _links_to_validate = filter_link_pojo_list_with_serial(_received_dict, self.link_to_validate_list) + _links_to_validate = filter_link_pojo_list_with_model(_received_dict, self.link_to_validate_list) random.shuffle(_links_to_validate) if len(_links_to_validate) > 0 and _message_in_queue_count >= self.limit: print("{}:links number is {}".format(threading.currentThread().name, len(_links_to_validate)))