2024-03-10, update settings.py
							parent
							
								
									2685f40487
								
							
						
					
					
						commit
						13517612c4
					
				|  | @ -42,7 +42,7 @@ try: | ||||||
| except Exception as exc: | except Exception as exc: | ||||||
|     pass |     pass | ||||||
| 
 | 
 | ||||||
| CONST_APP_VERSION = "MaxBot (2024.03.08)" | CONST_APP_VERSION = "MaxBot (2024.03.10)" | ||||||
| 
 | 
 | ||||||
| CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" | CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" | ||||||
| CONST_MAXBOT_CONFIG_FILE = "settings.json" | CONST_MAXBOT_CONFIG_FILE = "settings.json" | ||||||
|  |  | ||||||
|  | @ -23,7 +23,7 @@ import sys | ||||||
| import threading | import threading | ||||||
| import webbrowser | import webbrowser | ||||||
| 
 | 
 | ||||||
| CONST_APP_VERSION = "MaxBot (2024.03.09)" | CONST_APP_VERSION = "MaxBot (2024.03.10)" | ||||||
| 
 | 
 | ||||||
| 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" | ||||||
|  |  | ||||||
|  | @ -29,7 +29,7 @@ from datetime import datetime | ||||||
| 
 | 
 | ||||||
| import requests | import requests | ||||||
| 
 | 
 | ||||||
| CONST_APP_VERSION = "MaxBot (2024.03.09)" | CONST_APP_VERSION = "MaxBot (2024.03.10)" | ||||||
| 
 | 
 | ||||||
| CONST_MAXBOT_CONFIG_FILE = "settings.json" | CONST_MAXBOT_CONFIG_FILE = "settings.json" | ||||||
| CONST_MAXBOT_KKTIX_CONFIG_FILE = "kktix.json" | CONST_MAXBOT_KKTIX_CONFIG_FILE = "kktix.json" | ||||||
|  |  | ||||||
|  | @ -79,7 +79,7 @@ | ||||||
|         "auto_reload_page_interval": 0.1, |         "auto_reload_page_interval": 0.1, | ||||||
|         "reset_browser_interval": 0.0, |         "reset_browser_interval": 0.0, | ||||||
|         "proxy_server_port": "", |         "proxy_server_port": "", | ||||||
|         "window_size": "500,1024", |         "window_size": "512,520", | ||||||
|         "idle_keyword": "", |         "idle_keyword": "", | ||||||
|         "resume_keyword": "", |         "resume_keyword": "", | ||||||
|         "idle_keyword_second": "", |         "idle_keyword_second": "", | ||||||
|  |  | ||||||
							
								
								
									
										24
									
								
								settings.py
								
								
								
								
							
							
						
						
									
										24
									
								
								settings.py
								
								
								
								
							|  | @ -50,7 +50,7 @@ try: | ||||||
| except Exception as exc: | except Exception as exc: | ||||||
|     pass |     pass | ||||||
| 
 | 
 | ||||||
| CONST_APP_VERSION = "MaxBot (2024.03.09)" | CONST_APP_VERSION = "MaxBot (2024.03.10)" | ||||||
| 
 | 
 | ||||||
| CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" | CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" | ||||||
| CONST_MAXBOT_CONFIG_FILE = "settings.json" | CONST_MAXBOT_CONFIG_FILE = "settings.json" | ||||||
|  | @ -1658,6 +1658,8 @@ def showHideBlocks(): | ||||||
| 
 | 
 | ||||||
|     global combo_homepage |     global combo_homepage | ||||||
| 
 | 
 | ||||||
|  |     new_homepage = "" | ||||||
|  |     if 'combo_homepage' in globals(): | ||||||
|         new_homepage = combo_homepage.get().strip() |         new_homepage = combo_homepage.get().strip() | ||||||
|         #print("new homepage value:", new_homepage) |         #print("new homepage value:", new_homepage) | ||||||
| 
 | 
 | ||||||
|  | @ -1670,10 +1672,10 @@ def showHideBlocks(): | ||||||
|         if domain_name in new_homepage: |         if domain_name in new_homepage: | ||||||
|             show_block_index = BLOCK_STYLE_KKTIX |             show_block_index = BLOCK_STYLE_KKTIX | ||||||
| 
 | 
 | ||||||
|  |     if 'frame_group_kktix' in globals(): | ||||||
|         if show_block_index == BLOCK_STYLE_KKTIX: |         if show_block_index == BLOCK_STYLE_KKTIX: | ||||||
|             frame_group_kktix.grid(column=0, row=frame_group_kktix_index, padx=UI_PADDING_X) |             frame_group_kktix.grid(column=0, row=frame_group_kktix_index, padx=UI_PADDING_X) | ||||||
|             frame_group_tixcraft.grid_forget() |             frame_group_tixcraft.grid_forget() | ||||||
| 
 |  | ||||||
|         else: |         else: | ||||||
|             frame_group_tixcraft.grid(column=0, row=frame_group_tixcraft_index, padx=UI_PADDING_X) |             frame_group_tixcraft.grid(column=0, row=frame_group_tixcraft_index, padx=UI_PADDING_X) | ||||||
|             frame_group_kktix.grid_forget() |             frame_group_kktix.grid_forget() | ||||||
|  | @ -2726,7 +2728,9 @@ def change_maxbot_status_by_keyword(): | ||||||
| 
 | 
 | ||||||
| def check_maxbot_config_unsaved(config_dict): | def check_maxbot_config_unsaved(config_dict): | ||||||
|     # alert not saved config. |     # alert not saved config. | ||||||
|  |     global combo_homepage | ||||||
|     global combo_ticket_number |     global combo_ticket_number | ||||||
|  | 
 | ||||||
|     global txt_date_keyword |     global txt_date_keyword | ||||||
|     global txt_area_keyword |     global txt_area_keyword | ||||||
|     global txt_keyword_exclude |     global txt_keyword_exclude | ||||||
|  | @ -2736,6 +2740,10 @@ def check_maxbot_config_unsaved(config_dict): | ||||||
|     global txt_idle_keyword_second |     global txt_idle_keyword_second | ||||||
|     global txt_resume_keyword_second |     global txt_resume_keyword_second | ||||||
| 
 | 
 | ||||||
|  |     style = ttk.Style() | ||||||
|  |     style.configure("redStyle.TCombobox", foreground="red") | ||||||
|  |     style.configure("greenStyle.TCombobox", foreground="green") | ||||||
|  | 
 | ||||||
|     try: |     try: | ||||||
|         date_keyword = "" |         date_keyword = "" | ||||||
|         if 'txt_date_keyword' in globals(): |         if 'txt_date_keyword' in globals(): | ||||||
|  | @ -2772,11 +2780,21 @@ def check_maxbot_config_unsaved(config_dict): | ||||||
|             resume_keyword_second = txt_resume_keyword_second.get("1.0",END).strip() |             resume_keyword_second = txt_resume_keyword_second.get("1.0",END).strip() | ||||||
|             resume_keyword_second = format_config_keyword_for_json(resume_keyword_second) |             resume_keyword_second = format_config_keyword_for_json(resume_keyword_second) | ||||||
| 
 | 
 | ||||||
|  |         highlightthickness = 0 | ||||||
|  |         if 'combo_homepage' in globals(): | ||||||
|  |             if len(combo_homepage.get().strip())>0: | ||||||
|  |                 if config_dict["homepage"] != combo_homepage.get().strip(): | ||||||
|  |                     highlightthickness = 2 | ||||||
|  |          | ||||||
|  |         if highlightthickness > 0: | ||||||
|  |             showHideBlocks() | ||||||
|  | 
 | ||||||
|         highlightthickness = 0 |         highlightthickness = 0 | ||||||
|         if 'combo_ticket_number' in globals(): |         if 'combo_ticket_number' in globals(): | ||||||
|             if len(combo_ticket_number.get().strip())>0: |             if len(combo_ticket_number.get().strip())>0: | ||||||
|                 if config_dict["ticket_number"] != int(combo_ticket_number.get().strip()): |                 if config_dict["ticket_number"] != int(combo_ticket_number.get().strip()): | ||||||
|                     highlightthickness = 2 |                     highlightthickness = 2 | ||||||
|  |         # fail, tkinter combobox border style is not working anymore | ||||||
|         #combo_ticket_number.config(highlightthickness=highlightthickness, highlightbackground="red") |         #combo_ticket_number.config(highlightthickness=highlightthickness, highlightbackground="red") | ||||||
| 
 | 
 | ||||||
|         highlightthickness = 0 |         highlightthickness = 0 | ||||||
|  | @ -2863,10 +2881,12 @@ def update_maxbot_runtime_status(): | ||||||
|     global combo_language |     global combo_language | ||||||
|     global lbl_maxbot_status_data |     global lbl_maxbot_status_data | ||||||
|     try: |     try: | ||||||
|  |         language_code = "" | ||||||
|         if 'combo_language' in globals(): |         if 'combo_language' in globals(): | ||||||
|             new_language = combo_language.get().strip() |             new_language = combo_language.get().strip() | ||||||
|             language_code=get_language_code_by_name(new_language) |             language_code=get_language_code_by_name(new_language) | ||||||
| 
 | 
 | ||||||
|  |         if len(language_code) > 0: | ||||||
|             maxbot_status = translate[language_code]['status_enabled'] |             maxbot_status = translate[language_code]['status_enabled'] | ||||||
|             if is_paused: |             if is_paused: | ||||||
|                 maxbot_status = translate[language_code]['status_paused'] |                 maxbot_status = translate[language_code]['status_paused'] | ||||||
|  |  | ||||||
|  | @ -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": "500,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/*"]} | {"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/*"]} | ||||||
|  | @ -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": "500,1024", "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,520", "idle_keyword": "", "resume_keyword": "", "idle_keyword_second": "", "resume_keyword_second": ""}} | ||||||
		Loading…
	
		Reference in New Issue