p115client 0.0.5.11.8.2__tar.gz → 0.0.5.11.9__tar.gz

{p115client-0.0.5.11.8.2 → p115client-0.0.5.11.9}/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
 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}/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}/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: 全部（仅当前目录）
@@ -6173,6 +6172,8 @@ class P115Client(P115OpenClient):
 
             但一个设备的新登录者，并不总是意味着把较早的登录者下线，一般需要触发某个检查机制后，才会把同一设备下除最近一次登录外的所有 cookies 失效
 
+            所以你可以用一个设备的 cookies 专门用于扫码登录，获取另一个设备的 cookies 执行网盘操作，第 2 个 cookies 失效了，则用第 1 个 cookies 扫码，如此可避免单个 cookies 失效后，不能自动获取新的
+
         :param app: 要登录的 app，如果为 None，则用当前登录设备，如果无当前登录设备，则报错
         :param replace: 替换某个 client 对象的 cookie
 
@@ -6860,6 +6861,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -6871,6 +6873,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -6881,6 +6884,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False, True] = False, 
@@ -6895,7 +6899,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 +6907,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -6914,6 +6919,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -6924,6 +6930,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False, True] = False, 
@@ -6939,7 +6946,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 +6954,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 +6966,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: int | str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -6968,6 +6977,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 +6990,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 +7000,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -7001,6 +7012,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -7011,6 +7023,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 +7040,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 +7051,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 +7062,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 +7072,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 +7082,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 +7090,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -7085,6 +7102,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -7095,6 +7113,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 +7126,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 +7135,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 +7146,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 +7156,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 +7166,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 +7174,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 +7186,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 +7197,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 +7218,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 +7230,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 +7242,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 +7253,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 +7274,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 +7286,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -7269,6 +7298,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -7279,6 +7309,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 +7324,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 +7336,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[False] = False, 
@@ -7316,6 +7348,7 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
+        app: str = "web", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
         async_: Literal[True], 
@@ -7326,6 +7359,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 +7372,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 +7988,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 +8248,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 +8303,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 +10546,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 +10676,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 +10805,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 +11760,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 +14635,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 +14732,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 +21175,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}/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/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_)
+

{p115client-0.0.5.11.8.2 → p115client-0.0.5.11.9}/p115client/tool/upload.py

@@ -2,20 +2,47 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__all__ = ["iter_115_to_115", "iter_115_to_115_resume"]
+__all__ = [
+    "iter_115_to_115", "iter_115_to_115_resume", "multipart_upload_init", 
+    "multipart_upload_url", "multipart_upload_complete", 
+]
 __doc__ = "这个模块提供了一些和上传有关的函数"
 
-from collections.abc import AsyncIterator, Iterator
+import errno
+
+from asyncio import to_thread
+from collections.abc import AsyncIterator, Callable, Coroutine, Iterator
 from itertools import dropwhile
-from typing import overload, Any, Literal
+from os import fsdecode, stat, PathLike
+from typing import cast, overload, Any, Literal
+from urllib.parse import unquote, urlsplit
+from uuid import uuid4
 
 from asynctools import to_list
 from concurrenttools import threadpool_map, taskgroup_map, Return
-from iterutils import as_gen_step, run_gen_step_iter, with_iter_next, YieldFrom
+from hashtools import file_digest, file_digest_async
+from http_request import SupportsGeturl
+from http_response import get_total_length
+from iterutils import (
+    as_gen_step, collect, run_gen_step, run_gen_step_iter, 
+    with_iter_next, YieldFrom, 
+)
+from orjson import loads
 from p115client import check_response, normalize_attr_simple, P115Client
+from p115client.exception import OperationalError
+from p115client._upload import (
+    oss_multipart_part_iter, oss_multipart_upload_init, 
+    oss_multipart_upload_url, oss_multipart_upload_complete, 
+)
+from urlopen import urlopen
+from yarl import URL
 
 from .download import iter_download_files
 from .iterdir import iterdir, iter_files_with_path, unescape_115_charref
+from .util import determine_part_size
+
+
+ALIYUN_DOMAIN = "oss-cn-shenzhen.aliyuncs.com"
 
 
 @overload
@@ -431,3 +458,378 @@ def iter_115_to_115_resume(
             ))
     return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 
+
+@overload
+def multipart_upload_init(
+    client: str | P115Client, 
+    path: str | PathLike | URL | SupportsGeturl, 
+    pid: int = 0, 
+    filename: str = "", 
+    filesize: int = -1, 
+    filesha1: str = "", 
+    partsize: int = -1, 
+    upload_data: None | dict = None, 
+    domain: str = ALIYUN_DOMAIN, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> dict:
+    ...
+@overload
+def multipart_upload_init(
+    client: str | P115Client, 
+    path: str | PathLike | URL | SupportsGeturl, 
+    pid: int = 0, 
+    filename: str = "", 
+    filesize: int = -1, 
+    filesha1: str = "", 
+    partsize: int = -1, 
+    upload_data: None | dict = None, 
+    domain: str = ALIYUN_DOMAIN, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> Coroutine[Any, Any, dict]:
+    ...
+def multipart_upload_init(
+    client: str | P115Client, 
+    path: str | PathLike | URL | SupportsGeturl, 
+    pid: int = 0, 
+    filename: str = "", 
+    filesize: int = -1, 
+    filesha1: str = "", 
+    partsize: int = -1, 
+    upload_data: None | dict = None, 
+    domain: str = ALIYUN_DOMAIN, 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> dict | Coroutine[Any, Any, dict]:
+    """准备分块上传，获取必要信息
+
+    :param client: 115 客户端或 cookies
+    :param path: 路径 或 链接（仅支持 GET 请求，http(s)协议）
+    :param pid: 上传文件到此目录的 id
+    :param filename: 文件名，若为空则自动确定
+    :param filesize: 文件大小，若为负数则自动计算
+    :param filesha1: 文件的 sha1 摘要，若为空则自动计算
+    :param partsize: 分块大小，若不为正数则自动确定
+    :param upload_data: 上传相关信息，可用于以后的断点续传
+    :param domain: 上传到指定的阿里云集群的网址（netloc）
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 如果秒传成功，则返回响应信息（有 "status" 字段），否则返回上传配置信息（可用于断点续传）
+    """
+    if isinstance(client, str):
+        client = P115Client(client, check_for_relogin=True)
+    def gen_step():
+        nonlocal upload_data, path, filename, filesha1, filesize, partsize
+        if upload_data is None:
+            upload_data = {}
+            if isinstance(path, str):
+                is_path = not path.startswith(("http://", "https://"))
+            elif isinstance(path, URL):
+                path = str(path)
+                is_path = False
+            elif isinstance(path, SupportsGeturl):
+                path = path.geturl()
+                is_path = False
+            else:
+                path = fsdecode(path)
+                is_path = True
+            path = cast(str, path)
+            if not filename:
+                if is_path:
+                    from os.path import basename
+                    filename = basename(path)
+                else:
+                    from posixpath import basename
+                    filename = basename(unquote(urlsplit(path).path))
+                if not filename:
+                    filename = str(uuid4())
+            file: Any
+            if not filesha1:
+                if filesize == 0:
+                    filesha1 = "DA39A3EE5E6B4B0D3255BFEF95601890AFD80709"
+                else:
+                    if is_path:
+                        if async_:
+                            from aiofile import async_open
+                            async def request():
+                                async with async_open(path, "rb") as file:
+                                    return await file_digest_async(file, "sha1") # type: ignore
+                            filesize, filesha1_obj = yield request
+                        else:
+                            with open(path, "rb") as file:
+                                filesize, filesha1_obj = file_digest(file, "sha1")
+                    else:
+                        if async_:
+                            from httpfile import AsyncHttpxFileReader
+                            async def request():
+                                file = await AsyncHttpxFileReader.new(path, headers={"user-agent": ""})
+                                async with file:
+                                    return await file_digest_async(file, "sha1")
+                            filesize, filesha1_obj = yield request
+                        else:
+                            from httpfile import HTTPFileReader
+                            with HTTPFileReader(path, headers={"user-agent": ""}) as file:
+                                filesize, filesha1_obj = file_digest(file, "sha1")
+                filesha1 = filesha1_obj.hexdigest()
+            if filesize < 0:
+                if is_path:
+                    filesize = stat(path).st_size
+                else:
+                    if async_:
+                        file = yield to_thread(urlopen, path)
+                    else:
+                        file = urlopen(path)
+                    try:
+                        filesize = get_total_length(file) or 0
+                    finally:
+                        file.close()
+            if partsize <= 0:
+                partsize = determine_part_size(filesize)
+            read_range_bytes_or_hash: Callable
+            if async_:
+                async def read_range_bytes_or_hash(sign_check: str, /) -> bytes:
+                    file: Any
+                    if is_path:
+                        from aiofile import async_open
+                        start, end = map(int, sign_check.split("-"))
+                        async with async_open(path, "rb") as file:
+                            file.seek(start)
+                            return await file.read(end - start + 1)
+                    else:
+                        file = await to_thread(
+                            urlopen, 
+                            path, 
+                            headers={"Range": "bytes="+sign_check}, 
+                        )
+                        with file:
+                            return await to_thread(file.read)
+            else:
+                def read_range_bytes_or_hash(sign_check: str, /) -> bytes:
+                    if is_path:
+                        start, end = map(int, sign_check.split("-"))
+                        with open(path, "rb") as file:
+                            file.seek(start)
+                            return file.read(end - start + 1)
+                    else:
+                        with urlopen(path, headers={"Range": "bytes="+sign_check}) as file:
+                            return file.read()
+            resp = yield client.upload_file_init(
+                filename=filename, 
+                filesize=filesize, 
+                filesha1=filesha1, 
+                read_range_bytes_or_hash=read_range_bytes_or_hash, # type: ignore
+                pid=pid, 
+                async_=async_, # type: ignore
+                **request_kwargs, 
+            )
+            status = resp["status"]
+            statuscode = resp.get("statuscode", 0)
+            if status == 2 and statuscode == 0:
+                return resp
+            elif status == 1 and statuscode == 0:
+                bucket, object, callback = resp["bucket"], resp["object"], resp["callback"]
+            else:
+                raise OperationalError(errno.EINVAL, resp)
+            upload_data["bucket"] = bucket
+            upload_data["object"] = object
+            upload_data["callback"] = callback
+            upload_data["filename"] = filename
+            upload_data["filesha1"] = filesha1
+            upload_data["filesize"] = filesize
+            upload_data["partsize"] = partsize
+            upload_data["part_count"] = partsize and -(-filesize // partsize)
+            upload_data["pid"] = pid
+        else:
+            bucket = upload_data["bucket"]
+            object = upload_data["object"]
+            callback_var = loads(upload_data["callback"]["callback_var"])
+            resp = yield client.upload_resume(
+                {
+                    "fileid": object, 
+                    "file_size": upload_data["filesize"], 
+                    "target": callback_var["x:target"], 
+                    "pick_code": callback_var["x:pick_code"], 
+                }, 
+                async_=async_, 
+                **request_kwargs, 
+            )
+            check_response(resp)
+        url = f"http://{bucket}.{domain}/{object}"
+        token = client.upload_token
+        if upload_id := upload_data.get("upload_id"):
+            parts = yield collect(oss_multipart_part_iter(
+                client.request, 
+                url, 
+                bucket=bucket, 
+                object=object, 
+                upload_id=upload_id, 
+                token=token, 
+                async_=async_, 
+                **request_kwargs, 
+            ))
+            if parts:
+                upload_data["part_number_next"] = len(parts) + (int(parts[-1]["Size"]) == upload_data["partsize"])
+            else:
+                upload_data["part_number_next"] = 1
+        else:
+            upload_data["upload_id"] = yield oss_multipart_upload_init(
+                client.request, 
+                url, 
+                bucket=bucket, 
+                object=object, 
+                token=token, 
+                async_=async_, 
+                **request_kwargs, 
+            )
+            upload_data["part_number_next"] = 1
+        return upload_data
+    return run_gen_step(gen_step, async_=async_)
+
+
+def multipart_upload_url(
+    client: str | P115Client | dict, 
+    upload_data: dict, 
+    part_number: int = 1, 
+    domain: str = ALIYUN_DOMAIN, 
+) -> tuple[str, dict]:
+    """用来获取 上传链接 和 请求头，然后文件需要你自己上传
+
+    :param client: 115 客户端或 cookies，或者是 token（令牌）
+    :param upload_data: 上传相关信息，可用于以后的断点续传
+    :param part_number: 需要上传的分块编号，须从 1 开始递增
+    :param domain: 上传到指定的阿里云集群的网址（netloc）
+
+    :return: 上传链接 和 请求头 的 2 元组
+    """
+    if isinstance(client, dict):
+        token = client
+    else:
+        if isinstance(client, str):
+            client = P115Client(client, check_for_relogin=True)
+        token = client.upload_token
+    return oss_multipart_upload_url(
+        bucket=upload_data["bucket"], 
+        object=upload_data["object"], 
+        upload_id=upload_data["upload_id"], 
+        part_number=part_number, 
+        token=token, 
+        domain=domain, 
+    )
+
+
+@overload
+def multipart_upload_complete(
+    client: str | P115Client, 
+    upload_data: dict, 
+    domain: str = ALIYUN_DOMAIN, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> dict:
+    ...
+@overload
+def multipart_upload_complete(
+    client: str | P115Client, 
+    upload_data: dict, 
+    domain: str = ALIYUN_DOMAIN, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> Coroutine[Any, Any, dict]:
+    ...
+def multipart_upload_complete(
+    client: str | P115Client, 
+    upload_data: dict, 
+    domain: str = ALIYUN_DOMAIN, 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> dict | Coroutine[Any, Any, dict]:
+    """完成分块上传
+
+    :param client: 115 客户端或 cookies，或者是 token（令牌）
+    :param upload_data: 上传相关信息，可用于以后的断点续传
+    :param domain: 上传到指定的阿里云集群的网址（netloc）
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 接口响应值
+
+    :example:
+        你可以构建自己的分块上传逻辑，下面是一个例子
+
+        .. code:: python
+            from pathlib import Path
+            from p115client import *
+            from p115client.tool import *
+
+            client = P115Client(Path("~/115-cookies.txt").expanduser())
+            #client.login_another_open(100195123, replace=True)
+
+            # TODO: 这里填一个文件的路径
+            path = "test.txt"
+            upload_data = multipart_upload_init(
+                client, 
+                path, 
+                pid = 0, 
+                filename = "", 
+                upload_data = None, 
+            )
+            if "status" in upload_data:
+                resp = upload_data
+            else:
+                partsize = upload_data["partsize"]
+                part_number_next = upload_data["part_number_next"]
+                with open(path, "rb") as file:
+                    if part_number_next > 1:
+                        file.seek(partsize * (part_number_next - 1))
+                    for part_number in range(part_number_next, upload_data["part_count"] + 1):
+                        url, headers = multipart_upload_url(client, upload_data, part_number)
+                        ## TODO: 你可以自己改写上传的逻辑
+                        ## NOTE: 使用 urllib3
+                        # from urllib3 import request
+                        # request("PUT", url, body=file.read(partsize), headers=headers)
+                        ## NOTE: 使用 requests
+                        # from requests import request
+                        # request("PUT", url, data=file.read(partsize), headers=headers)
+                        client.request(url=url, method="PUT", data=file.read(partsize), headers=headers, parse=False
+                resp = multipart_upload_complete(client, upload_data)
+            print(resp)
+    """
+    bucket = upload_data["bucket"]
+    object = upload_data["object"]
+    upload_id = upload_data["upload_id"]
+    url = f"http://{bucket}.{domain}/{object}"
+    if isinstance(client, str):
+        client = P115Client(client, check_for_relogin=True)
+    token = client.upload_token
+    def gen_step():
+        parts = yield collect(oss_multipart_part_iter(
+            client.request, 
+            url, 
+            bucket=bucket, 
+            object=object, 
+            upload_id=upload_id, 
+            token=token, 
+            async_=async_, 
+            **request_kwargs, 
+        ))
+        return oss_multipart_upload_complete(
+            client.request, 
+            url, 
+            bucket=bucket, 
+            object=object, 
+            upload_id=upload_id, 
+            token=token, 
+            callback=upload_data["callback"], 
+            parts=parts, 
+            async_=async_, 
+            **request_kwargs, 
+        )
+    return run_gen_step(gen_step, async_=async_)
+

{p115client-0.0.5.11.8.2 → p115client-0.0.5.11.9}/p115client/tool/util.py

@@ -4,7 +4,7 @@
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
 __all__ = [
     "get_status_code", "is_timeouterror", "posix_escape_name", "reduce_image_url_layers", 
-    "share_extract_payload", "unescape_115_charref", 
+    "share_extract_payload", "unescape_115_charref", "determine_part_size", 
 ]
 __doc__ = "这个模块提供了一些工具函数"
 
@@ -105,3 +105,25 @@ def unescape_115_charref(s: str, /) -> str:
     """
     return CRE_115_CHARREF_sub(lambda a: chr(int(a[1])), s)
 
+
+def determine_part_size(
+    size: int, 
+    min_part_size: int = 1024 * 1024 * 10, 
+    max_part_count: int = 10 ** 4, 
+) -> int:
+    """确定分片上传（multipart upload）时的分片大小
+
+    :param size: 数据大小
+    :param min_part_size:  用户期望的分片大小
+    :param max_part_count: 最大的分片个数
+
+    :return: 分片大小
+    """
+    if size <= min_part_size:
+        return size
+    n = -(-size // max_part_count)
+    part_size = min_part_size
+    while part_size < n:
+        part_size <<= 1
+    return part_size
+

{p115client-0.0.5.11.8.2 → p115client-0.0.5.11.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p115client"
-version = "0.0.5.11.8.2"
+version = "0.0.5.11.9"
 description = "Python 115 webdisk client."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"