diff --git a/chrome_tixcraft.py b/chrome_tixcraft.py index 6c5f19a..3b230cb 100644 --- a/chrome_tixcraft.py +++ b/chrome_tixcraft.py @@ -44,7 +44,7 @@ except Exception as exc: print(exc) pass -CONST_APP_VERSION = "MaxBot (2024.03.23)" +CONST_APP_VERSION = "MaxBot (2024.03.24)" CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" CONST_MAXBOT_CONFIG_FILE = "settings.json" @@ -10968,7 +10968,7 @@ def main(args): # for kktix.cc and kktix.com if 'kktix.c' in url: - kktix_dict = kktix_main(driver, url, config_dict, kktix_dict) + kktix_dict, is_quit_bot = kktix_main(driver, url, config_dict, kktix_dict) if 'famiticket.com' in url: fami_dict = famiticket_main(driver, url, config_dict, fami_dict) diff --git a/config_launcher.py b/config_launcher.py index 650fffe..e3f7c3b 100644 --- a/config_launcher.py +++ b/config_launcher.py @@ -24,7 +24,7 @@ import webbrowser import util -CONST_APP_VERSION = "MaxBot (2024.03.23)" +CONST_APP_VERSION = "MaxBot (2024.03.24)" CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/kktix_status.py b/kktix_status.py index 875fe63..2f942a0 100644 --- a/kktix_status.py +++ b/kktix_status.py @@ -29,7 +29,7 @@ from datetime import datetime import util -CONST_APP_VERSION = "MaxBot (2024.03.23)" +CONST_APP_VERSION = "MaxBot (2024.03.24)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_KKTIX_CONFIG_FILE = "kktix.json" diff --git a/nodriver_tixcraft.py b/nodriver_tixcraft.py index 7c7c941..1d06e5e 100644 --- a/nodriver_tixcraft.py +++ b/nodriver_tixcraft.py @@ -32,7 +32,7 @@ except Exception as exc: print(exc) pass -CONST_APP_VERSION = "MaxBot (2024.03.23)" +CONST_APP_VERSION = "MaxBot (2024.03.24)" CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/settings.py b/settings.py index e20d91a..9933db7 100644 --- a/settings.py +++ b/settings.py @@ -41,7 +41,7 @@ try: except Exception as exc: pass -CONST_APP_VERSION = "MaxBot (2024.03.23)" +CONST_APP_VERSION = "MaxBot (2024.03.24)" CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_reload.js b/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_reload.js index c225b66..54df6cf 100644 --- a/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_reload.js +++ b/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_reload.js @@ -178,7 +178,7 @@ function kktix_force_auto_reload_by_timer() if(max_dwell_time <= 10) { max_dwell_time = 10; } - //console.log('We are going to reload after few seconeds.'); + console.log('We are going to force reload after few seconeds.'); setTimeout(function () { location.reload(); }, max_dwell_time * 1000); diff --git a/webdriver/Maxbotplus_1.0.0/options.html b/webdriver/Maxbotplus_1.0.0/options.html index 4d2c897..0411339 100644 --- a/webdriver/Maxbotplus_1.0.0/options.html +++ b/webdriver/Maxbotplus_1.0.0/options.html @@ -130,6 +130,12 @@ +
+ +
+ +
+
diff --git a/webdriver/Maxbotplus_1.0.0/options.js b/webdriver/Maxbotplus_1.0.0/options.js index 62d4c55..e833d10 100644 --- a/webdriver/Maxbotplus_1.0.0/options.js +++ b/webdriver/Maxbotplus_1.0.0/options.js @@ -8,6 +8,7 @@ const area_select_mode = document.querySelector('#area_select_mode'); const area_keyword = document.querySelector('#area_keyword'); const keyword_exclude = document.querySelector('#keyword_exclude'); const auto_reload_page_interval = document.querySelector('#auto_reload_page_interval'); +const max_dwell_time = document.querySelector('#max_dwell_time'); const disable_adjacent_seat = document.querySelector('#disable_adjacent_seat'); const ocr_captcha_enable = document.querySelector('#ocr_captcha_enable'); const ocr_captcha_use_public_server = document.querySelector('#ocr_captcha_use_public_server'); @@ -58,6 +59,7 @@ async function saveChanges() settings.keyword_exclude = keyword_exclude.value; settings.advanced.auto_reload_page_interval = auto_reload_page_interval.value; + settings.advanced.max_dwell_time = max_dwell_time.value; settings.advanced.disable_adjacent_seat = disable_adjacent_seat.checked; settings.ocr_captcha.enable = ocr_captcha_enable.checked; @@ -108,6 +110,7 @@ function loadChanges() keyword_exclude.value = settings.keyword_exclude; auto_reload_page_interval.value = settings.advanced.auto_reload_page_interval; + max_dwell_time.value = settings.advanced.max_dwell_time; disable_adjacent_seat.checked = settings.advanced.disable_adjacent_seat; ocr_captcha_enable.checked = settings.ocr_captcha.enable;