deploy: sync server CloudSearch 0.5.6

cloudsearch_transfer/adapter/baidu/__init__.py

@@ -6,7 +6,7 @@
 """
 
 import logging
-from typing import List, Tuple
+from typing import List, Tuple, Dict
 
 from ..base import BaseCloudDriveAdapter, FileInfo
 from ...config import PlatformConfig, TransferConfig
@@ -36,6 +36,15 @@ class BaiduAdapter(BaseCloudDriveAdapter):
         r'pan\.baidu\.com/s/1([A-Za-z0-9_-]+)',
     ]
 
+    capabilities: Dict[str, bool] = {
+        **BaseCloudDriveAdapter.capabilities,
+        "ensure_dir": True,
+        "save_files": True,
+        "rename": True,
+        "move_files": True,
+        "delete_files": True,
+    }
+
     def __init__(self, config: PlatformConfig, transfer_config: TransferConfig):
         super().__init__(config, transfer_config)
 
@@ -123,11 +132,13 @@ class BaiduAdapter(BaseCloudDriveAdapter):
         fs_ids = detail["fs_ids"]
         filenames = detail.get("filenames", [])
 
+        target_dir = self.ensure_dir(save_dir) if save_dir and save_dir.startswith("/") else (save_dir or "/")
+
         # ③ 转存
-        self._transfer._transfer_files(shareid, uk, fs_ids, save_dir, bdstoken)
+        self._transfer._transfer_files(shareid, uk, fs_ids, target_dir, bdstoken)
 
         # ④ 列出目录匹配新 fs_id
-        new_fs_ids = self._transfer._list_and_match(save_dir, filenames, bdstoken)
+        new_fs_ids = self._transfer._list_and_match(target_dir, filenames, bdstoken)
 
         # 暂存文件信息供 _filter_ads + _create_share 使用
         self._last_transfer_files = [
@@ -248,6 +259,71 @@ class BaiduAdapter(BaseCloudDriveAdapter):
 
     # ─── 扩展方法 ────────────────────────────────────────────
 
+
+    # ─── Optional Drive API capability methods ─────────────────────
+
+    def ensure_dir(self, dir_path: str) -> str:
+        normalized = "/" + (dir_path or "/").strip("/")
+        if normalized == "/":
+            return "/"
+        current = ""
+        for part in [p for p in normalized.split("/") if p]:
+            parent = current or "/"
+            current = f"{current}/{part}" if current else f"/{part}"
+            exists = any(item.is_dir and item.name == part for item in self.get_files(parent))
+            if not exists:
+                self.mkdir(current)
+        return normalized
+
+    def get_fids(self, file_paths: List[str]) -> List[Dict]:
+        """Resolve existing Baidu paths by listing their parent directories."""
+        results: List[Dict] = []
+        for path in file_paths:
+            normalized = "/" + (path or "").strip("/")
+            if normalized == "/":
+                results.append({"file_path": path, "fid": "/", "path": "/"})
+                continue
+            parent, name = normalized.rsplit("/", 1)
+            parent = parent or "/"
+            match = next((item for item in self.get_files(parent) if item.name == name), None)
+            if match:
+                results.append({"file_path": path, "fid": match.fid, "path": normalized})
+        return results
+
+    def mkdir(self, dir_path: str) -> Dict:
+        bdstoken = self.credential.get_bdstoken()
+        url = "https://pan.baidu.com/api/create"
+        params = {"a": "commit", "bdstoken": bdstoken}
+        data = {"path": dir_path, "isdir": 1, "block_list": "[]"}
+        resp = self._post(url, data=data, params=params, headers=self.credential.get_headers())
+        payload = self._drive_api_json(resp, context="百度网盘创建目录")
+        errno = payload.get("errno", 0)
+        if errno not in (0, -8):
+            raise TransferError(TransferErrorCode.NETWORK_ERROR, message=f"百度创建目录失败 errno={errno}", platform=self.PLATFORM_KEY, details=payload)
+        return {"code": 0, "status": 200, "data": {"path": dir_path, **payload}}
+
+    def rename(self, fid: str, file_name: str) -> Dict:
+        return self._filemanager("rename", [{"path": fid, "newname": file_name}])
+
+    def move_files(self, fids: List[str], to_pdir_fid: str) -> Dict:
+        target = self.ensure_dir(to_pdir_fid) if to_pdir_fid.startswith("/") else to_pdir_fid
+        return self._filemanager("move", [{"path": fid, "dest": target} for fid in fids])
+
+    def delete_files(self, fids: List[str]) -> Dict:
+        return {"code": 0, "status": 200} if self.delete(fids) else {"code": -1, "status": 500}
+
+    def _filemanager(self, opera: str, filelist: List[Dict]) -> Dict:
+        import json
+        bdstoken = self.credential.get_bdstoken()
+        url = "https://pan.baidu.com/api/filemanager"
+        params = {"opera": opera, "bdstoken": bdstoken}
+        data = {"filelist": json.dumps(filelist, ensure_ascii=False)}
+        payload = self._drive_api_json(self._post(url, data=data, params=params, headers=self.credential.get_headers()), context=f"百度网盘{opera}")
+        errno = payload.get("errno", 0)
+        if errno != 0:
+            raise TransferError(TransferErrorCode.NETWORK_ERROR, message=f"百度文件操作失败 errno={errno}", platform=self.PLATFORM_KEY, details=payload)
+        return {"code": 0, "status": 200, "data": payload}
+
     def delete_paths(self, paths: List[str]) -> bool:
         """便捷删除方法（直接调用 cleanup）"""
         return self._cleanup.delete_files(paths)