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

mix firefox and webkit

Browse Source
This commit is contained in:
PAN Lei
2022-12-23 11:45:25 +01:00
parent c910598654
commit f1e1b263f2
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/workers/commandor_page.py
+8 -4
View File
@@ -97,6 +97,7 @@ class CommandorPage:
self.otp_value = None self.otp_value = None
# device = None # device = None
device_key = random.choice(params.DEVICES) device_key = random.choice(params.DEVICES)
device_key = random.sample(list(self.tls.playwright.devices), 1)[0]
device = self.tls.playwright.devices[device_key] device = self.tls.playwright.devices[device_key]
# while device is None: # while device is None:
# device_key = random.sample(list(self.tls.playwright.devices), 1)[0] # device_key = random.sample(list(self.tls.playwright.devices), 1)[0]
@@ -130,8 +131,8 @@ class CommandorPage:
def start_browser(self, proxy, pwright, device, use_proxy=True) -> Union[str, None]: def start_browser(self, proxy, pwright, device, use_proxy=True) -> Union[str, None]:
try: try:
default_browser_type = device['default_browser_type'] self.default_browser_type = device['default_browser_type']
if default_browser_type == "webkit": if self.default_browser_type == "webkit":
if use_proxy: if use_proxy:
self.browser = pwright.webkit.launch(headless=self.headless, timeout=PAGE_TIMEOUT, proxy=proxy) self.browser = pwright.webkit.launch(headless=self.headless, timeout=PAGE_TIMEOUT, proxy=proxy)
else: else:
@@ -225,9 +226,14 @@ class CommandorPage:
def _setPhoneCountryAndStore(self): def _setPhoneCountryAndStore(self):
try: try:
if self.store_type == 0: if self.store_type == 0:
if self.default_browser_type == "webkit":
self.page.evaluate("""()=>{ self.page.evaluate("""()=>{
document.getElementById("phone_country").focus(); document.getElementById("phone_country").focus();
document.getElementById("phone_country").value = \"CN\"; }""") document.getElementById("phone_country").value = \"CN\"; }""")
else:
self.page.evaluate("""()=>{
document.getElementById("phone_country").focus();
document.getElementById("phone_country").value = \"FR\"; }""")
else: else:
store_to_choose = self.store_map[self.store_type] store_to_choose = self.store_map[self.store_type]
self.page.evaluate("""(store_to_choose)=>{ self.page.evaluate("""(store_to_choose)=>{
@@ -273,8 +279,6 @@ class CommandorPage:
print("audio_button not found") print("audio_button not found")
return False return False
def get_errors(self): def get_errors(self):
# send error result # send error result
if self.page.url != BLANK_URL: if self.page.url != BLANK_URL: