From a7dc3230c6dcfa071eb41faa487104bdfb1c87db Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 30 Jun 2023 09:24:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=BA=E4=BA=86=E6=B3=B0=E5=8B=92=E7=B5=B2,?= =?UTF-8?q?=E4=BE=86=E5=8E=BB=E5=8D=97=E5=8D=8A=E7=90=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chrome_tixcraft.py | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/chrome_tixcraft.py b/chrome_tixcraft.py index f93b2d9..d897d3e 100644 --- a/chrome_tixcraft.py +++ b/chrome_tixcraft.py @@ -53,7 +53,7 @@ import webbrowser import argparse import itertools -CONST_APP_VERSION = "MaxBot (2023.6.28)" +CONST_APP_VERSION = "MaxBot (2023.6.29)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" @@ -8870,13 +8870,24 @@ def hkticketing_url_redirect(driver, url, config_dict): redirect_url_list = [ 'queue.hkticketing.com/hotshow.html' , '.com/detection.aspx?rt=' , '/busy_galaxy.' + , '/hot1.ticketek.com.au/' + ] + + redirect_to_home_list = [ 'galaxymacau.com' + , 'ticketek.com' ] for redirect_url in redirect_url_list: if redirect_url in url: + # for hkticketing. entry_url = 'http://entry-hotshow.hkticketing.com/' - if 'galaxymacau.com' in url: - domain_name = url.split('/')[2] - entry_url = "https://%s/default.aspx" % (domain_name) + + # for macau + # for ticketek.com + for target_site in redirect_to_home_list: + if target_site in url: + domain_name = url.split('/')[2] + entry_url = "https://%s/default.aspx" % (domain_name) + break try: driver.get(entry_url) is_redirected = True @@ -8944,6 +8955,7 @@ def hkticketing_content_refresh(driver, url, config_dict): print("Start to automatically refresh page.") try: driver.switch_to.default_content() + print("redirect to new url:", new_url) driver.get(new_url) is_redirected = True except Exception as exc: @@ -8994,7 +9006,7 @@ def hkticketing_travel_iframe(driver, config_dict): return is_redirected -def hkticketing_main(driver, url, config_dict, hkticketing_dict): +def softix_powerweb_main(driver, url, config_dict, hkticketing_dict): home_url_list = ['https://premier.hkticketing.com/' ,'https://hotshow.hkticketing.com/' ,'https://premier.hkticketing.com/default.aspx' @@ -11168,11 +11180,15 @@ def main(args): if 'cityline.com' in url: cityline_main(driver, url, config_dict) + softix_family = False if 'hkticketing.com' in url: - hkticketing_dict = hkticketing_main(driver, url, config_dict, hkticketing_dict) - + softix_family = True if 'galaxymacau.com' in url: - hkticketing_dict = hkticketing_main(driver, url, config_dict, hkticketing_dict) + softix_family = True + if 'ticketek.com' in url: + softix_family = True + if softix_family: + hkticketing_dict = softix_powerweb_main(driver, url, config_dict, hkticketing_dict) # for facebook facebook_login_url = 'https://www.facebook.com/login.php?'