Release v6.0.0-alpha.6

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

fixes #545
fixes #553
fixes #557

kiauh/extensions/octoapp/__init__.py

@@ -14,6 +14,7 @@ OA_REPO = "https://github.com/crysxd/OctoApp-Plugin.git"
 # directories
 OA_DIR = Path.home().joinpath("octoapp")
 OA_ENV_DIR = Path.home().joinpath("octoapp-env")
+OA_STORE_DIR = OA_DIR.joinpath("octoapp-store")
 
 # files
 OA_REQ_FILE = OA_DIR.joinpath("requirements.txt")

kiauh/extensions/octoapp/octoapp_extension.py

@@ -10,7 +10,6 @@ import json
 from typing import List
 
 from components.moonraker.moonraker import Moonraker
-from components.klipper.klipper import Klipper
 from core.instance_manager.instance_manager import InstanceManager
 from core.logger import DialogType, Logger
 from extensions.base_extension import BaseExtension
@@ -132,7 +131,6 @@ class OctoappExtension(BaseExtension):
 
         try:
             self._remove_OA_instances(ob_instances)
-            self._remove_OA_store_dirs()
             self._remove_OA_dir()
             self._remove_OA_env()
             remove_config_section(f"include {OA_SYS_CFG_NAME}", mr_instances)
@@ -183,21 +181,6 @@ class OctoappExtension(BaseExtension):
 
         run_remove_routines(OA_DIR)
 
-
-    def _remove_OA_store_dirs(self) -> None:
-        Logger.print_status("Removing OctoApp for Klipper store directory ...")
-
-        klipper_instances: List[Moonraker] = get_instances(Klipper)
-        
-        for instance in klipper_instances:
-            store_dir = instance.data_dir.joinpath("octoapp-store")
-            if not store_dir.exists():
-                Logger.print_info(f"'{store_dir}' does not exist. Skipped ...")
-                return
-
-            run_remove_routines(store_dir)
-
-
     def _remove_OA_env(self) -> None:
         Logger.print_status("Removing OctoApp for Klipper environment ...")