From a3d8482026d894936944ee6e6aa5b1df168f4f44 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 24 Nov 2023 16:31:38 +0800 Subject: [PATCH] add udn --- settings.py | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/settings.py b/settings.py index f640236..3f05993 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.17)" +CONST_APP_VERSION = "MaxBot (2023.11.18)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" @@ -89,6 +89,7 @@ CONST_SUPPORTED_SITES = ["https://kktix.com" ,"https://ticket.ibon.com.tw/" ,"https://kham.com.tw/ (寬宏)" ,"https://ticket.com.tw/ (年代)" + ,"https://tickets.udnfunlife.com/ (udn售票網)" ,"https://ticketplus.com.tw/ (遠大)" ,"===[香港或南半球的系統]===" ,"http://www.urbtix.hk/ (城市)" @@ -190,6 +191,7 @@ def load_translate(): en_us["hkticketing_account"] = 'HKTICKETING account' en_us["kham_account"] = 'KHAM account' en_us["ticket_account"] = 'TICKET account' + en_us["udn_account"] = 'UDN account' en_us["ticketplus_account"] = 'TicketPlus account' en_us["password"] = 'Password' @@ -201,6 +203,7 @@ def load_translate(): en_us["hkticketing_password"] = 'HKTICKETING password' en_us["kham_password"] = 'KHAM password' en_us["ticket_password"] = 'TICKET password' + en_us["udn_password"] = 'UDN password' en_us["ticketplus_password"] = 'TicketPlus password' en_us["save_password_alert"] = 'Saving passwords to config file may expose your passwords.' @@ -293,6 +296,7 @@ def load_translate(): zh_tw["hkticketing_account"] = 'HKTICKETING 帳號' zh_tw["kham_account"] = '寬宏 帳號' zh_tw["ticket_account"] = '年代 帳號' + zh_tw["udn_account"] = 'UDN 帳號' zh_tw["ticketplus_account"] = '遠大 帳號' zh_tw["password"] = '密碼' @@ -304,6 +308,7 @@ def load_translate(): zh_tw["hkticketing_password"] = 'HKTICKETING 密碼' zh_tw["kham_password"] = '寬宏 密碼' zh_tw["ticket_password"] = '年代 密碼' + zh_tw["udn_password"] = 'UDN 密碼' zh_tw["ticketplus_password"] = '遠大 密碼' zh_tw["save_password_alert"] = '將密碼保存到設定檔中可能會讓您的密碼被盜。' @@ -397,6 +402,7 @@ def load_translate(): zh_cn["hkticketing_account"] = 'HKTICKETING 帐号' zh_cn["kham_account"] = '宽宏 帐号' zh_cn["ticket_account"] = '年代 帐号' + zh_cn["udn_account"] = 'UDN 帐号' zh_cn["ticketplus_account"] = '远大 帐号' zh_cn["password"] = '密码' @@ -408,6 +414,7 @@ def load_translate(): zh_cn["hkticketing_password"] = 'HKTICKETING 密码' zh_cn["kham_password"] = '宽宏 密码' zh_cn["ticket_password"] = '年代 密码' + zh_cn["udn_password"] = 'UDN 密码' zh_cn["ticketplus_password"] = '远大 密码' zh_cn["save_password_alert"] = '将密码保存到文件中可能会暴露您的密码。' @@ -500,6 +507,7 @@ def load_translate(): ja_jp["hkticketing_account"] = 'HKTICKETINGのアカウント' ja_jp["kham_account"] = 'KHAMのアカウント' ja_jp["ticket_account"] = 'TICKETのアカウント' + ja_jp["udn_account"] = 'UDNのアカウント' ja_jp["ticketplus_account"] = '遠大のアカウント' ja_jp["password"] = 'パスワード' @@ -511,6 +519,7 @@ def load_translate(): ja_jp["hkticketing_password"] = 'HKTICKETINGのパスワード' ja_jp["kham_password"] = 'KHAMのパスワード' ja_jp["ticket_password"] = 'TICKETのパスワード' + ja_jp["udn_password"] = 'UDNのパスワード' ja_jp["ticketplus_password"] = '遠大のパスワード' ja_jp["save_password_alert"] = 'パスワードをファイルに保存すると、パスワードが公開される可能性があります。' @@ -656,6 +665,7 @@ def get_default_config(): config_dict["advanced"]["hkticketing_account"] = "" config_dict["advanced"]["kham_account"] = "" config_dict["advanced"]["ticket_account"] = "" + config_dict["advanced"]["udn_account"] = "" config_dict["advanced"]["ticketplus_account"] = "" config_dict["advanced"]["facebook_password"] = "" @@ -666,6 +676,7 @@ def get_default_config(): config_dict["advanced"]["hkticketing_password"] = "" config_dict["advanced"]["kham_password"] = "" config_dict["advanced"]["ticket_password"] = "" + config_dict["advanced"]["udn_password"] = "" config_dict["advanced"]["ticketplus_password"] = "" config_dict["advanced"]["adblock_plus_enable"] = False @@ -783,6 +794,7 @@ def btn_save_act(language_code, slience_mode=False): global txt_hkticketing_account global txt_kham_account global txt_ticket_account + global txt_udn_account global txt_ticketplus_account global txt_facebook_password @@ -793,6 +805,7 @@ def btn_save_act(language_code, slience_mode=False): global txt_hkticketing_password global txt_kham_password global txt_ticket_password + global txt_udn_password global txt_ticketplus_password global chk_state_play_captcha_sound @@ -933,6 +946,7 @@ def btn_save_act(language_code, slience_mode=False): config_dict["advanced"]["hkticketing_account"] = txt_hkticketing_account.get().strip() config_dict["advanced"]["kham_account"] = txt_kham_account.get().strip() config_dict["advanced"]["ticket_account"] = txt_ticket_account.get().strip() + config_dict["advanced"]["udn_account"] = txt_udn_account.get().strip() config_dict["advanced"]["ticketplus_account"] = txt_ticketplus_account.get().strip() config_dict["advanced"]["facebook_password"] = txt_facebook_password.get().strip() @@ -943,6 +957,7 @@ def btn_save_act(language_code, slience_mode=False): config_dict["advanced"]["hkticketing_password"] = txt_hkticketing_password.get().strip() config_dict["advanced"]["kham_password"] = txt_kham_password.get().strip() config_dict["advanced"]["ticket_password"] = txt_ticket_password.get().strip() + config_dict["advanced"]["udn_password"] = txt_udn_password.get().strip() config_dict["advanced"]["ticketplus_password"] = txt_ticketplus_password.get().strip() config_dict["advanced"]["tixcraft_sid"] = encryptMe(config_dict["advanced"]["tixcraft_sid"]) @@ -955,6 +970,7 @@ def btn_save_act(language_code, slience_mode=False): config_dict["advanced"]["hkticketing_password"] = encryptMe(config_dict["advanced"]["hkticketing_password"]) config_dict["advanced"]["kham_password"] = encryptMe(config_dict["advanced"]["kham_password"]) config_dict["advanced"]["ticket_password"] = encryptMe(config_dict["advanced"]["ticket_password"]) + config_dict["advanced"]["udn_password"] = encryptMe(config_dict["advanced"]["udn_password"]) config_dict["advanced"]["ticketplus_password"] = encryptMe(config_dict["advanced"]["ticketplus_password"]) config_dict["advanced"]["adblock_plus_enable"] = bool(chk_state_adblock_plus.get()) @@ -1364,6 +1380,7 @@ def applyNewLanguage(): global lbl_hkticketing_account global lbl_kham_account global lbl_ticket_account + global lbl_udn_account global lbl_ticketplus_account global lbl_password @@ -1375,6 +1392,7 @@ def applyNewLanguage(): global lbl_hkticketing_password global lbl_kham_password global lbl_ticket_password + global lbl_udn_password global lbl_ticketplus_password global lbl_save_password_alert @@ -1392,6 +1410,7 @@ def applyNewLanguage(): lbl_hkticketing_account.config(text=translate[language_code]["hkticketing_account"]) lbl_kham_account.config(text=translate[language_code]["kham_account"]) lbl_ticket_account.config(text=translate[language_code]["ticket_account"]) + lbl_udn_account.config(text=translate[language_code]["udn_account"]) lbl_ticketplus_account.config(text=translate[language_code]["ticketplus_account"]) lbl_password.config(text=translate[language_code]["password"]) @@ -2348,6 +2367,22 @@ def AutofillTab(root, config_dict, language_code, UI_PADDING_X): group_row_count +=1 + global lbl_udn_account + lbl_udn_account = Label(frame_group_header, text=translate[language_code]['udn_account']) + lbl_udn_account.grid(column=0, row=group_row_count, sticky = E) + + global txt_udn_account + txt_udn_account_value = StringVar(frame_group_header, value=config_dict["advanced"]["udn_account"].strip()) + txt_udn_account = Entry(frame_group_header, width=15, textvariable = txt_udn_account_value) + txt_udn_account.grid(column=1, row=group_row_count, sticky = W) + + global txt_udn_password + txt_udn_password_value = StringVar(frame_group_header, value=decryptMe(config_dict["advanced"]["udn_password"].strip())) + txt_udn_password = Entry(frame_group_header, width=15, textvariable = txt_udn_password_value, show="*") + txt_udn_password.grid(column=2, row=group_row_count, sticky = W) + + group_row_count +=1 + global lbl_ticketplus_account lbl_ticketplus_account = Label(frame_group_header, text=translate[language_code]['ticketplus_account']) lbl_ticketplus_account.grid(column=0, row=group_row_count, sticky = E)