From c7846895348e8a4bd3fbab431ec574de9db15d86 Mon Sep 17 00:00:00 2001 From: CHUN YU YAO Date: Tue, 7 Nov 2023 22:36:59 +0800 Subject: [PATCH] 2023-11-05 --- chrome_tixcraft.py | 13 ++++++------- config_launcher.py | 2 +- settings.py | 2 +- text_server.py | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/chrome_tixcraft.py b/chrome_tixcraft.py index c697cf7..6e59896 100644 --- a/chrome_tixcraft.py +++ b/chrome_tixcraft.py @@ -55,7 +55,7 @@ import webbrowser import chromedriver_autoinstaller -CONST_APP_VERSION = "MaxBot (2023.11.04)" +CONST_APP_VERSION = "MaxBot (2023.11.05)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" @@ -781,9 +781,7 @@ def get_driver_by_config(config_dict): print("create web driver object fail @_@;") else: try: - NETWORK_BLOCKED_URLS = ['*.woff' - ,'*.woff2' - ,'*.ttf' + NETWORK_BLOCKED_URLS = ['*.ttf' ,'*.otf' ,'*/adblock.js' ,'*/google_ad_block.js' @@ -798,7 +796,8 @@ def get_driver_by_config(config_dict): ,'*.rollbar.com/*' ,'*.cloudfront.com/*' ,'*.lndata.com/*' - ,'*twitter.com/i/*' + ,'*.twitter.com/i/*' + ,'*.fbcdn.net/*' ,'*youtube.com*' ,'*player.youku.*' ,'*e2elog.fetnet.net*'] @@ -11275,7 +11274,7 @@ def ticketplus_order_expansion_auto_select(driver, config_dict, area_keyword_ite if config_dict["advanced"]["verbose"]: show_debug_message = True - area_auto_select_mode = config_dict["area_auto_select"]["mode"] + auto_select_mode = config_dict["area_auto_select"]["mode"] is_need_refresh = False @@ -11421,7 +11420,7 @@ def ticketplus_order_expansion_auto_select(driver, config_dict, area_keyword_ite if is_match_area: matched_blocks.append(row) - if area_auto_select_mode == CONST_FROM_TOP_TO_BOTTOM: + if auto_select_mode == CONST_FROM_TOP_TO_BOTTOM: break if show_debug_message: diff --git a/config_launcher.py b/config_launcher.py index 7f18151..82870b2 100644 --- a/config_launcher.py +++ b/config_launcher.py @@ -22,7 +22,7 @@ import sys import threading import webbrowser -CONST_APP_VERSION = "MaxBot (2023.11.02)" +CONST_APP_VERSION = "MaxBot (2023.11.05)" CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/settings.py b/settings.py index 236d438..2a8e88f 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 (2023.11.04)" +CONST_APP_VERSION = "MaxBot (2023.11.05)" 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 c64d2fd..dadfb6c 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 (2023.11.02)" +CONST_APP_VERSION = "MaxBot (2023.11.05)" CONST_MAXBOT_QUESTION_FILE = "MAXBOT_QUESTION.txt"