deploy: sync server CloudSearch 0.5.6

cloudsearch_transfer/adapter/aliyun/__init__.py

@@ -15,8 +15,8 @@ import logging
 from typing import List, Dict, Tuple, Optional
 
 from ..base import BaseCloudDriveAdapter, FileInfo, match_url
-from ..config import PlatformConfig, TransferConfig
-from ..errors import TransferError, TransferErrorCode
+from ...config import PlatformConfig, TransferConfig
+from ...errors import TransferError, TransferErrorCode
 
 from .credential import AliyunCredentialManager
 from .transfer import AliyunTransfer
@@ -47,23 +47,29 @@ class AliyunAdapter(BaseCloudDriveAdapter):
         "Referer": "https://aliyundrive.com",
     }
 
-    def __init__(self, config: PlatformConfig, transfer_config: TransferConfig):
-        super().__init__(config, transfer_config)
+    capabilities: Dict[str, bool] = {
+        **BaseCloudDriveAdapter.capabilities,
+        "ensure_dir": True,
+        "save_files": True,
+        "rename": True,
+        "move_files": True,
+        "delete_files": True,
+    }
 
-        # 创建凭证管理器（AliyunCredentialManager）
+    def __init__(self, config: PlatformConfig, transfer_config: TransferConfig):
+        # BaseCloudDriveAdapter.__init__ calls _setup_session(), so credential
+        # state must exist before super().__init__.
         refresh_token = config.refresh_token or config.cookie or ""
         self._credential = AliyunCredentialManager(refresh_token=refresh_token)
-
-        # 初始化 drive_id
         self._drive_id = ""
-
-        # 创建子模块
         self._transfer: Optional[AliyunTransfer] = None
         self._cleanup: Optional[AliyunCleanup] = None
+        super().__init__(config, transfer_config)
 
     def _setup_session(self):
         """初始化 session 和凭证"""
-        if self._credential.refresh_token:
+        refresh_token = getattr(self._credential, "refresh_token", "")
+        if refresh_token:
             # 验证 refresh_token 并获取 drive_id
             if self._credential.validate():
                 self._drive_id = self._credential.get_drive_id()
@@ -164,8 +170,10 @@ class AliyunAdapter(BaseCloudDriveAdapter):
                 platform=self.PLATFORM_KEY,
             )
 
-        # 确定目标目录
+        # 确定目标目录：路径先解析/创建为 file_id。
         to_parent = save_dir if save_dir and save_dir != "/" else "root"
+        if isinstance(to_parent, str) and to_parent.startswith("/"):
+            to_parent = self.ensure_dir(to_parent)
 
         transfer = self._get_transfer()
         new_ids = transfer._batch_copy(pwd_id, share_token, file_ids, to_parent)
@@ -237,6 +245,74 @@ class AliyunAdapter(BaseCloudDriveAdapter):
 
     # ─── 扩展功能 ──────────────────────────────────────────
 
+
+    # ─── Optional Drive API capability methods ─────────────────────
+
+    def get_fids(self, file_paths: List[str]) -> List[Dict]:
+        wanted = {p.rstrip("/") or "/" for p in file_paths}
+        found: List[Dict] = []
+        for path in wanted:
+            if path == "/":
+                found.append({"file_path": "/", "fid": "root"})
+                continue
+            parent = path.rsplit("/", 1)[0] or "/"
+            name = path.rsplit("/", 1)[-1]
+            for item in self.get_files(parent):
+                if item.is_dir and item.name == name:
+                    found.append({"file_path": path, "fid": item.fid})
+                    break
+        return found
+
+    def ensure_dir(self, dir_path: str) -> str:
+        normalized = "/" + (dir_path or "/").strip("/")
+        if normalized == "/":
+            return "root"
+        current = ""
+        last_fid = "root"
+        for part in [p for p in normalized.split("/") if p]:
+            current = f"{current}/{part}" if current else f"/{part}"
+            matches = self.get_fids([current])
+            if matches:
+                last_fid = matches[0].get("fid") or matches[0].get("file_id") or last_fid
+                continue
+            created = self.mkdir(current)
+            data = created.get("data", created) if isinstance(created, dict) else {}
+            last_fid = data.get("fid") or data.get("file_id") or data.get("id") or last_fid
+        return last_fid
+
+    def mkdir(self, dir_path: str) -> Dict:
+        parent = dir_path.rsplit("/", 1)[0] or "/"
+        name = dir_path.rstrip("/").rsplit("/", 1)[-1]
+        parent_fid = "root" if parent == "/" else self.ensure_dir(parent)
+        url = "https://api.aliyundrive.com/adrive/v2/file/createWithFolders"
+        body = {
+            "drive_id": self._drive_id or self._credential.get_drive_id(),
+            "parent_file_id": parent_fid,
+            "name": name,
+            "type": "folder",
+            "check_name_mode": "refuse",
+        }
+        resp = self._post(url, json_data=body, headers=self._credential.get_headers())
+        data = self._drive_api_json(resp, context="阿里云盘创建目录")
+        return {"code": 0, "status": 200, "data": {"fid": data.get("file_id", ""), **data}}
+
+    def rename(self, fid: str, file_name: str) -> Dict:
+        url = "https://api.aliyundrive.com/v3/file/update"
+        body = {"drive_id": self._drive_id or self._credential.get_drive_id(), "file_id": fid, "name": file_name, "check_name_mode": "refuse"}
+        data = self._drive_api_json(self._post(url, json_data=body, headers=self._credential.get_headers()), context="阿里云盘重命名")
+        return {"code": 0, "status": 200, "data": data}
+
+    def move_files(self, fids: List[str], to_pdir_fid: str) -> Dict:
+        if isinstance(to_pdir_fid, str) and to_pdir_fid.startswith("/"):
+            to_pdir_fid = self.ensure_dir(to_pdir_fid)
+        drive_id = self._drive_id or self._credential.get_drive_id()
+        requests = [{"id": fid, "method": "POST", "url": "/file/move", "headers": {"Content-Type": "application/json"}, "body": {"drive_id": drive_id, "file_id": fid, "to_parent_file_id": to_pdir_fid}} for fid in fids]
+        data = self._drive_api_json(self._post("https://api.aliyundrive.com/adrive/v4/batch", json_data={"requests": requests, "resource": "file"}, headers=self._credential.get_headers()), context="阿里云盘移动文件")
+        return {"code": 0, "status": 200, "data": data}
+
+    def delete_files(self, fids: List[str]) -> Dict:
+        return {"code": 0, "status": 200} if self.delete(fids) else {"code": -1, "status": 500}
+
     def cleanup_files(self, file_ids: List[str]) -> Dict:
         """
         清理文件（移入回收站），返回详细结果。