2024-03-11, change versin code.
							parent
							
								
									4ca9e4f066
								
							
						
					
					
						commit
						9f79ea672a
					
				|  | @ -42,7 +42,7 @@ try: | |||
| except Exception as exc: | ||||
|     pass | ||||
| 
 | ||||
| CONST_APP_VERSION = "MaxBot (2024.03.10)" | ||||
| CONST_APP_VERSION = "MaxBot (2024.03.11)" | ||||
| 
 | ||||
| CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" | ||||
| CONST_MAXBOT_CONFIG_FILE = "settings.json" | ||||
|  | @ -111,6 +111,7 @@ CONST_OCR_CAPTCH_IMAGE_SOURCE_CANVAS = "canvas" | |||
| CONST_WEBDRIVER_TYPE_SELENIUM = "selenium" | ||||
| CONST_WEBDRIVER_TYPE_UC = "undetected_chromedriver" | ||||
| CONST_WEBDRIVER_TYPE_DP = "DrissionPage" | ||||
| CONST_WEBDRIVER_TYPE_ND = "nodriver" | ||||
| CONST_CHROME_FAMILY = ["chrome","edge","brave"] | ||||
| USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36" | ||||
| 
 | ||||
|  | @ -8460,8 +8461,9 @@ def cityline_auto_retry_access(driver, config_dict): | |||
|         btn_retry = driver.find_element(By.CSS_SELECTOR, 'button') | ||||
|         if not btn_retry is None: | ||||
|             js = btn_retry.get_attribute('onclick') | ||||
|             driver.set_script_timeout(1) | ||||
|             driver.execute_script(js) | ||||
|             if len(js) > 0: | ||||
|                 driver.set_script_timeout(1) | ||||
|                 driver.execute_script(js) | ||||
|     except Exception as exc: | ||||
|         pass | ||||
| 
 | ||||
|  | @ -8533,11 +8535,7 @@ def cityline_input_code(driver, config_dict, fail_list): | |||
| 
 | ||||
|     return fail_list | ||||
| 
 | ||||
| def cityline_main(driver, url, config_dict): | ||||
|     # https://msg.cityline.com/ https://event.cityline.com/ | ||||
|     if 'msg.cityline.com' in url or 'event.cityline.com' in url: | ||||
|         cityline_auto_retry_access(driver, config_dict) | ||||
| 
 | ||||
| def cityline_close_second_tab(driver): | ||||
|     try: | ||||
|         window_handles_count = len(driver.window_handles) | ||||
|         if window_handles_count > 1: | ||||
|  | @ -8551,6 +8549,13 @@ def cityline_main(driver, url, config_dict): | |||
|     except Exception as exc: | ||||
|         pass | ||||
| 
 | ||||
| def cityline_main(driver, url, config_dict): | ||||
|     # https://msg.cityline.com/ https://event.cityline.com/ | ||||
|     if 'msg.cityline.com' in url or 'event.cityline.com' in url: | ||||
|         cityline_auto_retry_access(driver, config_dict) | ||||
| 
 | ||||
|     cityline_close_second_tab(driver) | ||||
| 
 | ||||
|     if '.cityline.com/Events.html' in url: | ||||
|         cityline_cookie_accept(driver) | ||||
| 
 | ||||
|  |  | |||
|  | @ -23,8 +23,8 @@ import sys | |||
| import threading | ||||
| import webbrowser | ||||
| 
 | ||||
| CONST_APP_VERSION = "MaxBot (2024.03.10)" | ||||
| 
 | ||||
| CONST_APP_VERSION = "MaxBot (2024.03.11)" | ||||
| s | ||||
| CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json" | ||||
| CONST_MAXBOT_CONFIG_FILE = "settings.json" | ||||
| 
 | ||||
|  |  | |||
|  | @ -11,7 +11,7 @@ import requests | |||
| import asyncio | ||||
| import nodriver as uc | ||||
| 
 | ||||
| CONST_APP_VERSION = "MaxBot (2024.03.10)" | ||||
| CONST_APP_VERSION = "MaxBot (2024.03.11)" | ||||
| 
 | ||||
| CONST_MAXBOT_CONFIG_FILE = "settings.json" | ||||
| USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36" | ||||
|  |  | |||
|  | @ -29,7 +29,7 @@ from datetime import datetime | |||
| 
 | ||||
| import requests | ||||
| 
 | ||||
| CONST_APP_VERSION = "MaxBot (2024.03.10)" | ||||
| CONST_APP_VERSION = "MaxBot (2024.03.11)" | ||||
| 
 | ||||
| CONST_MAXBOT_CONFIG_FILE = "settings.json" | ||||
| CONST_MAXBOT_KKTIX_CONFIG_FILE = "kktix.json" | ||||
|  |  | |||
|  | @ -79,7 +79,7 @@ | |||
|         "auto_reload_page_interval": 0.1, | ||||
|         "reset_browser_interval": 0.0, | ||||
|         "proxy_server_port": "", | ||||
|         "window_size": "512,520", | ||||
|         "window_size": "512,1024", | ||||
|         "idle_keyword": "", | ||||
|         "resume_keyword": "", | ||||
|         "idle_keyword_second": "", | ||||
|  |  | |||
|  | @ -50,7 +50,7 @@ try: | |||
| except Exception as exc: | ||||
|     pass | ||||
| 
 | ||||
| CONST_APP_VERSION = "MaxBot (2024.03.10)" | ||||
| CONST_APP_VERSION = "MaxBot (2024.03.11)" | ||||
| 
 | ||||
| CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" | ||||
| CONST_MAXBOT_CONFIG_FILE = "settings.json" | ||||
|  | @ -757,7 +757,7 @@ def get_default_config(): | |||
|     config_dict["advanced"]["auto_reload_page_interval"] = 0.1 | ||||
|     config_dict["advanced"]["reset_browser_interval"] = 0 | ||||
|     config_dict["advanced"]["proxy_server_port"] = "" | ||||
|     config_dict["advanced"]["window_size"] = "512,580" | ||||
|     config_dict["advanced"]["window_size"] = "512,1024" | ||||
| 
 | ||||
|     config_dict["advanced"]["idle_keyword"] = "" | ||||
|     config_dict["advanced"]["resume_keyword"] = "" | ||||
|  |  | |||
|  | @ -1 +1 @@ | |||
| {"homepage": "https://tixcraft.com", "browser": "chrome", "language": "\u7e41\u9ad4\u4e2d\u6587", "ticket_number": 2, "ocr_captcha": {"enable": true, "beta": true, "force_submit": true, "image_source": "canvas"}, "webdriver_type": "undetected_chromedriver", "date_auto_select": {"enable": true, "date_keyword": "", "mode": "random"}, "area_auto_select": {"enable": true, "mode": "random", "area_keyword": ""}, "keyword_exclude": "\"\u8f2a\u6905\",\"\u8eab\u969c\",\"\u8eab\u5fc3 \u969c\u7919\",\"Restricted View\",\"\u71c8\u67f1\u906e\u853d\",\"\u8996\u7dda\u4e0d\u5b8c\u6574\"", "kktix": {"auto_press_next_step_button": true, "auto_fill_ticket_number": true}, "tixcraft": {"pass_date_is_sold_out": true, "auto_reload_coming_soon_page": true}, "advanced": {"play_sound": {"ticket": true, "order": true, "filename": "ding-dong.wav"}, "tixcraft_sid": "", "ibonqware": "", "facebook_account": "", "kktix_account": "", "fami_account": "", "cityline_account": "", "urbtix_account": "", "hkticketing_account": "", "kham_account": "", "ticket_account": "", "udn_account": "", "ticketplus_account": "", "facebook_password": "", "kktix_password": "", "fami_password": "", "urbtix_password": "", "cityline_password": "", "hkticketing_password": "", "kham_password": "", "ticket_password": "", "udn_password": "", "ticketplus_password": "", "facebook_password_plaintext": "", "kktix_password_plaintext": "", "fami_password_plaintext": "", "urbtix_password_plaintext": "", "cityline_password_plaintext": "", "hkticketing_password_plaintext": "", "kham_password_plaintext": "", "ticket_password_plaintext": "", "udn_password_plaintext": "", "ticketplus_password_plaintext": "", "chrome_extension": true, "disable_adjacent_seat": false, "hide_some_image": true, "block_facebook_network": false, "headless": false, "verbose": false, "auto_guess_options": true, "user_guess_string": "", "remote_url": "\"http://127.0.0.1:16888/\"", "auto_reload_page_interval": 0.1, "reset_browser_interval": 0.0, "proxy_server_port": "", "window_size": "512,520", "idle_keyword": "", "resume_keyword": "", "idle_keyword_second": "", "resume_keyword_second": ""}, "domain_filter": ["*google-analytics.com/*", "*googletagmanager.com/*", "*googletagservices.com/*", "*lndata.com/*", "*a.amnet.tw/*", "*adx.c.appier.net/*", "*clarity.ms/*", "*cloudfront.com/*", "*cms.analytics.yahoo.com/*", "*doubleclick.net/*", "*e2elog.fetnet.net/*", "*fundingchoicesmessages.google.com/*", "*ghtinc.com/*", "*match.adsrvr.org/*", "*onead.onevision.com.tw/*", "*popin.cc/*", "*rollbar.com/*", "*sb.scorecardresearch.com/*", "*tagtoo.co/*", "*.ssp.hinet.net/*", "*ticketmaster.sg/js/adblock*", "*.googlesyndication.com/*", "*treasuredata.com/*", "*play.google.com/log?*", "*www.youtube.com/youtubei/v1/player/heartbeat*", "*tixcraft.com/js/analytics.js*", "*ticketmaster.sg/js/adblock.js*", "*img.uniicreative.com/*", "*cdn.cookielaw.org/*", "*tixcraft.com/js/custom.js*", "*tixcraft.com/js/common.js*", "*cdnjs.cloudflare.com/ajax/libs/clipboard.js/*"]} | ||||
| {"homepage": "https://tixcraft.com", "browser": "chrome", "language": "\u7e41\u9ad4\u4e2d\u6587", "ticket_number": 2, "ocr_captcha": {"enable": true, "beta": true, "force_submit": true, "image_source": "canvas"}, "webdriver_type": "undetected_chromedriver", "date_auto_select": {"enable": true, "date_keyword": "", "mode": "random"}, "area_auto_select": {"enable": true, "mode": "random", "area_keyword": ""}, "keyword_exclude": "\"\u8f2a\u6905\",\"\u8eab\u969c\",\"\u8eab\u5fc3 \u969c\u7919\",\"Restricted View\",\"\u71c8\u67f1\u906e\u853d\",\"\u8996\u7dda\u4e0d\u5b8c\u6574\"", "kktix": {"auto_press_next_step_button": true, "auto_fill_ticket_number": true}, "tixcraft": {"pass_date_is_sold_out": true, "auto_reload_coming_soon_page": true}, "advanced": {"play_sound": {"ticket": true, "order": true, "filename": "ding-dong.wav"}, "tixcraft_sid": "", "ibonqware": "", "facebook_account": "", "kktix_account": "", "fami_account": "", "cityline_account": "", "urbtix_account": "", "hkticketing_account": "", "kham_account": "", "ticket_account": "", "udn_account": "", "ticketplus_account": "", "facebook_password": "", "kktix_password": "", "fami_password": "", "urbtix_password": "", "cityline_password": "", "hkticketing_password": "", "kham_password": "", "ticket_password": "", "udn_password": "", "ticketplus_password": "", "facebook_password_plaintext": "", "kktix_password_plaintext": "", "fami_password_plaintext": "", "urbtix_password_plaintext": "", "cityline_password_plaintext": "", "hkticketing_password_plaintext": "", "kham_password_plaintext": "", "ticket_password_plaintext": "", "udn_password_plaintext": "", "ticketplus_password_plaintext": "", "chrome_extension": true, "disable_adjacent_seat": false, "hide_some_image": true, "block_facebook_network": false, "headless": false, "verbose": false, "auto_guess_options": true, "user_guess_string": "", "remote_url": "\"http://127.0.0.1:16888/\"", "auto_reload_page_interval": 0.1, "reset_browser_interval": 0.0, "proxy_server_port": "", "window_size": "512,1024", "idle_keyword": "", "resume_keyword": "", "idle_keyword_second": "", "resume_keyword_second": ""}, "domain_filter": ["*google-analytics.com/*", "*googletagmanager.com/*", "*googletagservices.com/*", "*lndata.com/*", "*a.amnet.tw/*", "*adx.c.appier.net/*", "*clarity.ms/*", "*cloudfront.com/*", "*cms.analytics.yahoo.com/*", "*doubleclick.net/*", "*e2elog.fetnet.net/*", "*fundingchoicesmessages.google.com/*", "*ghtinc.com/*", "*match.adsrvr.org/*", "*onead.onevision.com.tw/*", "*popin.cc/*", "*rollbar.com/*", "*sb.scorecardresearch.com/*", "*tagtoo.co/*", "*.ssp.hinet.net/*", "*ticketmaster.sg/js/adblock*", "*.googlesyndication.com/*", "*treasuredata.com/*", "*play.google.com/log?*", "*www.youtube.com/youtubei/v1/player/heartbeat*", "*tixcraft.com/js/analytics.js*", "*ticketmaster.sg/js/adblock.js*", "*img.uniicreative.com/*", "*cdn.cookielaw.org/*", "*tixcraft.com/js/custom.js*", "*tixcraft.com/js/common.js*", "*cdnjs.cloudflare.com/ajax/libs/clipboard.js/*"]} | ||||
|  | @ -1 +1 @@ | |||
| {"homepage": "https://tixcraft.com", "browser": "chrome", "language": "\u7e41\u9ad4\u4e2d\u6587", "ticket_number": 2, "ocr_captcha": {"enable": true, "beta": true, "force_submit": true, "image_source": "canvas"}, "webdriver_type": "undetected_chromedriver", "date_auto_select": {"enable": true, "date_keyword": "", "mode": "random"}, "area_auto_select": {"enable": true, "mode": "random", "area_keyword": ""}, "keyword_exclude": "\"\u8f2a\u6905\",\"\u8eab\u969c\",\"\u8eab\u5fc3 \u969c\u7919\",\"Restricted View\",\"\u71c8\u67f1\u906e\u853d\",\"\u8996\u7dda\u4e0d\u5b8c\u6574\"", "kktix": {"auto_press_next_step_button": true, "auto_fill_ticket_number": true}, "tixcraft": {"pass_date_is_sold_out": true, "auto_reload_coming_soon_page": true}, "advanced": {"play_sound": {"ticket": true, "order": true, "filename": "ding-dong.wav"}, "tixcraft_sid": "", "ibonqware": "", "facebook_account": "", "kktix_account": "", "fami_account": "", "cityline_account": "", "urbtix_account": "", "hkticketing_account": "", "kham_account": "", "ticket_account": "", "udn_account": "", "ticketplus_account": "", "facebook_password": "", "kktix_password": "", "fami_password": "", "urbtix_password": "", "cityline_password": "", "hkticketing_password": "", "kham_password": "", "ticket_password": "", "udn_password": "", "ticketplus_password": "", "facebook_password_plaintext": "", "kktix_password_plaintext": "", "fami_password_plaintext": "", "urbtix_password_plaintext": "", "cityline_password_plaintext": "", "hkticketing_password_plaintext": "", "kham_password_plaintext": "", "ticket_password_plaintext": "", "udn_password_plaintext": "", "ticketplus_password_plaintext": "", "chrome_extension": true, "disable_adjacent_seat": false, "hide_some_image": true, "block_facebook_network": false, "headless": false, "verbose": false, "auto_guess_options": true, "user_guess_string": "", "remote_url": "\"http://127.0.0.1:16888/\"", "auto_reload_page_interval": 0.1, "reset_browser_interval": 0.0, "proxy_server_port": "", "window_size": "512,520", "idle_keyword": "", "resume_keyword": "", "idle_keyword_second": "", "resume_keyword_second": ""}} | ||||
| {"homepage": "https://tixcraft.com", "browser": "chrome", "language": "\u7e41\u9ad4\u4e2d\u6587", "ticket_number": 2, "ocr_captcha": {"enable": true, "beta": true, "force_submit": true, "image_source": "canvas"}, "webdriver_type": "undetected_chromedriver", "date_auto_select": {"enable": true, "date_keyword": "", "mode": "random"}, "area_auto_select": {"enable": true, "mode": "random", "area_keyword": ""}, "keyword_exclude": "\"\u8f2a\u6905\",\"\u8eab\u969c\",\"\u8eab\u5fc3 \u969c\u7919\",\"Restricted View\",\"\u71c8\u67f1\u906e\u853d\",\"\u8996\u7dda\u4e0d\u5b8c\u6574\"", "kktix": {"auto_press_next_step_button": true, "auto_fill_ticket_number": true}, "tixcraft": {"pass_date_is_sold_out": true, "auto_reload_coming_soon_page": true}, "advanced": {"play_sound": {"ticket": true, "order": true, "filename": "ding-dong.wav"}, "tixcraft_sid": "", "ibonqware": "", "facebook_account": "", "kktix_account": "", "fami_account": "", "cityline_account": "", "urbtix_account": "", "hkticketing_account": "", "kham_account": "", "ticket_account": "", "udn_account": "", "ticketplus_account": "", "facebook_password": "", "kktix_password": "", "fami_password": "", "urbtix_password": "", "cityline_password": "", "hkticketing_password": "", "kham_password": "", "ticket_password": "", "udn_password": "", "ticketplus_password": "", "facebook_password_plaintext": "", "kktix_password_plaintext": "", "fami_password_plaintext": "", "urbtix_password_plaintext": "", "cityline_password_plaintext": "", "hkticketing_password_plaintext": "", "kham_password_plaintext": "", "ticket_password_plaintext": "", "udn_password_plaintext": "", "ticketplus_password_plaintext": "", "chrome_extension": true, "disable_adjacent_seat": false, "hide_some_image": true, "block_facebook_network": false, "headless": false, "verbose": false, "auto_guess_options": true, "user_guess_string": "", "remote_url": "\"http://127.0.0.1:16888/\"", "auto_reload_page_interval": 0.1, "reset_browser_interval": 0.0, "proxy_server_port": "", "window_size": "512,1024", "idle_keyword": "", "resume_keyword": "", "idle_keyword_second": "", "resume_keyword_second": ""}} | ||||
|  | @ -2,9 +2,9 @@ function begin() | |||
| { | ||||
|     let settings = JSON.parse($("#settings").html()); | ||||
|     let status = $("#status").html(); | ||||
|     console.log("msg"); | ||||
|     console.log(settings); | ||||
|     console.log(status); | ||||
|     //console.log("msg");
 | ||||
|     //console.log(settings);
 | ||||
|     //console.log(status);
 | ||||
| 
 | ||||
|     $("#settings").remove(); | ||||
|     $("#status").remove(); | ||||
|  | @ -15,8 +15,8 @@ function begin() | |||
|     } | ||||
| 
 | ||||
|     // too short to cause error.
 | ||||
|     if(auto_reload_page_interval < 0.2) { | ||||
|         auto_reload_page_interval = 0.2; | ||||
|     if(auto_reload_page_interval < 0.1) { | ||||
|         auto_reload_page_interval = 0.1; | ||||
|     } | ||||
| 
 | ||||
|     if(status=='ON') { | ||||
|  |  | |||
|  | @ -413,5 +413,5 @@ | |||
|             ] | ||||
|         } | ||||
|     ], | ||||
|     "version": "1.0.15" | ||||
|     "version": "1.0.16" | ||||
| } | ||||
		Loading…
	
		Reference in New Issue