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

2024-01-04, update third package as max's version.

master
unknown 2024-01-10 18:43:52 +08:00
parent 933cd36d67
commit a60d3fd899
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chrome_tixcraft.py
View File

@ -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:

2
config_launcher.py
View File

@ -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"

8
pip-req.txt
View File

@ -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

2
settings.py
View File

@ -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"

2
text_server.py
View File

@ -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"