evanchen
/
tixcraft_bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor get_config_dict function in chrome_tixcraft.py for improved readability and code organization

master
Yong-Jer Chuang 2024-04-26 14:39:10 +08:00
parent 163810e01a
commit 0c8a44c447
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
chrome_tixcraft.py
View File

@ -142,9 +142,8 @@ def get_config_dict(args):
config_filepath = os.path.join(app_root, CONST_MAXBOT_CONFIG_FILE) config_filepath = os.path.join(app_root, CONST_MAXBOT_CONFIG_FILE)
# allow assign config by command line. # allow assign config by command line.
if not args.input is None: if args.input:
if len(args.input) > 0: config_filepath = args.input
config_filepath = args.input
config_dict = None config_dict = None
if os.path.isfile(config_filepath): if os.path.isfile(config_filepath):
@ -152,43 +151,34 @@ def get_config_dict(args):
with open(config_filepath) as json_data: with open(config_filepath) as json_data:
config_dict = json.load(json_data) config_dict = json.load(json_data)
if not args.headless is None: if args.headless is not None:
config_dict["advanced"]["headless"] = util.t_or_f(args.headless) config_dict["advanced"]["headless"] = util.t_or_f(args.headless)
if not args.homepage is None: if args.homepage:
if len(args.homepage) > 0: config_dict["homepage"] = args.homepage
config_dict["homepage"] = args.homepage
if not args.ticket_number is None: if args.ticket_number:
if args.ticket_number > 0: config_dict["ticket_number"] = args.ticket_number
config_dict["ticket_number"] = args.ticket_number
if not args.browser is None: if args.browser:
if len(args.browser) > 0: config_dict["browser"] = args.browser
config_dict["browser"] = args.browser
if not args.tixcraft_sid is None: if args.tixcraft_sid:
if len(args.tixcraft_sid) > 0: config_dict["advanced"]["tixcraft_sid"] = args.tixcraft_sid
config_dict["advanced"]["tixcraft_sid"] = args.tixcraft_sid
if not args.ibonqware is None: if args.ibonqware:
if len(args.ibonqware) > 0: config_dict["advanced"]["ibonqware"] = args.ibonqware
config_dict["advanced"]["ibonqware"] = args.ibonqware
if not args.kktix_account is None: if args.kktix_account:
if len(args.kktix_account) > 0: config_dict["advanced"]["kktix_account"] = args.kktix_account
config_dict["advanced"]["kktix_account"] = args.kktix_account if args.kktix_password:
if not args.kktix_password is None: config_dict["advanced"]["kktix_password_plaintext"] = args.kktix_password
if len(args.kktix_password) > 0:
config_dict["advanced"]["kktix_password_plaintext"] = args.kktix_password
if not args.proxy_server is None: if args.proxy_server:
if len(args.proxy_server) > 2: config_dict["advanced"]["proxy_server_port"] = args.proxy_server
config_dict["advanced"]["proxy_server_port"] = args.proxy_server
if not args.window_size is None: if args.window_size:
if len(args.window_size) > 2: config_dict["advanced"]["window_size"] = args.window_size
config_dict["advanced"]["window_size"] = args.window_size
# special case for headless to enable away from keyboard mode. # special case for headless to enable away from keyboard mode.
is_headless_enable_ocr = False is_headless_enable_ocr = False