test: expand updater archive root coverage

Author: zouyonghe

astrbot/core/star/updator.py

@@ -78,12 +78,11 @@ def unzip_file(self, zip_path: str, target_dir: str) -> None:
             update_dir = self._normalize_archive_root_dir(z.namelist()[0])
             z.extractall(target_dir)
 
-        target_root_path = self._normalize_archive_path(target_dir)
-        update_root_path = self._normalize_archive_path(target_root_path, update_dir)
+        update_root_path = os.path.normpath(os.path.join(target_dir, update_dir))
         files = os.listdir(update_root_path)
         for f in files:
-            update_item_path = self._normalize_archive_path(update_root_path, f)
-            target_item_path = self._normalize_archive_path(target_root_path, f)
+            update_item_path = os.path.normpath(os.path.join(update_root_path, f))
+            target_item_path = os.path.normpath(os.path.join(target_dir, f))
             if os.path.isdir(update_item_path):
                 if os.path.exists(target_item_path):
                     shutil.rmtree(target_item_path, onerror=on_error)

astrbot/core/zip_updator.py

@@ -231,13 +231,9 @@ def parse_github_url(self, url: str):
             return author, repo, branch
         raise ValueError("无效的 GitHub URL")
 
-    @staticmethod
-    def _normalize_archive_path(*parts: str) -> str:
-        return os.path.normpath(os.path.join(*parts))
-
     @staticmethod
     def _normalize_archive_root_dir(path: str) -> str:
-        normalized = RepoZipUpdator._normalize_archive_path(path)
+        normalized = os.path.normpath(path)
         return "" if normalized == "." else normalized
 
     def unzip_file(self, zip_path: str, target_dir: str) -> None:
@@ -249,12 +245,11 @@ def unzip_file(self, zip_path: str, target_dir: str) -> None:
             z.extractall(target_dir)
         logger.debug(f"解压文件完成: {zip_path}")
 
-        target_root_path = self._normalize_archive_path(target_dir)
-        update_root_path = self._normalize_archive_path(target_root_path, update_dir)
+        update_root_path = os.path.normpath(os.path.join(target_dir, update_dir))
         files = os.listdir(update_root_path)
         for f in files:
-            update_item_path = self._normalize_archive_path(update_root_path, f)
-            target_item_path = self._normalize_archive_path(target_root_path, f)
+            update_item_path = os.path.normpath(os.path.join(update_root_path, f))
+            target_item_path = os.path.normpath(os.path.join(target_dir, f))
             if os.path.isdir(update_item_path):
                 if os.path.exists(target_item_path):
                     shutil.rmtree(target_item_path, onerror=on_error)

tests/test_updator_socks.py

@@ -1,4 +1,5 @@
 import ntpath
+import posixpath
 from dataclasses import dataclass, field
 from pathlib import Path
 from types import SimpleNamespace
@@ -126,6 +127,10 @@ def extractall(self, target_dir: str) -> None:  # noqa: ARG002
         return None
 
 
+def _build_fake_archive_entries(archive_root: str) -> list[str]:
+    return [archive_root, posixpath.join(archive_root, ".dockerignore")]
+
+
 def _build_fake_httpx_module(state: _FakeAsyncClientState) -> SimpleNamespace:
     class _FakeAsyncClient:
         def __init__(self, **kwargs):
@@ -420,13 +425,22 @@ async def test_download_file_logs_url_and_target_path_on_failure(
     assert any(str(target_path) in message for message in log_messages)
 
 
+@pytest.mark.parametrize(
+    "archive_root",
+    [
+        "AstrBotDevs-AstrBot-39386ee/",
+        "AstrBotDevs-AstrBot-39386ee",
+        "owner-repo-branch/subdir/",
+        ".",
+    ],
+)
 def test_repo_unzip_file_normalizes_windows_extended_length_paths(
     monkeypatch: pytest.MonkeyPatch,
+    archive_root: str,
 ) -> None:
     import astrbot.core.zip_updator as zip_updator_module
 
     target_dir = r"\\?\\C:\\Users\\admin\\AppData\\Local\\AstrBot\\backend\\app"
-    archive_root = "AstrBotDevs-AstrBot-39386ee/"
     expected_root = ntpath.normpath(ntpath.join(target_dir, archive_root))
     expected_file = ntpath.normpath(
         ntpath.join(target_dir, archive_root, ".dockerignore")
@@ -447,9 +461,7 @@ def fake_listdir(path: str) -> list[str]:
     monkeypatch.setattr(
         zip_updator_module.zipfile,
         "ZipFile",
-        lambda path, mode: _FakeZipArchive(
-            [archive_root, f"{archive_root}.dockerignore"]
-        ),
+        lambda path, mode: _FakeZipArchive(_build_fake_archive_entries(archive_root)),
     )
     monkeypatch.setattr(zip_updator_module.logger, "debug", lambda message: None)
     monkeypatch.setattr(zip_updator_module.logger, "warning", lambda message: None)
@@ -504,9 +516,7 @@ def fake_listdir(path: str) -> list[str]:
     monkeypatch.setattr(
         plugin_updator_module.zipfile,
         "ZipFile",
-        lambda path, mode: _FakeZipArchive(
-            [archive_root, f"{archive_root}.dockerignore"]
-        ),
+        lambda path, mode: _FakeZipArchive(_build_fake_archive_entries(archive_root)),
     )
     monkeypatch.setattr(plugin_updator_module.logger, "info", lambda message: None)
     monkeypatch.setattr(plugin_updator_module.logger, "warning", lambda message: None)