jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-24 00:03:42 +05:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Moonraker): rework remove process

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2023-12-25 15:12:08 +01:00
parent 8aeb01aca0
commit 012b6c4bb7
9 changed files with 308 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kiauh/core/instance_manager/instance_manager.py
View File

@@ -83,7 +83,7 @@ class InstanceManager:
@property
def instances(self) -> List[I]:
if not self._instances:
self._instances = self._find_instances()
self._instances = self.find_instances()
return sorted(self._instances, key=lambda x: self._sort_instance_list(x.suffix))
@@ -101,10 +101,10 @@ class InstanceManager:
else:
raise ValueError("current_instance cannot be None")
def delete_instance(self, del_remnants=False) -> None:
def delete_instance(self) -> None:
if self.current_instance is not None:
try:
self.current_instance.delete(del_remnants)
self.current_instance.delete()
except (OSError, subprocess.CalledProcessError) as e:
Logger.print_error(f"Removing instance failed: {e}")
raise
@@ -188,7 +188,7 @@ class InstanceManager:
Logger.print_error(f"{e}")
raise
def _find_instances(self) -> List[I]:
def find_instances(self) -> List[I]:
name = self.instance_type.__name__.lower()
pattern = re.compile(f"^{name}(-[0-9a-zA-Z]+)?.service$")
excluded = self.instance_type.blacklist()