完善分享功能

main.py

@@ -153,7 +153,9 @@ async def home(request: Request):
     return templates.TemplateResponse("index.html", {"request": request})
 
 
-@api_router.post("/files", summary="文件列表", description="获取文件列表", tags=["API"])
+@api_router.post(
+    "/files", summary="文件列表", description="获取文件列表", tags=["文件"]
+)
 async def get_files(item: FileRequest):
     return await THUNDERX_CLIENT.file_list(
         item.size, item.parent_id, item.next_page_token, item.additional_filters
@@ -161,44 +163,74 @@ async def get_files(item: FileRequest):
 
 
 @api_router.get(
-    "/files/{file_id}", summary="文件信息", description="获取文件信息", tags=["API"]
+    "/files/{file_id}", summary="文件信息", description="获取文件信息", tags=["文件"]
 )
 async def get_file_info(file_id: str):
     return await THUNDERX_CLIENT.get_download_url(file_id)
 
 
 @api_router.post(
-    "/emptytrash", summary="清空回收站", description="清空回收站【慎用】", tags=["API"]
+    "/emptytrash", summary="清空回收站", description="清空回收站【慎用】", tags=["文件"]
 )
 async def emptytrash():
     return await THUNDERX_CLIENT.emptytrash()
 
 
+##############  分享 ################
+@api_router.post(
+    "/get_share_list",
+    summary="获取账号分享列表",
+    description="获取账号分享列表",
+    tags=["分享"],
+)
+async def get_share_list(page_token: str | None = None):
+    return await THUNDERX_CLIENT.get_share_list(page_token)
+
 
 @api_router.post(
-    "/file_batch_share", summary="创建分享", description="创建分享", tags=["API"]
+    "/file_batch_share", summary="创建分享", description="创建分享", tags=["分享"]
 )
-async def file_batch_share(ids: List[str] = None, need_password: bool | None = False,expiration_days:int | None=-1):
-    return await THUNDERX_CLIENT.file_batch_share(ids,need_password,expiration_days)
+async def file_batch_share(
+    ids: List[str] = None,
+    need_password: bool | None = False,
+    expiration_days: int | None = -1,
+):
+    return await THUNDERX_CLIENT.file_batch_share(ids, need_password, expiration_days)
 
 
+@api_router.post(
+    "/file_batch_delete", summary="取消分享", description="取消分享", tags=["分享"]
+)
+async def file_batch_delete(ids: List[str]):
+    return await THUNDERX_CLIENT.file_batch_delete(ids)
+
 
 @api_router.post(
-    "/get_share_folder", summary="获取分享信息", description="获取分享信息", tags=["API"]
+    "/get_share_folder",
+    summary="获取分享信息",
+    description="获取分享信息",
+    tags=["分享"],
 )
-async def get_share_folder(share_id: str, pass_code_token: str | None = None,parent_id:str | None=None):
-    return await THUNDERX_CLIENT.get_share_folder(share_id,pass_code_token,parent_id)
+async def get_share_folder(
+    share_id: str, pass_code_token: str | None = None, parent_id: str | None = None
+):
+    return await THUNDERX_CLIENT.get_share_folder(share_id, pass_code_token, parent_id)
 
 
 @api_router.post(
-    "/restore", summary="转存分享文件", description="转存分享文件", tags=["API"]
+    "/restore", summary="转存分享文件", description="转存分享文件", tags=["分享"]
 )
-async def restore(share_id: str, pass_code_token: str | None = None,file_ids:List[str] | None=None):
-    return await THUNDERX_CLIENT.restore(share_id,pass_code_token,file_ids)
+async def restore(
+    share_id: str, pass_code_token: str | None = None, file_ids: List[str] | None = None
+):
+    return await THUNDERX_CLIENT.restore(share_id, pass_code_token, file_ids)
+
+
+##############  离线任务 ################
 
 
 @api_router.get(
-    "/offline", summary="离线任务列表", description="离线任务列表", tags=["API"]
+    "/offline", summary="离线任务列表", description="离线任务列表", tags=["离线任务"]
 )
 async def offline_list(size: int = 10000, next_page_token: str | None = None):
     return await THUNDERX_CLIENT.offline_list(
@@ -207,8 +239,9 @@ async def offline_list(size: int = 10000, next_page_token: str | None = None):
         phase=None,
     )
 
+
 @api_router.post(
-    "/offline", summary="添加离线任务", description="添加离线任务", tags=["API"]
+    "/offline", summary="添加离线任务", description="添加离线任务", tags=["离线任务"]
 )
 async def offline(item: OfflineRequest):
     return await THUNDERX_CLIENT.offline_download(
@@ -216,28 +249,37 @@ async def offline(item: OfflineRequest):
     )
 
 
+@api_router.post(
+    "/delete_tasks",
+    summary="删除离线任务",
+    description="删除离线任务",
+    tags=["离线任务"],
+)
+async def delete_tasks(task_ids: List[str], delete_files: bool = False):
+    return await THUNDERX_CLIENT.delete_tasks(task_ids, delete_files)
+
+
+##############  账号 ################
 @api_router.get(
-    "/userinfo", summary="用户信息", description="获取用户登陆信息", tags=["API"]
+    "/userinfo", summary="用户信息", description="获取用户登陆信息", tags=["账号"]
 )
 async def userinfo():
     return THUNDERX_CLIENT.get_user_info()
 
 
 @api_router.get(
-    "/quota", summary="空间使用信息", description="获取空间使用信息", tags=["API"]
+    "/quota", summary="空间使用信息", description="获取空间使用信息", tags=["账号"]
 )
 async def quota_info():
     return await THUNDERX_CLIENT.get_quota_info()
 
 
-
 @api_router.get(
-    "/invite_code", summary="查看邀请码", description="查看邀请码", tags=["API"]
+    "/invite_code", summary="查看邀请码", description="查看邀请码", tags=["账号"]
 )
 async def get_invite_code():
     return await THUNDERX_CLIENT.get_invite_code()
 
 
-
 app.include_router(front_router)
 app.include_router(api_router)

pikpakapi/__init__.py

@@ -908,43 +908,6 @@ class PikPakApi:
         )
         return result
 
-    async def file_batch_share(
-        self,
-        ids: List[str],
-        need_password: Optional[bool] = False,
-        expiration_days: Optional[int] = -1,
-    ) -> Dict[str, Any]:
-        """
-        ids: List[str] - 文件id列表
-        need_password: Optional[bool] - 是否需要分享密码
-        expiration_days: Optional[int] - 分享天数
-
-        批量分享文件，并生成分享链接
-        返回数据结构：
-        {
-            "share_id": "xxx", //分享ID
-            "share_url": "https://mypikpak.com/s/xxx", // 分享链接
-            "pass_code": "53fe", // 分享密码
-            "share_text": "https://mypikpak.com/s/xxx",
-            "share_list": []
-        }
-        """
-        data = {
-            "file_ids": ids,
-            "share_to": "copy",
-            "restore_limit":"-1",
-            "expiration_days":"-1",
-            "expiration_days": expiration_days,
-            "pass_code_option": "REQUIRED" if need_password else "NOT_REQUIRED",
-        }
-        captcha_result = await self.captcha_init(f"POST:/drive/v1/share")
-        self.captcha_token = captcha_result.get("captcha_token")
-        result = await self._request_post(
-            url=f"https://{self.PIKPAK_API_HOST}/drive/v1/share",
-            data=data,
-        )
-        return result
-
     async def get_quota_info(self) -> Dict[str, Any]:
         """
         获取当前空间的quota信息
@@ -998,6 +961,87 @@ class PikPakApi:
         result = await self._request_get(url)
         return result
 
+    async def file_batch_share(
+        self,
+        ids: List[str],
+        need_password: Optional[bool] = False,
+        expiration_days: Optional[int] = -1,
+    ) -> Dict[str, Any]:
+        """
+        ids: List[str] - 文件id列表
+        need_password: Optional[bool] - 是否需要分享密码
+        expiration_days: Optional[int] - 分享天数
+
+        批量分享文件，并生成分享链接
+        返回数据结构：
+        {
+            "share_id": "xxx", //分享ID
+            "share_url": "https://mypikpak.com/s/xxx", // 分享链接
+            "pass_code": "53fe", // 分享密码
+            "share_text": "https://mypikpak.com/s/xxx",
+            "share_list": []
+        }
+        """
+        data = {
+            "file_ids": ids,
+            "share_to": "copy",
+            "restore_limit": "-1",
+            "expiration_days": "-1",
+            "expiration_days": expiration_days,
+            "pass_code_option": "REQUIRED" if need_password else "NOT_REQUIRED",
+        }
+        captcha_result = await self.captcha_init(f"POST:/drive/v1/share")
+        self.captcha_token = captcha_result.get("captcha_token")
+        result = await self._request_post(
+            url=f"https://{self.PIKPAK_API_HOST}/drive/v1/share",
+            data=data,
+        )
+        return result
+
+    async def file_batch_delete(
+        self,
+        ids: List[str],
+    ) -> Dict[str, Any]:
+        """
+        ids: List[str] - 文件id列表
+
+        批量分享文件，并生成分享链接
+        返回数据结构：
+        {
+            "share_id": "xxx", //分享ID
+            "share_url": "https://mypikpak.com/s/xxx", // 分享链接
+            "pass_code": "53fe", // 分享密码
+            "share_text": "https://mypikpak.com/s/xxx",
+            "share_list": []
+        }
+        """
+        data = {
+            "ids": ids,
+        }
+        captcha_result = await self.captcha_init(f"POST:/drive/v1/share:batchDelete")
+        self.captcha_token = captcha_result.get("captcha_token")
+        result = await self._request_post(
+            url=f"https://{self.PIKPAK_API_HOST}/drive/v1/share:batchDelete",
+            data=data,
+        )
+        return result
+
+    async def get_share_list(
+        self, next_page_token: Optional[str] = None
+    ) -> Dict[str, Any]:
+        """
+        获取账号下所有分享信息
+        """
+        data = {
+            "limit": "100",
+            "thumbnail_size": "SIZE_SMALL",
+            "page_token": next_page_token,
+        }
+        url = f"https://{self.PIKPAK_API_HOST}/drive/v1/share/list"
+        captcha_result = await self.captcha_init(f"GET:/drive/v1/share/list")
+        self.captcha_token = captcha_result.get("captcha_token")
+        return await self._request_get(url, params=data)
+
     async def get_share_folder(
         self, share_id: str, pass_code_token: str, parent_id: str = None
     ) -> Dict[str, Any]: