p115client 0.0.5.11.8.2__tar.gz → 0.0.5.11.9.1__tar.gz

{p115client-0.0.5.11.8.2 → p115client-0.0.5.11.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.11.8.2
+Version: 0.0.5.11.9.1
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT

{p115client-0.0.5.11.8.2 → p115client-0.0.5.11.9.1}/p115client/_upload.py

@@ -3,19 +3,19 @@
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
 __all__ = [
-    "make_dataiter", "oss_upload_sign", "oss_upload_request", "oss_multipart_upload_init", 
-    "oss_multipart_upload_complete", "oss_multipart_upload_cancel", "oss_multipart_upload_part", 
-    "oss_multipart_upload_part_iter", "oss_multipart_part_iter", "oss_upload", "oss_multipart_upload", 
+    "make_dataiter", "oss_upload_sign", "oss_multipart_upload_url", "oss_upload_request", 
+    "oss_multipart_upload_init", "oss_multipart_upload_complete", "oss_multipart_upload_cancel", 
+    "oss_multipart_upload_part", "oss_multipart_upload_part_iter", "oss_multipart_part_iter", 
+    "oss_upload", "oss_multipart_upload", 
 ]
 
 from base64 import b64encode
 from collections.abc import (
     AsyncGenerator, AsyncIterable, AsyncIterator, Awaitable, Buffer, Callable, 
-    Coroutine, Generator, ItemsView, Iterable, Iterator, Mapping, Sequence, Sized, 
+    Coroutine, Generator, ItemsView, Iterable, Iterator, Mapping, Sequence, 
 )
 from datetime import datetime
 from email.utils import formatdate
-from functools import partial
 from hmac import digest as hmac_digest
 from inspect import iscoroutinefunction
 from itertools import count
@@ -135,8 +135,17 @@ def oss_upload_sign(
     method: str = "PUT", 
     params: None | str | Mapping | Sequence[tuple[Any, Any]] = None, 
     headers: None | Mapping[str, str] | Iterable[tuple[str, str]] = None, 
-) -> tuple[dict, str]:
+) -> tuple[str, dict]:
     """计算认证信息，返回带认证信息的请求头
+
+    :param bucket: 存储桶
+    :param object: 对象 id
+    :param token:  令牌
+    :param method: HTTP 请求方法
+    :param params: 其它查询参数
+    :param headers: 默认的请求头
+
+    :return: 构造后的 查询参数 和 请求头 的 2 元组
     """
     # subresource_keys = (
     #     "accessPoint", "accessPointPolicy", "acl", "append", "asyncFetch", "bucketArchiveDirectRead", 
@@ -188,7 +197,42 @@ def oss_upload_sign(
 /{bucket}/{object}{params}""".encode("utf-8")
     signature = to_base64(hmac_digest(bytes(token["AccessKeySecret"], "utf-8"), signature_data, "sha1"))
     headers["authorization"] = "OSS {0}:{1}".format(token["AccessKeyId"], signature)
-    return headers, params
+    return params, headers
+
+
+def oss_multipart_upload_url(
+    bucket: str, 
+    object: str, 
+    token: dict, 
+    upload_id: int | str, 
+    part_number: int = 1, 
+    domain: str = "oss-cn-shenzhen.aliyuncs.com", 
+) -> tuple[str, dict]:
+    """构建分块上传的链接和请求头
+
+    :param bucket: 存储桶
+    :param object: 对象 id
+    :param token:  令牌
+    :param upload_id: 上传 id
+    :param domain: 所用的 阿里云网址 或 包含存储桶和对象的完整网址
+
+    :return: 构造后的 上传链接 和 请求头 的 2 元组
+    """
+    params, headers = oss_upload_sign(
+        bucket, 
+        object, 
+        token, 
+        method="PUT", 
+        params={"partNumber": part_number, "uploadId": upload_id}, 
+        headers={"x-oss-security-token": token["SecurityToken"]}, 
+    )
+    if domain.startswith(("http://", "https://")):
+        url = domain.rstrip("/")
+    elif domain:
+        url = f"http://{bucket}.{domain}/{object}"
+    else:
+        url = ""
+    return url+params, headers
 
 
 def oss_upload_request[T](
@@ -206,7 +250,7 @@ def oss_upload_request[T](
 ) -> T:
     """请求阿里云 OSS 的公用函数
     """
-    headers, params = oss_upload_sign(
+    params, headers = oss_upload_sign(
         bucket, 
         object, 
         token, 
@@ -929,22 +973,3 @@ def oss_multipart_upload(
                 yield close_reporthook()
     return run_gen_step(gen_step, may_call=False, async_=async_)
 
-
-# class MultipartUploader:
-#     def __init__
-#     def __del__
-#     async def __aiter__
-#     def __iter__
-#     async def __aenter__
-#     async def __aexit__
-#     def __enter__
-#     def __exit__
-#     # 0. 应该设计 1 个类，支持同步和异步，实例化不会进行初始化（为了对异步进行适配）
-#     # 1. 可以作为上下文管理器或者迭代器使用
-#     # 2. 上下文管理器也返回迭代器（迭代器迭代时，如果未打开文件或者没有上传信息，则会初始化以获取）
-#     # 3. 中途可以暂停或取消
-#     # 4. seekable: path, url (支持 range request), file reader (seekable)
-#     # 5. 支持进度条
-#     # 6. 设计一个工具函数，放到 p115client.tool.upload 模块中
-#     ...
-

{p115client-0.0.5.11.8.2 → p115client-0.0.5.11.9.1}/p115client/client.py

@@ -3274,7 +3274,6 @@ class P115OpenClient(ClientRequestMixin):
         api = complete_proapi("/open/ufile/downurl", base_url)
         if isinstance(payload, str):
             payload = {"pick_code": payload}
-        request_headers = request_kwargs.get("headers")
         headers = request_kwargs.get("headers")
         if headers:
             if isinstance(headers, Mapping):
@@ -3462,7 +3461,7 @@ class P115OpenClient(ClientRequestMixin):
             - fields: str = <default>
             - for: str = <default> 💡 文件格式，例如 "doc"
             - format: str = "json" 💡 返回格式，默认即可
-            - hide_data: str = <default>
+            - hide_data: str = <default> 💡 是否返回文件数据
             - is_q: 0 | 1 = <default>
             - is_share: 0 | 1 = <default>
             - min_size: int = 0 💡 最小的文件大小
@@ -3771,8 +3770,8 @@ class P115OpenClient(ClientRequestMixin):
             - search_value: str = "." 💡 搜索文本，可以是 sha1
             - show_dir: 0 | 1 = 1 💡 是否显示目录
             - source: str = <default>
-            - star: 0 | 1 = <default>
-            - suffix: str = <default>
+            - star: 0 | 1 = <default> 💡 是否星标文件
+            - suffix: str = <default> 💡 后缀名（优先级高于 `type`）
             - type: int = <default> 💡 文件类型
 
               - 0: 全部（仅当前目录）
@@ -5188,6 +5187,7 @@ class P115OpenClient(ClientRequestMixin):
                 async_=async_, # type: ignore
                 **request_kwargs, 
             )
+            check_response(resp)
             data = resp["data"]
             match data["status"]:
                 case 2:
@@ -6173,6 +6173,8 @@ class P115Client(P115OpenClient):
 
             但一个设备的新登录者，并不总是意味着把较早的登录者下线，一般需要触发某个检查机制后，才会把同一设备下除最近一次登录外的所有 cookies 失效
 
+            所以你可以用一个设备的 cookies 专门用于扫码登录，获取另一个设备的 cookies 执行网盘操作，第 2 个 cookies 失效了，则用第 1 个 cookies 扫码，如此可避免单个 cookies 失效后，不能自动获取新的
+
         :param app: 要登录的 app，如果为 None，则用当前登录设备，如果无当前登录设备，则报错
         :param replace: 替换某个 client 对象的 cookie
 
@@ -6860,6 +6862,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -6871,6 +6874,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -6881,6 +6885,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False, True] = False, 
@@ -6895,7 +6900,7 @@ class P115Client(P115OpenClient):
             - aid: int | str 💡 助愿的 id
             - to_cid: int = <default> 💡 助愿中的分享链接转存到你的网盘中目录的 id
         """
-        api = complete_api("/api/1.0/web/1.0/act2024xys/adopt", "act", base_url=base_url)
+        api = complete_api(f"/api/1.0/{app}/1.0/act2024xys/adopt", "act", base_url=base_url)
         return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
 
     @overload
@@ -6903,6 +6908,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -6914,6 +6920,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -6924,6 +6931,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False, True] = False, 
@@ -6939,7 +6947,7 @@ class P115Client(P115OpenClient):
             - images: int | str = <default> 💡 图片文件在你的网盘的 id，多个用逗号 "," 隔开
             - file_ids: int | str = <default> 💡 文件在你的网盘的 id，多个用逗号 "," 隔开
         """
-        api = complete_api("/api/1.0/web/1.0/act2024xys/aid_desire", "act", base_url=base_url)
+        api = complete_api(f"/api/1.0/{app}/1.0/act2024xys/aid_desire", "act", base_url=base_url)
         return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
 
     @overload
@@ -6947,6 +6955,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: int | str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -6958,6 +6967,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: int | str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -6968,6 +6978,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: int | str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False, True] = False, 
@@ -6980,7 +6991,7 @@ class P115Client(P115OpenClient):
         :payload:
             - ids: int | str 💡 助愿的 id，多个用逗号 "," 隔开
         """
-        api = complete_api("/api/1.0/web/1.0/act2024xys/del_aid_desire", "act", base_url=base_url)
+        api = complete_api(f"/api/1.0/{app}/1.0/act2024xys/del_aid_desire", "act", base_url=base_url)
         if isinstance(payload, (int, str)):
             payload = {"ids": payload}
         return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
@@ -6990,6 +7001,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -7001,6 +7013,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -7011,6 +7024,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False, True] = False, 
@@ -7027,7 +7041,7 @@ class P115Client(P115OpenClient):
             - limit: int = 10 💡 分页大小
             - sort: int | str = <default> 💡 排序
         """
-        api = complete_api("/api/1.0/web/1.0/act2024xys/desire_aid_list", "act", base_url=base_url)
+        api = complete_api(f"/api/1.0/{app}/1.0/act2024xys/desire_aid_list", "act", base_url=base_url)
         if isinstance(payload, str):
             payload = {"start": 0, "page": 1, "limit": 10, "id": payload}
         else:
@@ -7038,6 +7052,7 @@ class P115Client(P115OpenClient):
     def act_xys_get_act_info(
         self, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -7048,6 +7063,7 @@ class P115Client(P115OpenClient):
     def act_xys_get_act_info(
         self, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -7057,6 +7073,7 @@ class P115Client(P115OpenClient):
     def act_xys_get_act_info(
         self, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False, True] = False, 
@@ -7066,7 +7083,7 @@ class P115Client(P115OpenClient):
 
         GET https://act.115.com/api/1.0/web/1.0/act2024xys/get_act_info
         """
-        api = complete_api("/api/1.0/web/1.0/act2024xys/get_act_info", "act", base_url=base_url)
+        api = complete_api(f"/api/1.0/{app}/1.0/act2024xys/get_act_info", "act", base_url=base_url)
         return self.request(url=api, async_=async_, **request_kwargs)
 
     @overload
@@ -7074,6 +7091,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -7085,6 +7103,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -7095,6 +7114,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False, True] = False, 
@@ -7107,7 +7127,7 @@ class P115Client(P115OpenClient):
         :payload:
             - id: str 💡 许愿的 id
         """
-        api = complete_api("/api/1.0/web/1.0/act2024xys/get_desire_info", "act", base_url=base_url)
+        api = complete_api(f"/api/1.0/{app}/1.0/act2024xys/get_desire_info", "act", base_url=base_url)
         if isinstance(payload, str):
             payload = {"id": payload}
         return self.request(url=api, params=payload, async_=async_, **request_kwargs)
@@ -7116,6 +7136,7 @@ class P115Client(P115OpenClient):
     def act_xys_home_list(
         self, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -7126,6 +7147,7 @@ class P115Client(P115OpenClient):
     def act_xys_home_list(
         self, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -7135,6 +7157,7 @@ class P115Client(P115OpenClient):
     def act_xys_home_list(
         self, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False, True] = False, 
@@ -7144,7 +7167,7 @@ class P115Client(P115OpenClient):
 
         GET https://act.115.com/api/1.0/web/1.0/act2024xys/home_list
         """
-        api = complete_api("/api/1.0/web/1.0/act2024xys/home_list", "act", base_url=base_url)
+        api = complete_api(f"/api/1.0/{app}/1.0/act2024xys/home_list", "act", base_url=base_url)
         return self.request(url=api, async_=async_, **request_kwargs)
 
     @overload
@@ -7152,6 +7175,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: int | str | dict = 0, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -7163,6 +7187,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: int | str | dict = 0, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -7173,6 +7198,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: int | str | dict = 0, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False, True] = False, 
@@ -7193,7 +7219,7 @@ class P115Client(P115OpenClient):
             - page: int = 1   💡 第几页
             - limit: int = 10 💡 分页大小
         """
-        api = complete_api("/api/1.0/web/1.0/act2024xys/my_aid_desire", "act", base_url=base_url)
+        api = complete_api(f"/api/1.0/{app}/1.0/act2024xys/my_aid_desire", "act", base_url=base_url)
         if isinstance(payload, (int, str)):
             payload = {"start": 0, "page": 1, "limit": 10, "type": payload}
         else:
@@ -7205,6 +7231,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: int | str | dict = 0, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -7216,6 +7243,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: int | str | dict = 0, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -7226,6 +7254,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: int | str | dict = 0, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False, True] = False, 
@@ -7246,7 +7275,7 @@ class P115Client(P115OpenClient):
             - page: int = 1   💡 第几页
             - limit: int = 10 💡 分页大小
         """
-        api = complete_api("/api/1.0/web/1.0/act2024xys/my_desire", "act", base_url=base_url)
+        api = complete_api(f"/api/1.0/{app}/1.0/act2024xys/my_desire", "act", base_url=base_url)
         if isinstance(payload, (int, str)):
             payload = {"start": 0, "page": 1, "limit": 10, "type": payload}
         else:
@@ -7258,6 +7287,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -7269,6 +7299,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -7279,6 +7310,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False, True] = False, 
@@ -7293,7 +7325,7 @@ class P115Client(P115OpenClient):
             - rewardSpace: int = 5 💡 奖励容量，单位是 GB
             - images: int | str = <default> 💡 图片文件在你的网盘的 id，多个用逗号 "," 隔开
         """
-        api = complete_api("/api/1.0/web/1.0/act2024xys/wish", "act", base_url=base_url)
+        api = complete_api(f"/api/1.0/{app}/1.0/act2024xys/wish", "act", base_url=base_url)
         if isinstance(payload, str):
             payload = {"rewardSpace": 5, "content": payload}
         else:
@@ -7305,6 +7337,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -7316,6 +7349,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -7326,6 +7360,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False, True] = False, 
@@ -7338,7 +7373,7 @@ class P115Client(P115OpenClient):
         :payload:
             - ids: str 💡 许愿的 id，多个用逗号 "," 隔开
         """
-        api = complete_api("/api/1.0/web/1.0/act2024xys/del_wish", "act", base_url=base_url)
+        api = complete_api(f"/api/1.0/{app}/1.0/act2024xys/del_wish", "act", base_url=base_url)
         if isinstance(payload, str):
             payload = {"ids": payload}
         return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
@@ -7954,7 +7989,6 @@ class P115Client(P115OpenClient):
                 payload = {"pick_code": payload}
             else:
                 payload = {"pick_code": payload["pickcode"]}
-        request_headers = request_kwargs.get("headers")
         headers = request_kwargs.get("headers")
         if headers:
             if isinstance(headers, Mapping):
@@ -8215,7 +8249,6 @@ class P115Client(P115OpenClient):
             - full_name: str
         """
         api = complete_proapi("/2.0/ufile/extract_down_file", base_url, app)
-        request_headers = request_kwargs.get("headers")
         headers = request_kwargs.get("headers")
         if headers:
             if isinstance(headers, Mapping):
@@ -8271,7 +8304,6 @@ class P115Client(P115OpenClient):
             - full_name: str
         """
         api = complete_webapi("/files/extract_down_file", base_url=base_url)
-        request_headers = request_kwargs.get("headers")
         headers = request_kwargs.get("headers")
         if headers:
             if isinstance(headers, Mapping):
@@ -10515,7 +10547,7 @@ class P115Client(P115OpenClient):
             - fields: str = <default>
             - for: str = <default> 💡 文件格式，例如 "doc"
             - format: str = "json" 💡 返回格式，默认即可
-            - hide_data: str = <default>
+            - hide_data: str = <default> 💡 是否返回文件数据
             - is_q: 0 | 1 = <default>
             - is_share: 0 | 1 = <default>
             - min_size: int = 0 💡 最小的文件大小
@@ -10645,7 +10677,7 @@ class P115Client(P115OpenClient):
             - fields: str = <default>
             - for: str = <default> 💡 文件格式，例如 "doc"
             - format: str = "json" 💡 返回格式，默认即可
-            - hide_data: str = <default>
+            - hide_data: str = <default> 💡 是否返回文件数据
             - is_q: 0 | 1 = <default>
             - is_share: 0 | 1 = <default>
             - min_size: int = 0 💡 最小的文件大小
@@ -10774,7 +10806,7 @@ class P115Client(P115OpenClient):
             - fc_mix: 0 | 1 = <default> 💡 是否目录和文件混合，如果为 0 则目录在前（目录置顶）
             - fields: str = <default>
             - format: str = "json" 💡 返回格式，默认即可
-            - hide_data: str = <default>
+            - hide_data: str = <default> 💡 是否返回文件数据
             - is_asc: 0 | 1 = <default>
             - is_q: 0 | 1 = <default>
             - is_share: 0 | 1 = <default>
@@ -11729,7 +11761,7 @@ class P115Client(P115OpenClient):
         :payload:
             - offset: int = 0
             - limit: int = 1150
-            - played_end: 0 | 1 = <default>
+            - played_end: 0 | 1 = <default> 💡 是否已经播放完
             - type: int = <default> 💡 类型（？？表示还未搞清楚），多个用逗号 "," 隔开
 
               - 全部: 0
@@ -14604,8 +14636,8 @@ class P115Client(P115OpenClient):
             - search_value: str = "." 💡 搜索文本，可以是 sha1
             - show_dir: 0 | 1 = 1 💡 是否显示目录
             - source: str = <default>
-            - star: 0 | 1 = <default>
-            - suffix: str = <default>
+            - star: 0 | 1 = <default> 💡 是否星标文件
+            - suffix: str = <default> 💡 后缀名（优先级高于 `type`）
             - type: int = <default> 💡 文件类型
 
               - 0: 全部（仅当前目录）
@@ -14701,8 +14733,8 @@ class P115Client(P115OpenClient):
             - search_value: str = "." 💡 搜索文本，可以是 sha1
             - show_dir: 0 | 1 = 1 💡 是否显示目录
             - source: str = <default>
-            - star: 0 | 1 = <default>
-            - suffix: str = <default>
+            - star: 0 | 1 = <default> 💡 是否星标文件
+            - suffix: str = <default> 💡 后缀名（优先级高于 `type`）
             - type: int = <default> 💡 文件类型
 
               - 0: 全部（仅当前目录）
@@ -21144,6 +21176,9 @@ class P115Client(P115OpenClient):
             )
         return run_gen_step(gen_step, may_call=False, async_=async_)
 
+    # TODO: 分块上传时，允许一定次数的重试
+    # TODO: 不妨单独为分块上传做一个封装
+    # TODO: 减少参数，简化使用方法
     @overload # type: ignore
     def upload_file(
         self, 

{p115client-0.0.5.11.8.2 → p115client-0.0.5.11.9.1}/p115client/tool/__init__.py

@@ -4,6 +4,7 @@
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
 
 from .attr import *
+from .auth import *
 from .download import *
 from .edit import *
 from .export_dir import *

p115client-0.0.5.11.9.1/p115client/tool/auth.py

@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+# encoding: utf-8
+
+__author__ = "ChenyangGao <https://chenyanggao.github.io>"
+__all__ = ["deauth_open"]
+__doc__ = "这个模块提供了一些和账号状况有关的函数"
+
+from collections.abc import Callable, Coroutine
+from typing import overload, Any, Literal
+
+from iterutils import run_gen_step
+from p115client import check_response, P115Client
+
+
+@overload
+def deauth_open(
+    client: str | P115Client, 
+    predicate: None | Callable = None, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> None:
+    ...
+@overload
+def deauth_open(
+    client: str | P115Client, 
+    predicate: None | Callable = None, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> Coroutine[Any, Any, None]:
+    ...
+def deauth_open(
+    client: str | P115Client, 
+    predicate: None | Callable = None, 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> None | Coroutine[Any, Any, None]:
+    """批量解绑开放应用
+
+    :param client: 115 客户端或 cookies
+    :param predicate: 筛选条件
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+    """
+    if isinstance(client, str):
+        client = P115Client(client, check_for_relogin=True)
+    def gen_step():
+        resp = yield client.login_open_auth_list(
+            async_=async_, 
+            **request_kwargs, 
+        )
+        check_response(resp)
+        for info in filter(predicate, resp["data"]):
+            yield client.login_open_deauth(
+                info["auth_id"], 
+                async_=async_, 
+                **request_kwargs, 
+            )
+    return run_gen_step(gen_step, async_=async_)
+