From 8d343853f10610f06071f0758bb42ed91d2aa61c Mon Sep 17 00:00:00 2001 From: dw-0 Date: Wed, 1 May 2024 13:02:42 +0200 Subject: [PATCH] feat: fall back to .version file if release_info.json not exist Signed-off-by: Dominik Willner --- kiauh/components/webui_client/client_utils.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/kiauh/components/webui_client/client_utils.py b/kiauh/components/webui_client/client_utils.py index 819bcd6..3bb224c 100644 --- a/kiauh/components/webui_client/client_utils.py +++ b/kiauh/components/webui_client/client_utils.py @@ -127,11 +127,19 @@ def symlink_webui_nginx_log(klipper_instances: List[Klipper]) -> None: def get_local_client_version(client: BaseWebClient) -> str: relinfo_file = client.client_dir.joinpath("release_info.json") - if not relinfo_file.is_file(): - return "-" + version_file = client.client_dir.joinpath(".version") - with open(relinfo_file, "r") as f: - return json.load(f)["version"] + if not client.client_dir.exists(): + return "-" + if not relinfo_file.is_file() and not version_file.is_file(): + return "n/a" + + if relinfo_file.is_file(): + with open(relinfo_file, "r") as f: + return json.load(f)["version"] + else: + with open(version_file, "r") as f: + return f.readlines()[0] def get_remote_client_version(client: BaseWebClient) -> str: