Release v6.0.0-alpha.4

Merge develop into master (v6.0.0-alpha.4)

kiauh/core/menus/main_menu.py

@@ -42,7 +42,7 @@ from core.menus.settings_menu import SettingsMenu
 from core.menus.update_menu import UpdateMenu
 from core.types import ComponentStatus, StatusMap, StatusText
 from extensions.extensions_menu import ExtensionsMenu
-from utils.common import get_kiauh_version
+from utils.common import get_kiauh_version, trunc_string
 
 
 # noinspection PyUnusedLocal
@@ -100,8 +100,8 @@ class MainMenu(BaseMenu):
         status_data: ComponentStatus = status_fn(*args)
         code: int = status_data.status
         status: StatusText = StatusMap[code]
-        owner: str = status_data.owner
+        owner: str = trunc_string(status_data.owner, 23)
-        repo: str = status_data.repo
+        repo: str = trunc_string(status_data.repo, 23)
         instance_count: int = status_data.instances
 
         count_txt: str = ""

kiauh/core/menus/update_menu.py

@@ -73,14 +73,54 @@ class UpdateMenu(BaseMenu):
         self.mainsail_data = MainsailData()
         self.fluidd_data = FluiddData()
         self.status_data = {
-            "klipper": {"installed": False, "local": None, "remote": None},
+            "klipper": {
-            "moonraker": {"installed": False, "local": None, "remote": None},
+                "display_name": "Klipper",
-            "mainsail": {"installed": False, "local": None, "remote": None},
+                "installed": False,
-            "mainsail_config": {"installed": False, "local": None, "remote": None},
+                "local": None,
-            "fluidd": {"installed": False, "local": None, "remote": None},
+                "remote": None,
-            "fluidd_config": {"installed": False, "local": None, "remote": None},
+            },
-            "klipperscreen": {"installed": False, "local": None, "remote": None},
+            "moonraker": {
-            "crowsnest": {"installed": False, "local": None, "remote": None},
+                "display_name": "Moonraker",
+                "installed": False,
+                "local": None,
+                "remote": None,
+            },
+            "mainsail": {
+                "display_name": "Mainsail",
+                "installed": False,
+                "local": None,
+                "remote": None,
+            },
+            "mainsail_config": {
+                "display_name": "Mainsail-Config",
+                "installed": False,
+                "local": None,
+                "remote": None,
+            },
+            "fluidd": {
+                "display_name": "Fluidd",
+                "installed": False,
+                "local": None,
+                "remote": None,
+            },
+            "fluidd_config": {
+                "display_name": "Fluidd-Config",
+                "installed": False,
+                "local": None,
+                "remote": None,
+            },
+            "klipperscreen": {
+                "display_name": "KlipperScreen",
+                "installed": False,
+                "local": None,
+                "remote": None,
+            },
+            "crowsnest": {
+                "display_name": "Crowsnest",
+                "installed": False,
+                "local": None,
+                "remote": None,
+            },
         }
 
     def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
@@ -152,39 +192,56 @@ class UpdateMenu(BaseMenu):
         print(menu, end="")
 
     def update_all(self, **kwargs) -> None:
-        print("update_all")
+        Logger.print_status("Updating all components ...")
+        self.update_klipper()
+        self.update_moonraker()
+        self.update_mainsail()
+        self.update_mainsail_config()
+        self.update_fluidd()
+        self.update_fluidd_config()
+        self.update_klipperscreen()
+        self.update_crowsnest()
+        self.upgrade_system_packages()
 
     def update_klipper(self, **kwargs) -> None:
-        if self._check_is_installed("klipper"):
+        self._run_update_routine("klipper", update_klipper)
-            update_klipper()
 
     def update_moonraker(self, **kwargs) -> None:
-        if self._check_is_installed("moonraker"):
+        self._run_update_routine("moonraker", update_moonraker)
-            update_moonraker()
 
     def update_mainsail(self, **kwargs) -> None:
-        if self._check_is_installed("mainsail"):
+        self._run_update_routine(
-            update_client(self.mainsail_data)
+            "mainsail",
+            update_client,
+            self.mainsail_data,
+        )
 
     def update_mainsail_config(self, **kwargs) -> None:
-        if self._check_is_installed("mainsail_config"):
+        self._run_update_routine(
-            update_client_config(self.mainsail_data)
+            "mainsail_config",
+            update_client_config,
+            self.mainsail_data,
+        )
 
     def update_fluidd(self, **kwargs) -> None:
-        if self._check_is_installed("fluidd"):
+        self._run_update_routine(
-            update_client(self.fluidd_data)
+            "fluidd",
+            update_client,
+            self.fluidd_data,
+        )
 
     def update_fluidd_config(self, **kwargs) -> None:
-        if self._check_is_installed("fluidd_config"):
+        self._run_update_routine(
-            update_client_config(self.fluidd_data)
+            "fluidd_config",
+            update_client_config,
+            self.fluidd_data,
+        )
 
     def update_klipperscreen(self, **kwargs) -> None:
-        if self._check_is_installed("klipperscreen"):
+        self._run_update_routine("klipperscreen", update_klipperscreen)
-            update_klipperscreen()
 
     def update_crowsnest(self, **kwargs) -> None:
-        if self._check_is_installed("crowsnest"):
+        self._run_update_routine("crowsnest", update_crowsnest)
-            update_crowsnest()
 
     def upgrade_system_packages(self, **kwargs) -> None:
         self._run_system_updates()
@@ -239,10 +296,24 @@ class UpdateMenu(BaseMenu):
         setattr(self, f"{name}_remote", remote_txt)
 
     def _check_is_installed(self, name: str) -> bool:
-        if not self.status_data[name]["installed"]:
+        return self.status_data[name]["installed"]
-            Logger.print_info(f"{name.capitalize()} is not installed! Skipped ...")
+
-            return False
+    def _is_update_available(self, name: str) -> bool:
-        return True
+        return self.status_data[name]["local"] != self.status_data[name]["remote"]
+
+    def _run_update_routine(self, name: str, update_fn: Callable, *args) -> None:
+        display_name = self.status_data[name]["display_name"]
+        is_installed = self._check_is_installed(name)
+        is_update_available = self._is_update_available(name)
+
+        if not is_installed:
+            Logger.print_info(f"{display_name} is not installed! Skipped ...")
+            return
+        elif not is_update_available:
+            Logger.print_info(f"{display_name} is already up to date! Skipped ...")
+            return
+
+        update_fn(*args)
 
     def _run_system_updates(self) -> None:
         if not self.packages:

kiauh/utils/common.py

@@ -177,3 +177,9 @@ def moonraker_exists(name: str = "") -> bool:
         )
         return False
     return True
+
+
+def trunc_string(input_str: str, length: int) -> str:
+    if len(input_str) > length:
+        return f"{input_str[:length - 3]}..."
+    return input_str