diff --git a/main.py b/main.py index 2d4f7ea..212e865 100644 --- a/main.py +++ b/main.py @@ -18,9 +18,10 @@ logger = logging.getLogger() logger.addHandler(logging.StreamHandler(stream=sys.stdout)) -def start_book(start_number, end_number, store_choose_state=0, max_workers=20, proxy_type=ProxyType.BRIGHT_DATA, +def start_book(start_number, end_number, store_choose_state=0, max_workers=20, proxy_type=ProxyType.RESIDENTIAL, mode: ModeEnum = ModeEnum.MANUAL, headless=False): # read the contact, and contact the 2 objects together + print("Proxy type is " + proxy_type.value) excel_reader = ExcelHelper() all_contacts = excel_reader.read_contacts() if len(all_contacts) <= end_number: @@ -55,14 +56,16 @@ def recheck_the_captcha_error_contacts(on_no_contact_found, store_type=0, mode: proxy) -def get_proxy(proxy_type=ProxyType.BRIGHT_DATA): +def get_proxy(proxy_type=ProxyType.RESIDENTIAL): return params.get_proxy(proxy_type) if __name__ == '__main__': # 修改联系人行,结束联系人行 第三个参数store等于0的时候是随机,传入1的时候是总店 - # start_book(1, 10, store_choose_state=1, mode=ModeEnum.AUTOMATIC, headless=False) + start_book(800, 1500, store_choose_state=1, mode=ModeEnum.AUTOMATIC, headless=False, max_workers=5, + proxy_type=ProxyType.RESIDENTIAL) # start_book(828, 857, store_choose_state=1, mode=ModeEnum.AUTOMATIC, headless=True) - start_book(300, 301, store_choose_state=1, mode=ModeEnum.AUTOMATIC, headless=False, max_workers=15) + # start_book(1210, 1211, store_choose_state=1, mode=ModeEnum.AUTOMATIC, headless=False, max_workers=3, + # proxy_type=ProxyType.MOBILE) # recheck_the_captcha_error_contacts(store_type=1, mode=ModeEnum.AUTOMATIC, on_no_contact_found=lambda: None, # headless=True) diff --git a/src/workers/commandor_page.py b/src/workers/commandor_page.py index 97f7dc1..a4278eb 100644 --- a/src/workers/commandor_page.py +++ b/src/workers/commandor_page.py @@ -139,7 +139,7 @@ class CommandorPage: userAgent = device['user_agent'] self.logger.info("user_agent is " + userAgent) # context = self.browser.new_context(**simulated_mobile, locale='fr-FR') - context = self.browser.new_context(**device) + context = self.browser.new_context(**device, locale='en-US') else: if use_proxy: self.browser = pwright.firefox.launch(headless=self.headless, timeout=PAGE_TIMEOUT, proxy=proxy) @@ -147,7 +147,7 @@ class CommandorPage: self.browser = pwright.firefox.launch(headless=self.headless, timeout=PAGE_TIMEOUT) userAgent = device['user_agent'] self.logger.info("user_agent is " + userAgent) - context = self.browser.new_context(user_agent=userAgent) + context = self.browser.new_context(user_agent=userAgent, locale='en-US') self.current_context = context self.create_and_config_page(context) return self.page.content()