feat: implement completion message for webclient remove process

Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-10-27 14:59:21 +01:00
parent 9b1aba207c
commit 66a5cdf9b1
2 changed files with 22 additions and 4 deletions

View File

@@ -19,6 +19,8 @@ from components.webui_client.client_config.client_config_remove import (
from core.backup_manager.backup_manager import BackupManager
from core.constants import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED
from core.logger import Logger
from core.services.message_service import Message
from core.types.color import Color
from utils.config_utils import remove_config_section
from utils.fs_utils import (
remove_with_sudo,
@@ -32,13 +34,18 @@ def run_client_removal(
remove_client: bool,
remove_client_cfg: bool,
backup_config: bool,
) -> None:
) -> Message:
completion_msg = Message(
title=f"{client.display_name} Removal Process completed",
color=Color.GREEN,
)
mr_instances: List[Moonraker] = get_instances(Moonraker)
kl_instances: List[Klipper] = get_instances(Klipper)
if backup_config:
bm = BackupManager()
bm.backup_file(client.config_file)
completion_msg.text.append(f"{client.config_file.name} backup created")
if remove_client:
client_name = client.name
@@ -48,13 +55,25 @@ def run_client_removal(
section = f"update_manager {client_name}"
remove_config_section(section, mr_instances)
completion_msg.text.append(f"{client.display_name} removed")
if remove_client_cfg:
# todo: return a Message here as well to display correct actions taken
run_client_config_removal(
client.client_config,
kl_instances,
mr_instances,
)
completion_msg.text.append(f"{client.client_config.display_name} removed")
if not completion_msg.text:
completion_msg.color = Color.YELLOW
completion_msg.centered = True
completion_msg.text.append("Nothing to remove.")
else:
completion_msg.text.insert(0, "The following actions were performed:")
return completion_msg
def remove_client_dir(client: BaseWebClient) -> None:

View File

@@ -99,19 +99,18 @@ class ClientRemoveMenu(BaseMenu):
print(Color.apply("Nothing selected ...", Color.RED))
return
client_remove.run_client_removal(
completion_msg = client_remove.run_client_removal(
client=self.client,
remove_client=self.remove_client,
remove_client_cfg=self.remove_client_cfg,
backup_config=self.backup_config_json,
)
self.message_service.set_message(completion_msg)
self.remove_client = False
self.remove_client_cfg = False
self.backup_config_json = False
self._go_back()
def _get_selection_state_str(self) -> str:
return (
"Select everything" if not self.selection_state else "Deselect everything"