From 65bca84fe6d4b602efcd4533ef0b638d7dbf4435 Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Tue, 10 Jun 2025 23:24:11 -0700 Subject: [PATCH] minor refactor --- contact/__main__.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/contact/__main__.py b/contact/__main__.py index bf5c940..bdc761e 100644 --- a/contact/__main__.py +++ b/contact/__main__.py @@ -53,22 +53,25 @@ logging.basicConfig( app_state.lock = threading.Lock() + # ------------------------------------------------------------------------------ # Main Program Logic # ------------------------------------------------------------------------------ +def prompt_region_if_unset(args: object) -> None: + """Prompt user to set region if it is unset.""" + confirmation = get_list_input("Your region is UNSET. Set it now?", "Yes", ["Yes", "No"]) + if confirmation == "Yes": + set_region(interface_state.interface) + interface_state.interface.close() + interface_state.interface = initialize_interface(args) -def initialize_globals(args) -> None: +def initialize_globals(args: object) -> None: """Initializes interface and shared globals.""" interface_state.interface = initialize_interface(args) - # Prompt for region if unset if interface_state.interface.localNode.localConfig.lora.region == 0: - confirmation = get_list_input("Your region is UNSET. Set it now?", "Yes", ["Yes", "No"]) - if confirmation == "Yes": - set_region(interface_state.interface) - interface_state.interface.close() - interface_state.interface = initialize_interface(args) + prompt_region_if_unset(args) interface_state.myNodeNum = get_nodeNum() ui_state.channel_list = get_channels()