From f189eeaff443b723fd58b2601b6a3c2f7f06f7be Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Fri, 16 May 2025 17:55:33 +0200 Subject: [PATCH] Fix(cli/state):_Make listing state folders more safe --- pkgs/clan-cli/clan_cli/state/list.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/state/list.py b/pkgs/clan-cli/clan_cli/state/list.py index f2f278a69..234af1929 100644 --- a/pkgs/clan-cli/clan_cli/state/list.py +++ b/pkgs/clan-cli/clan_cli/state/list.py @@ -56,17 +56,33 @@ def list_state_folders(machine: Machine, service: None | str = None) -> None: ) for service in state: + if not service: + continue + print(f"ยท service: {service}") - if folders := state.get(service)["folders"]: + service_cfg = state.get(service) + + if not service_cfg: + continue # or handle missing config + + folders = service_cfg.get("folders") + if folders: print(" folders:") for folder in folders: print(f" - {folder}") - if pre_backup := state.get(service)["preBackupCommand"]: + + pre_backup = service_cfg.get("preBackupCommand") + if pre_backup: print(f" preBackupCommand: {pre_backup}") - if pre_restore := state.get(service)["preRestoreCommand"]: + + pre_restore = service_cfg.get("preRestoreCommand") + if pre_restore: print(f" preRestoreCommand: {pre_restore}") - if post_restore := state.get(service)["postRestoreCommand"]: + + post_restore = service_cfg.get("postRestoreCommand") + if post_restore: print(f" postRestoreCommand: {post_restore}") + print("")