2023-11-05

master
CHUN YU YAO 2023-11-07 22:36:59 +08:00
parent 80c4c27bf2
commit c784689534
4 changed files with 9 additions and 10 deletions

View File

@ -55,7 +55,7 @@ import webbrowser
import chromedriver_autoinstaller 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_CONFIG_FILE = "settings.json"
CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" 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 @_@;") print("create web driver object fail @_@;")
else: else:
try: try:
NETWORK_BLOCKED_URLS = ['*.woff' NETWORK_BLOCKED_URLS = ['*.ttf'
,'*.woff2'
,'*.ttf'
,'*.otf' ,'*.otf'
,'*/adblock.js' ,'*/adblock.js'
,'*/google_ad_block.js' ,'*/google_ad_block.js'
@ -798,7 +796,8 @@ def get_driver_by_config(config_dict):
,'*.rollbar.com/*' ,'*.rollbar.com/*'
,'*.cloudfront.com/*' ,'*.cloudfront.com/*'
,'*.lndata.com/*' ,'*.lndata.com/*'
,'*twitter.com/i/*' ,'*.twitter.com/i/*'
,'*.fbcdn.net/*'
,'*youtube.com*' ,'*youtube.com*'
,'*player.youku.*' ,'*player.youku.*'
,'*e2elog.fetnet.net*'] ,'*e2elog.fetnet.net*']
@ -11275,7 +11274,7 @@ def ticketplus_order_expansion_auto_select(driver, config_dict, area_keyword_ite
if config_dict["advanced"]["verbose"]: if config_dict["advanced"]["verbose"]:
show_debug_message = True 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 is_need_refresh = False
@ -11421,7 +11420,7 @@ def ticketplus_order_expansion_auto_select(driver, config_dict, area_keyword_ite
if is_match_area: if is_match_area:
matched_blocks.append(row) matched_blocks.append(row)
if area_auto_select_mode == CONST_FROM_TOP_TO_BOTTOM: if auto_select_mode == CONST_FROM_TOP_TO_BOTTOM:
break break
if show_debug_message: if show_debug_message:

View File

@ -22,7 +22,7 @@ import sys
import threading import threading
import webbrowser 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_LAUNCHER_FILE = "config_launcher.json"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"

View File

@ -34,7 +34,7 @@ import ssl
ssl._create_default_https_context = ssl._create_unverified_context 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_CONFIG_FILE = "settings.json"
CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt"

View File

@ -27,7 +27,7 @@ import pyperclip
import tornado import tornado
from tornado.web import Application 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" CONST_MAXBOT_QUESTION_FILE = "MAXBOT_QUESTION.txt"