refactor(klipper): use name "klipper" for single instance setup

Signed-off-by: Dominik Willner <th33xitus@gmail.com>

kiauh/modules/klipper/klipper.py

@@ -26,7 +26,7 @@ from kiauh.utils.system_utils import create_directory
 class Klipper(BaseInstance):
     @classmethod
     def blacklist(cls) -> List[str]:
-        return ["None", "mcu"]
+        return ["None", "klipper", "mcu"]
 
     def __init__(self, name: str):
         super().__init__(
@@ -117,7 +117,7 @@ class Klipper(BaseInstance):
         Logger.print_ok(f"Env file created: {env_file_target}")
 
     def get_service_file_name(self, extension=False) -> str:
-        name = self.prefix if self.name is None else self.prefix + "-" + self.name
+        name = "klipper" if self.name == self.prefix else self.prefix + "-" + self.name
         return name if not extension else f"{name}.service"
 
     def _get_service_file_path(self):
@@ -138,7 +138,7 @@ class Klipper(BaseInstance):
         Logger.print_ok("Directories successfully deleted.")
 
     def _get_data_dir_from_name(self, name: str) -> str:
-        if name is None:
+        if name == "klipper":
             return "printer"
         elif int(name.isdigit()):
             return f"printer_{name}"

kiauh/modules/klipper/klipper_setup.py

@@ -185,10 +185,14 @@ def set_instance_names(instance_list, install_count: int) -> List[Union[str, Non
 
     # new single instance install
     if instance_count == 0 and install_count == 1:
-        return [None]
+        return ["klipper"]
 
     # convert single instance install to multi install
-    elif instance_count == 1 and instance_list[0].name is None and install_count >= 1:
+    elif (
+        instance_count == 1
+        and instance_list[0].name == "klipper"
+        and install_count >= 1
+    ):
         return handle_convert_single_to_multi_instance_names(install_count)
 
     # new multi instance install