From ee81ee4c0c62328ad8bd7c61fe2e8f4610db3c75 Mon Sep 17 00:00:00 2001 From: dw-0 Date: Sun, 28 Jan 2024 15:35:00 +0100 Subject: [PATCH] fix(Mainsail): correctly handle invalid config value for default_port Signed-off-by: Dominik Willner --- kiauh/modules/mainsail/mainsail_setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kiauh/modules/mainsail/mainsail_setup.py b/kiauh/modules/mainsail/mainsail_setup.py index ee15812..294db45 100644 --- a/kiauh/modules/mainsail/mainsail_setup.py +++ b/kiauh/modules/mainsail/mainsail_setup.py @@ -90,10 +90,13 @@ def install_mainsail() -> None: question = "Download the recommended macros?" install_ms_config = get_confirm(question, allow_go_back=False) + # if a default port is configured in the kiauh.cfg, we use that for the port + # otherwise we default to port 80, but show the user a dialog to confirm/change that port cm = ConfigManager(cfg_file=KIAUH_CFG) default_port = cm.get_value("mainsail", "default_port") - mainsail_port = default_port if default_port else "80" - if not default_port: + is_valid_port = default_port and default_port.isdigit() + mainsail_port = default_port if is_valid_port else "80" + if not is_valid_port: print_mainsail_port_select_dialog(mainsail_port) mainsail_port = get_number_input( "Configure Mainsail for port",