Merge 1620efe56c into b6c6edb622

kiauh/components/webui_client/client_config/client_config_remove.py

@@ -53,16 +53,12 @@ def remove_client_config_dir(client_config: ClientConfigData) -> None:
 
 
 def remove_client_config_symlink(client_config: ClientConfigData) -> None:
+    Logger.print_status(f"Removing {client_config.get('cfg_filename')} symlinks ...")
     im = InstanceManager(Klipper)
     instances: List[Klipper] = im.instances
     for instance in instances:
         Logger.print_status(f"Removing symlink from '{instance.cfg_file}' ...")
-        symlink = instance.cfg_dir.joinpath(client_config.get("cfg_filename"))
-        if not symlink.exists():
-            Logger.print_info(f"'{symlink}' does not exist. Skipping ...")
-            continue
-
         try:
-            remove_file(symlink)
+            remove_file(instance.cfg_dir.joinpath(client_config.get("cfg_filename")))
         except subprocess.CalledProcessError:
             Logger.print_error("Failed to remove symlink!")

kiauh/components/webui_client/client_dialogs.py

@@ -71,6 +71,7 @@ def print_client_port_select_dialog(name: str, port: str, ports_in_use: List[str
         | {line2:<54}|
         | port, you can set it now. Make sure the port is not   |
         | used by any other application on your system!         |
+        \\=======================================================/
         """
     )[1:]
 

kiauh/components/webui_client/client_setup.py

@@ -107,8 +107,7 @@ def install_client(client_name: ClientName) -> None:
         install_client_cfg = get_confirm(question, allow_go_back=False)
 
     cm = ConfigManager(cfg_file=KIAUH_CFG)
-    default_port = cm.get_value(client.get("name"), "port")
+    client_port = cm.get_value(client.get("name"), "port")
-    client_port = default_port if default_port and default_port.isdigit() else "80"
     ports_in_use = read_ports_from_nginx_configs()
 
     # check if configured port is a valid number and not in use already