fix(AlistClient, AlistPath, alist2strm): 更新属性引用，将 path 字段替换为 full_path

Author: AkimioJR

app/modules/alist/v3/client.py

@@ -213,12 +213,13 @@ async def async_api_fs_list(self, dir_path: str) -> list[AlistPath]:
 
         if result["data"]["total"] == 0:
             return []
-        
+
         return [
             AlistPath(
                 server_url=self.url,
                 base_path=self.base_path,
-                **{**alist_path, "path": dir_path + "/" + alist_path["name"]}, # 将 V3.45 的 path 字段替换掉
+                full_path=dir_path + "/" + alist_path["name"],
+                **alist_path,
             )
             for alist_path in result["data"]["content"]
         ]
@@ -255,7 +256,7 @@ async def async_api_fs_get(self, path: str) -> AlistPath:
         return AlistPath(
             server_url=self.url,
             base_path=self.base_path,
-            _path=path,
+            full_path=path,
             **result["data"],
         )
 
@@ -376,7 +377,7 @@ async def iter_path(
             await sleep(wait_time)
             if path.is_dir:
                 async for child_path in self.iter_path(
-                    dir_path=path.path,
+                    dir_path=path.full_path,
                     wait_time=wait_time,
                     is_detail=is_detail,
                     filter=filter,
@@ -385,7 +386,7 @@ async def iter_path(
 
             if filter(path):
                 if is_detail:
-                    yield await self.async_api_fs_get(path.path)
+                    yield await self.async_api_fs_get(path.full_path)
                 else:
                     yield path
 

app/modules/alist/v3/path.py

@@ -13,11 +13,11 @@ class AlistPath(BaseModel):
     """
 
     server_url: str  # 服务器地址
-    base_path: str  # 基础路径（用于计算文件/目录在 Alist 服务器上的绝对地址）
-    path: str  # 文件/目录路径
+    base_path: str  # 用户基础路径（用于计算文件/目录在 Alist 服务器上的绝对地址）
+    full_path: str  # 相对用户根文件/目录路径
 
-    # id: str | None = None  # 文件/目录 ID（Alist V3.45）
-    # path: str | None = None  # 文件/目录路径（Alist V3.45）
+    id: str | None = None  # 文件/目录 ID（Alist V3.45）
+    path: str | None = None  # 相对存储器根目录的文件/目录路径（Alist V3.45）
     name: str  # 文件/目录名称
     size: int  # 文件大小
     is_dir: bool  # 是否为目录
@@ -39,7 +39,7 @@ def abs_path(self) -> str:
         """
         文件/目录在 Alist 服务器上的绝对路径
         """
-        return self.base_path.rstrip("/") + self.path
+        return self.base_path.rstrip("/") + self.full_path
 
     @property
     def download_url(self) -> str:
@@ -58,7 +58,7 @@ def proxy_download_url(self) -> str:
         """
         Alist代理下载地址
         """
-        return sub(r"/d/", "/p/", self.download_url, 1)
+        return sub("/d/", "/p/", self.download_url, 1)
 
     @property
     def suffix(self) -> str:

app/modules/alist2strm/alist2strm.py

@@ -114,7 +114,7 @@ def filter(path: AlistPath) -> bool:
             try:
                 local_path = self.__get_local_path(path)
             except OSError as e:  # 可能是文件名过长
-                logger.warning(f"获取 {path.path} 本地路径失败：{e}")
+                logger.warning(f"获取 {path.full_path} 本地路径失败：{e}")
                 return False
 
             self.processed_local_paths.add(local_path)
@@ -124,15 +124,17 @@ def filter(path: AlistPath) -> bool:
                     local_path_stat = local_path.stat()
                     if local_path_stat.st_mtime < path.modified_timestamp:
                         logger.debug(
-                            f"文件 {local_path.name} 已过期，需要重新处理 {path.path}"
+                            f"文件 {local_path.name} 已过期，需要重新处理 {path.full_path}"
                         )
                         return True
                     if local_path_stat.st_size < path.size:
                         logger.debug(
-                            f"文件 {local_path.name} 大小不一致，可能是本地文件损坏，需要重新处理 {path.path}"
+                            f"文件 {local_path.name} 大小不一致，可能是本地文件损坏，需要重新处理 {path.full_path}"
                         )
                         return True
-                logger.debug(f"文件 {local_path.name} 已存在，跳过处理 {path.path}")
+                logger.debug(
+                    f"文件 {local_path.name} 已存在，跳过处理 {path.full_path}"
+                )
                 return False
 
             return True
@@ -177,7 +179,7 @@ async def __file_processer(self, path: AlistPath) -> None:
         elif self.mode == "RawURL":
             content = path.raw_url
         elif self.mode == "AlistPath":
-            content = path.path
+            content = path.full_path
         else:
             raise ValueError(f"AlistStrm 未知的模式 {self.mode}")
 
@@ -203,7 +205,7 @@ def __get_local_path(self, path: AlistPath) -> Path:
         if self.flatten_mode:
             local_path = self.target_dir / path.name
         else:
-            relative_path = path.path.replace(self.source_dir, "", 1)
+            relative_path = path.full_path.replace(self.source_dir, "", 1)
             if relative_path.startswith("/"):
                 relative_path = relative_path[1:]
             local_path = self.target_dir / relative_path

tests/test_alist.py

@@ -219,7 +219,8 @@ def test_alist_path_initialization_old(self) -> None:
             path = AlistPath(
                 server_url="https://alist.nn.ci",
                 base_path="/",
-                **{**item, "path": "/" + item["name"]},
+                full_path="/" + item["name"],
+                **item,
             )
             self.assertIsInstance(path, AlistPath)
             self.assertEqual(path.name, item["name"])
@@ -298,7 +299,8 @@ def test_alist_path_initialization_new(self) -> None:
             path = AlistPath(
                 server_url="https://alist.nn.ci",
                 base_path="/",
-                **{**item, "path": "/" + item["name"]},
+                full_path="/" + item["name"],
+                **item,
             )
 
             self.assertIsInstance(path, AlistPath)