From 0c8a44c447d49d4d562bb848a52dcff5eaf4dbd4 Mon Sep 17 00:00:00 2001 From: Yong-Jer Chuang Date: Fri, 26 Apr 2024 14:39:10 +0800 Subject: [PATCH] Refactor get_config_dict function in chrome_tixcraft.py for improved readability and code organization --- chrome_tixcraft.py | 52 +++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/chrome_tixcraft.py b/chrome_tixcraft.py index a38939a..b2a748e 100644 --- a/chrome_tixcraft.py +++ b/chrome_tixcraft.py @@ -142,9 +142,8 @@ def get_config_dict(args): config_filepath = os.path.join(app_root, CONST_MAXBOT_CONFIG_FILE) # allow assign config by command line. - if not args.input is None: - if len(args.input) > 0: - config_filepath = args.input + if args.input: + config_filepath = args.input config_dict = None if os.path.isfile(config_filepath): @@ -152,43 +151,34 @@ def get_config_dict(args): with open(config_filepath) as 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) - if not args.homepage is None: - if len(args.homepage) > 0: - config_dict["homepage"] = args.homepage + if args.homepage: + config_dict["homepage"] = args.homepage - if not args.ticket_number is None: - if args.ticket_number > 0: - config_dict["ticket_number"] = args.ticket_number + if args.ticket_number: + config_dict["ticket_number"] = args.ticket_number - if not args.browser is None: - if len(args.browser) > 0: - config_dict["browser"] = args.browser + if args.browser: + config_dict["browser"] = args.browser - if not args.tixcraft_sid is None: - if len(args.tixcraft_sid) > 0: - config_dict["advanced"]["tixcraft_sid"] = args.tixcraft_sid + if args.tixcraft_sid: + config_dict["advanced"]["tixcraft_sid"] = args.tixcraft_sid - if not args.ibonqware is None: - if len(args.ibonqware) > 0: - config_dict["advanced"]["ibonqware"] = args.ibonqware + if args.ibonqware: + config_dict["advanced"]["ibonqware"] = args.ibonqware - if not args.kktix_account is None: - if len(args.kktix_account) > 0: - config_dict["advanced"]["kktix_account"] = args.kktix_account - if not args.kktix_password is None: - if len(args.kktix_password) > 0: - config_dict["advanced"]["kktix_password_plaintext"] = args.kktix_password + if args.kktix_account: + config_dict["advanced"]["kktix_account"] = args.kktix_account + if args.kktix_password: + config_dict["advanced"]["kktix_password_plaintext"] = args.kktix_password - if not args.proxy_server is None: - if len(args.proxy_server) > 2: - config_dict["advanced"]["proxy_server_port"] = args.proxy_server + if args.proxy_server: + config_dict["advanced"]["proxy_server_port"] = args.proxy_server - if not args.window_size is None: - if len(args.window_size) > 2: - config_dict["advanced"]["window_size"] = args.window_size + if args.window_size: + config_dict["advanced"]["window_size"] = args.window_size # special case for headless to enable away from keyboard mode. is_headless_enable_ocr = False