fix(core): standardize handling of None values for repo and version fields

- Improve local and remote version comparison by replacing default placeholders with None.
- Update repo and branch logic to handle None values consistently.
- Refactor type hints for better readability and accuracy.

kiauh/components/webui_client/client_utils.py

@@ -152,10 +152,9 @@ def symlink_webui_nginx_log(
 def get_local_client_version(client: BaseWebClient) -> str | None:
     relinfo_file = client.client_dir.joinpath("release_info.json")
     version_file = client.client_dir.joinpath(".version")
-    default = "-"
 
     if not client.client_dir.exists():
-        return default
+        return None
 
     # try to get version from release_info.json first
     if relinfo_file.is_file():
@@ -177,11 +176,11 @@ def get_local_client_version(client: BaseWebClient) -> str | None:
         try:
             with open(version_file, "r") as f:
                 line = f.readline().strip()
-            return line or default
+            return line or None
         except OSError:
             Logger.print_error("Unable to read '.version'")
 
-    return default
+    return None
 
 
 def get_remote_client_version(client: BaseWebClient) -> str | None:

kiauh/core/menus/main_menu.py

@@ -95,8 +95,8 @@ class MainMenu(BaseMenu):
         status_data: ComponentStatus = status_fn(*args)
         code: int = status_data.status
         status: StatusText = StatusMap[code]
-        owner: str = trunc_string(status_data.owner, 23)
-        repo: str = trunc_string(status_data.repo, 23)
+        owner: str = trunc_string(status_data.owner, 23) if status_data.owner else '-'
+        repo: str = trunc_string(status_data.repo, 23) if status_data.repo else '-'
         instance_count: int = status_data.instances
 
         count_txt: str = ""

kiauh/core/menus/update_menu.py

@@ -257,7 +257,7 @@ class UpdateMenu(BaseMenu):
 
     def _format_local_status(self, local_version, remote_version) -> str:
         color = Color.RED
-        if not local_version or local_version == '-':
+        if local_version is None:
             color = Color.RED
         elif local_version == remote_version:
             color = Color.GREEN
@@ -290,7 +290,13 @@ class UpdateMenu(BaseMenu):
         return self.status_data[name]["installed"]
 
     def _is_update_available(self, name: str) -> bool:
-        return self.status_data[name]["local"] != self.status_data[name]["remote"]
+        local = self.status_data[name]["local"]
+        remote = self.status_data[name]["remote"]
+
+        if local is None or remote is None:
+            return False
+
+        return local != remote
 
     def _run_update_routine(self, name: str, update_fn: Callable, *args) -> None:
         display_name = self.status_data[name]["display_name"]

kiauh/core/types/component_status.py

@@ -26,7 +26,7 @@ class ComponentStatus:
     owner: str | None = None
     repo: str | None = None
     repo_url: str | None = None
-    branch: str = ""
+    branch: str | None = None
     local: str | None = None
     remote: str | None = None
     instances: int | None = None

kiauh/utils/common.py

@@ -108,7 +108,7 @@ def get_install_status(
     from utils.instance_utils import get_instances
 
     checks = []
-    branch: str = ""
+    branch: str | None = None
 
     if repo_dir.exists():
         checks.append(True)

kiauh/utils/git_utils.py

@@ -73,44 +73,44 @@ def git_pull_wrapper(target_dir: Path) -> None:
         return
 
 
-def get_repo_name(repo: Path) -> Tuple[str, str]:
+def get_repo_name(repo: Path) -> Tuple[str | None, str | None]:
     """
     Helper method to extract the organisation and name of a repository |
     :param repo: repository to extract the values from
     :return: String in form of "<orga>/<name>" or None
     """
     if not repo.exists() or not repo.joinpath(".git").exists():
-        return "-", "-"
+        return None, None
 
     try:
         cmd = ["git", "-C", repo.as_posix(), "config", "--get", "remote.origin.url"]
         result: str = check_output(cmd, stderr=DEVNULL).decode(encoding="utf-8")
         substrings: List[str] = result.strip().split("/")[-2:]
 
-        orga: str = substrings[0] if substrings[0] else "-"
-        name: str = substrings[1] if substrings[1] else "-"
+        orga: str | None = substrings[0] if substrings[0] else None
+        name: str | None = substrings[1] if substrings[1] else None
 
-        return orga, name.replace(".git", "")
+        return orga, name.replace(".git", "") if name else None
 
     except CalledProcessError:
-        return "-", "-"
+        return None, None
 
 
-def get_current_branch(repo: Path) -> str:
+def get_current_branch(repo: Path) -> str | None:
     """
     Get the current branch of a local Git repository
     :param repo: Path to the local Git repository
-    :return: Current branch
+    :return: Current branch or None if not determinable
     """
     try:
         cmd = ["git", "branch", "--show-current"]
         result: str = check_output(cmd, stderr=DEVNULL, cwd=repo).decode(
             encoding="utf-8"
         )
-        return result.strip() if result else "-"
+        return result.strip() if result else None
 
     except CalledProcessError:
-        return "-"
+        return None
 
 
 def get_local_tags(repo_path: Path, _filter: str | None = None) -> List[str]: