evanchen
/
tixcraft_bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-06-08, update for macOS arm

master
CHUN YU YAO 2023-06-09 22:08:28 +08:00
parent fcc366e3cf
commit 24b366ffdc
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
chrome_tixcraft.py
View File

@ -54,7 +54,7 @@ import itertools
import ssl import ssl
ssl._create_default_https_context = ssl._create_unverified_context ssl._create_default_https_context = ssl._create_unverified_context
CONST_APP_VERSION = u"MaxBot (2023.6.7) ver 10" CONST_APP_VERSION = "MaxBot (2023.6.8)"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"
CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt"
@ -438,26 +438,29 @@ def load_chromdriver_uc(webdriver_path, adblock_plus_enable, headless):
caps["unhandledPromptBehavior"] = u"accept" caps["unhandledPromptBehavior"] = u"accept"
driver = None driver = None
try: if os.path.exists(chromedriver_path):
driver = uc.Chrome(executable_path=chromedriver_path, options=options, desired_capabilities=caps, suppress_welcome=False) try:
except Exception as exc: driver = uc.Chrome(driver_executable_path=chromedriver_path, options=options, desired_capabilities=caps)
error_message = str(exc) except Exception as exc:
left_part = None error_message = str(exc)
if "Stacktrace:" in error_message: #print(exc)
left_part = error_message.split("Stacktrace:")[0] left_part = None
print(left_part) if "Stacktrace:" in error_message:
left_part = error_message.split("Stacktrace:")[0]
print(left_part)
if "This version of ChromeDriver only supports Chrome version" in error_message: if "This version of ChromeDriver only supports Chrome version" in error_message:
print(CONST_CHROME_VERSION_NOT_MATCH_EN) print(CONST_CHROME_VERSION_NOT_MATCH_EN)
print(CONST_CHROME_VERSION_NOT_MATCH_TW) print(CONST_CHROME_VERSION_NOT_MATCH_TW)
else: if driver is None:
#print("Oops! web driver not on path:",chromedriver_path ) #print("Oops! web driver not on path:",chromedriver_path )
print('undetected_chromedriver automatically download chromedriver.') print('undetected_chromedriver automatically download chromedriver.')
try: try:
driver = uc.Chrome(options=options, desired_capabilities=caps, suppress_welcome=False) driver = uc.Chrome(options=options, desired_capabilities=caps)
except Exception as exc: except Exception as exc:
error_message = str(exc) error_message = str(exc)
#print(exc)
left_part = None left_part = None
if "Stacktrace:" in error_message: if "Stacktrace:" in error_message:
left_part = error_message.split("Stacktrace:")[0] left_part = error_message.split("Stacktrace:")[0]
@ -10249,7 +10252,7 @@ def main(args):
driver = None driver = None
if not config_dict is None: if not config_dict is None:
for i in range(50): for i in range(3):
driver = get_driver_by_config(config_dict) driver = get_driver_by_config(config_dict)
if not driver is None: if not driver is None:
break break

2
config_launcher.py
View File

@ -22,7 +22,7 @@ import base64
import threading import threading
import subprocess import subprocess
CONST_APP_VERSION = u"MaxBot (2023.6.7)" CONST_APP_VERSION = "MaxBot (2023.6.8)"
CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json" CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"

2
settings.py
View File

@ -25,7 +25,7 @@ import threading
import subprocess import subprocess
import json import json
CONST_APP_VERSION = u"MaxBot (2023.6.7) ver 10" CONST_APP_VERSION = "MaxBot (2023.6.8)"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"
CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt"