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

Merge remote-tracking branch 'origin/kiauh-v6-dev' into kiauh-v6-dev

Browse Source
This commit is contained in:
dw-0
2024-06-19 20:21:03 +02:00
parent 5c090e88c3 93ba579232
commit 5eff560627
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kiauh/extensions/klipper_backup/__init__.py
View File

@@ -1,6 +1,7 @@
# ======================================================================= # # ======================================================================= #
# Copyright (C) 2023 - 2024 Staubgeborener and Tylerjet # # Copyright (C) 2023 - 2024 Staubgeborener and Tylerjet #
# https://github.com/Staubgeborener/klipper-backup # # https://github.com/Staubgeborener/klipper-backup #
# https://klipperbackup.xyz #
# # # #
# This file is part of KIAUH - Klipper Installation And Update Helper # # This file is part of KIAUH - Klipper Installation And Update Helper #
# https://github.com/dw-0/kiauh # # https://github.com/dw-0/kiauh #

31
kiauh/extensions/klipper_backup/klipper_backup_extension.py
View File

@@ -23,6 +23,7 @@ from extensions.klipper_backup import (
from utils.fs_utils import check_file_exist from utils.fs_utils import check_file_exist
from utils.input_utils import get_confirm from utils.input_utils import get_confirm
from utils.logger import Logger from utils.logger import Logger
from utils.sys_utils import service_instance_exists
# noinspection PyMethodMayBeStatic # noinspection PyMethodMayBeStatic
@@ -44,14 +45,6 @@ class KlipperbackupExtension(BaseExtension):
subprocess.run([str(KLIPPERBACKUP_DIR / "install.sh"), "check_updates"]) subprocess.run([str(KLIPPERBACKUP_DIR / "install.sh"), "check_updates"])
def remove_extension(self, **kwargs) -> None: def remove_extension(self, **kwargs) -> None:
def is_service_installed(service_name):
command = ["systemctl", "status", service_name]
result = subprocess.run(command, capture_output=True, text=True)
# Doesn't matter whether the service is active or not, what matters is whether it is installed. So let's search for "Loaded:" in stdout
if "Loaded:" in result.stdout:
return True
else:
return False
def uninstall_service(service_name): def uninstall_service(service_name):
try: try:
@@ -60,7 +53,7 @@ class KlipperbackupExtension(BaseExtension):
["sudo", "systemctl", "disable", service_name], check=True ["sudo", "systemctl", "disable", service_name], check=True
) )
subprocess.run(["sudo", "systemctl", "daemon-reload"], check=True) subprocess.run(["sudo", "systemctl", "daemon-reload"], check=True)
service_path = f"/etc/systemd/system/{service_name}" service_path = f"/etc/systemd/system/{service_name}.service"
os.system(f"sudo rm {service_path}") os.system(f"sudo rm {service_path}")
return True return True
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
@@ -114,30 +107,28 @@ class KlipperbackupExtension(BaseExtension):
if get_confirm(question, True, False): if get_confirm(question, True, False):
# Remove Klipper-Backup services # Remove Klipper-Backup services
service_names = [ service_names = [
"klipper-backup-on-boot.service", "klipper-backup-on-boot",
"klipper-backup-filewatch.service", "klipper-backup-filewatch",
] ]
for service_name in service_names: for service_name in service_names:
try: try:
Logger.print_status( Logger.print_status(
f"Check whether the service {service_name} is installed ..." f"Check whether the {service_name} service is installed ..."
) )
if is_service_installed(service_name): if service_instance_exists(service_name):
Logger.print_info(f"Service {service_name} detected.") Logger.print_info(f"Service {service_name} detected.")
if uninstall_service(service_name): if uninstall_service(service_name):
Logger.print_ok( Logger.print_ok(
f"The service {service_name} has been successfully uninstalled." f"The {service_name} service has been successfully uninstalled."
) )
else: else:
Logger.print_error( Logger.print_error(
f"Error uninstalling the service {service_name}." f"Error uninstalling the {service_name} service."
) )
else: else:
Logger.print_info( Logger.print_info(f"Service {service_name} NOT detected.")
f"The service {service_name} is not installed. Skipping ..."
)
except: except:
Logger.print_error(f"Unable to remove the service {service_name}") Logger.print_error(f"Unable to remove the {service_name} service")
# Remove Klipper-Backup cron # Remove Klipper-Backup cron
Logger.print_status("Check for Klipper-Backup cron entry ...") Logger.print_status("Check for Klipper-Backup cron entry ...")