diff --git a/chrome_tixcraft.py b/chrome_tixcraft.py index 58de89b..07e03f3 100644 --- a/chrome_tixcraft.py +++ b/chrome_tixcraft.py @@ -54,7 +54,7 @@ import webbrowser import argparse import chromedriver_autoinstaller -CONST_APP_VERSION = "MaxBot (2023.08.14)" +CONST_APP_VERSION = "MaxBot (2023.08.15)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" diff --git a/config_launcher.py b/config_launcher.py index 8d6d695..87cd167 100644 --- a/config_launcher.py +++ b/config_launcher.py @@ -22,7 +22,7 @@ import base64 import threading import subprocess -CONST_APP_VERSION = "MaxBot (2023.08.07)" +CONST_APP_VERSION = "MaxBot (2023.08.15)" CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json" CONST_MAXBOT_CONFIG_FILE = "settings.json" @@ -37,14 +37,12 @@ URL_CHROME_DRIVER = 'https://chromedriver.chromium.org/' URL_FIREFOX_DRIVER = 'https://github.com/mozilla/geckodriver/releases' URL_EDGE_DRIVER = 'https://developer.microsoft.com/zh-tw/microsoft-edge/tools/webdriver/' - def load_translate(): translate = {} en_us={} en_us["language"] = 'Language' en_us["enable"] = 'Enable' - en_us["config_list"] = 'Config List' en_us["advanced"] = 'Advanced' en_us["about"] = 'About' diff --git a/settings.py b/settings.py index 2e2a99e..efd0614 100644 --- a/settings.py +++ b/settings.py @@ -34,7 +34,7 @@ warnings.simplefilter('ignore',InsecureRequestWarning) import ssl ssl._create_default_https_context = ssl._create_unverified_context -CONST_APP_VERSION = "MaxBot (2023.08.14)" +CONST_APP_VERSION = "MaxBot (2023.08.15)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" @@ -138,6 +138,7 @@ def load_translate(): en_us["ocr_captcha_ddddocr_beta"] = 'ddddocr beta' en_us["ocr_captcha_force_submit"] = 'Away from keyboard' en_us["ocr_captcha_image_source"] = 'OCR image source' + en_us["ocr_captcha_not_support_arm"] = 'ddddocr only supports Intel CPU' en_us["webdriver_type"] = 'WebDriver type' en_us["headless"] = 'Headless mode' # Make the operation more talkative @@ -232,6 +233,7 @@ def load_translate(): zh_tw["ocr_captcha_ddddocr_beta"] = 'ddddocr beta' zh_tw["ocr_captcha_force_submit"] = '掛機模式' zh_tw["ocr_captcha_image_source"] = 'OCR圖片取得方式' + zh_tw["ocr_captcha_not_support_arm"] = 'ocr 只支援 Intel CPU' zh_tw["webdriver_type"] = 'WebDriver類別' zh_tw["headless"] = '無圖形界面模式' zh_tw["verbose"] = '輸出詳細除錯訊息' @@ -325,6 +327,7 @@ def load_translate(): zh_cn["ocr_captcha_ddddocr_beta"] = 'ddddocr beta' zh_cn["ocr_captcha_force_submit"] = '挂机模式' zh_cn["ocr_captcha_image_source"] = 'OCR图像源' + zh_cn["ocr_captcha_not_support_arm"] = 'ddddocr 仅支持 Intel CPU' zh_cn["webdriver_type"] = 'WebDriver类别' zh_cn["headless"] = '无图形界面模式' zh_cn["verbose"] = '输出详细除错讯息' @@ -419,6 +422,7 @@ def load_translate(): ja_jp["ocr_captcha_ddddocr_beta"] = 'ddddocr beta' ja_jp["ocr_captcha_force_submit"] = 'キーボードから離れて' ja_jp["ocr_captcha_image_source"] = 'OCR 画像ソース' + ja_jp["ocr_captcha_not_support_arm"] = 'Intel CPU のみをサポートします' ja_jp["webdriver_type"] = 'WebDriverタイプ' ja_jp["headless"] = 'ヘッドレスモード' ja_jp["verbose"] = '詳細モード' @@ -1155,6 +1159,7 @@ def applyNewLanguage(): global lbl_ocr_captcha_ddddocr_beta global lbl_ocr_captcha_force_submit global lbl_ocr_captcha_image_source + global lbl_ocr_captcha_not_support_arm global lbl_webdriver_type global lbl_headless global lbl_verbose @@ -1223,6 +1228,7 @@ def applyNewLanguage(): lbl_ocr_captcha_ddddocr_beta.config(text=translate[language_code]["ocr_captcha_ddddocr_beta"]) lbl_ocr_captcha_force_submit.config(text=translate[language_code]["ocr_captcha_force_submit"]) lbl_ocr_captcha_image_source.config(text=translate[language_code]["ocr_captcha_image_source"]) + lbl_ocr_captcha_not_support_arm.config(text=translate[language_code]["ocr_captcha_not_support_arm"]) lbl_webdriver_type.config(text=translate[language_code]["webdriver_type"]) lbl_adjacent_seat.config(text=translate[language_code]["disable_adjacent_seat"]) lbl_auto_reload_page_interval.config(text=translate[language_code]["auto_reload_page_interval"]) @@ -1937,13 +1943,22 @@ def AdvancedTab(root, config_dict, language_code, UI_PADDING_X): lbl_ocr_captcha = Label(frame_group_header, text=translate[language_code]['ocr_captcha']) lbl_ocr_captcha.grid(column=0, row=group_row_count, sticky = E) + frame_group_ddddocr_enable = Frame(frame_group_header) + global chk_state_ocr_captcha chk_state_ocr_captcha = BooleanVar() chk_state_ocr_captcha.set(config_dict['ocr_captcha']["enable"]) global chk_ocr_captcha - chk_ocr_captcha = Checkbutton(frame_group_header, text=translate[language_code]['enable'], variable=chk_state_ocr_captcha, command=showHideOcrCaptchaWithSubmit) - chk_ocr_captcha.grid(column=1, row=group_row_count, sticky = W) + chk_ocr_captcha = Checkbutton(frame_group_ddddocr_enable, text=translate[language_code]['enable'], variable=chk_state_ocr_captcha, command=showHideOcrCaptchaWithSubmit) + chk_ocr_captcha.grid(column=0, row=0, sticky = W) + + global lbl_ocr_captcha_not_support_arm + lbl_ocr_captcha_not_support_arm = Label(frame_group_ddddocr_enable, fg="red", text=translate[language_code]['ocr_captcha_not_support_arm']) + if is_arm(): + lbl_ocr_captcha_not_support_arm.grid(column=1, row=0, sticky = E) + + frame_group_ddddocr_enable.grid(column=1, row=group_row_count, sticky = W) group_row_count +=1 diff --git a/text_server.py b/text_server.py index dd9340c..cb114d6 100644 --- a/text_server.py +++ b/text_server.py @@ -28,7 +28,7 @@ import asyncio import tornado from tornado.web import Application -CONST_APP_VERSION = "MaxBot (2023.08.07)" +CONST_APP_VERSION = "MaxBot (2023.08.15)" CONST_MAXBOT_QUESTION_FILE = "MAXBOT_QUESTION.txt"