From a60d3fd899b820130654e2982b926582d45b15ca Mon Sep 17 00:00:00 2001 From: unknown <2303063@ad.nchc.org.tw> Date: Wed, 10 Jan 2024 18:43:52 +0800 Subject: [PATCH] 2024-01-04, update third package as max's version. --- chrome_tixcraft.py | 14 +++++++------- config_launcher.py | 2 +- pip-req.txt | 8 ++++---- settings.py | 2 +- text_server.py | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/chrome_tixcraft.py b/chrome_tixcraft.py index cbf037d..2c63e13 100644 --- a/chrome_tixcraft.py +++ b/chrome_tixcraft.py @@ -52,9 +52,9 @@ except Exception as exc: import argparse import webbrowser -import chromedriver_autoinstaller +import chromedriver_autoinstaller_max -CONST_APP_VERSION = "MaxBot (2024.01.03)" +CONST_APP_VERSION = "MaxBot (2024.01.04)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" @@ -483,7 +483,7 @@ def load_chromdriver_normal(config_dict, driver_type): if not os.path.exists(chromedriver_path): print("WebDriver not exist, try to download to:", webdriver_path) - chromedriver_autoinstaller.install(path=webdriver_path, make_version_dir=False) + chromedriver_autoinstaller_max.install(path=webdriver_path, make_version_dir=False) if not os.path.exists(chromedriver_path): print("Please download chromedriver and extract zip to webdriver folder from this url:") @@ -515,7 +515,7 @@ def load_chromdriver_normal(config_dict, driver_type): print(exc2) pass - chromedriver_autoinstaller.install(path=webdriver_path, make_version_dir=False) + chromedriver_autoinstaller_max.install(path=webdriver_path, make_version_dir=False) chrome_service = Service(chromedriver_path) try: chrome_options = get_chrome_options(webdriver_path, config_dict) @@ -651,10 +651,10 @@ def load_chromdriver_uc(config_dict): if not os.path.exists(chromedriver_path): print("ChromeDriver not exist, try to download to:", webdriver_path) try: - chromedriver_autoinstaller.install(path=webdriver_path, make_version_dir=False) + chromedriver_autoinstaller_max.install(path=webdriver_path, make_version_dir=False) if not os.path.exists(chromedriver_path): print("check installed chrome version fail, download last known good version.") - chromedriver_autoinstaller.install(path=webdriver_path, make_version_dir=False, detect_installed_version=False) + chromedriver_autoinstaller_max.install(path=webdriver_path, make_version_dir=False, detect_installed_version=False) except Exception as exc: print(exc) else: @@ -690,7 +690,7 @@ def load_chromdriver_uc(config_dict): pass try: - chromedriver_autoinstaller.install(path=webdriver_path, make_version_dir=False) + chromedriver_autoinstaller_max.install(path=webdriver_path, make_version_dir=False) options = get_uc_options(uc, config_dict, webdriver_path) driver = uc.Chrome(driver_executable_path=chromedriver_path, options=options) except Exception as exc2: diff --git a/config_launcher.py b/config_launcher.py index bcaed47..8dd30cf 100644 --- a/config_launcher.py +++ b/config_launcher.py @@ -22,7 +22,7 @@ import sys import threading import webbrowser -CONST_APP_VERSION = "MaxBot (2024.01.03)" +CONST_APP_VERSION = "MaxBot (2024.01.04)" CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/pip-req.txt b/pip-req.txt index c140c9d..57acbf5 100644 --- a/pip-req.txt +++ b/pip-req.txt @@ -13,9 +13,9 @@ numpy tornado #jieba +# PS: chromedriver_autoinstaller, please use max fork version. +# chromedriver_autoinstaller +python-chromedriver-autoinstaller-max + # Migrate looseversion to fix distutils issues on python 3.12+ for undetected-chromedriver looseversion - -# chromedriver_autoinstaller -# PS: chromedriver_autoinstaller, please use max fork version. -# python -m pip install git+https://github.com/max32002/python-chromedriver-autoinstaller@master diff --git a/settings.py b/settings.py index a6e372c..9515c47 100644 --- a/settings.py +++ b/settings.py @@ -34,7 +34,7 @@ import ssl ssl._create_default_https_context = ssl._create_unverified_context -CONST_APP_VERSION = "MaxBot (2024.01.03)" +CONST_APP_VERSION = "MaxBot (2024.01.04)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" diff --git a/text_server.py b/text_server.py index dd7eb2f..35b6d36 100644 --- a/text_server.py +++ b/text_server.py @@ -27,7 +27,7 @@ import pyperclip import tornado from tornado.web import Application -CONST_APP_VERSION = "MaxBot (2024.01.03)" +CONST_APP_VERSION = "MaxBot (2024.01.04)" CONST_MAXBOT_QUESTION_FILE = "MAXBOT_QUESTION.txt"