p123client 0.0.6.4__py3-none-any.whl → 0.0.6.9__py3-none-any.whl

p123client/client.py

@@ -40,6 +40,9 @@ from .exception import P123OSError, P123BrokenUpload
 
 
 # 默认使用的域名
+# "https://www.123pan.com"
+# "https://www.123pan.com/a"
+# "https://www.123pan.com/b"
 DEFAULT_BASE_URL = "https://www.123pan.com/b"
 DEFAULT_LOGIN_BASE_URL = "https://login.123pan.com"
 DEFAULT_OPEN_BASE_URL = "https://open-api.123pan.com"
@@ -371,7 +374,7 @@ class P123OpenClient:
             check_response(resp)
             self.token = resp["data"]["accessToken"]
             return resp
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     @staticmethod
@@ -1212,6 +1215,8 @@ class P123OpenClient:
         })
         return self.request(api, params=payload, async_=async_, **request_kwargs)
 
+    fs_list_v2 = fs_list
+
     @overload
     def fs_list_v1(
         self, 
@@ -1258,7 +1263,7 @@ class P123OpenClient:
         :payload:
             - limit: int = 100         💡 分页大小，最多 100
             - orderBy: str = "file_id" 💡 排序依据
-            
+
                 - "file_id": 文件 id
                 - "file_name": 文件名
                 - "size":  文件大小
@@ -2857,7 +2862,7 @@ class P123OpenClient:
                     "duplicate": duplicate, 
                     "slice_size": slice_size, 
                 }) from e
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def share_create(
@@ -4213,7 +4218,7 @@ class P123OpenClient:
                     "duplicate": duplicate, 
                     "slice_size": slice_size, 
                 }) from e
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def user_info(
@@ -4285,6 +4290,7 @@ class P123OpenClient:
     fs_detail_open = fs_detail
     fs_info_open = fs_info
     fs_list_open = fs_list
+    fs_list_v2_open = fs_list_v2
     fs_list_v1_open = fs_list_v1
     fs_mkdir_open = fs_mkdir
     fs_move_open = fs_move
@@ -4415,7 +4421,7 @@ class P123Client(P123OpenClient):
             check_response(resp)
             self.token = resp["data"]["token"]
             return resp
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     @staticmethod
@@ -4456,6 +4462,45 @@ class P123Client(P123OpenClient):
             request_kwargs["async_"] = async_
         return request(**request_kwargs)
 
+    @overload
+    @staticmethod
+    def app_server_time(
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        request: None | Callable = None, 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    @staticmethod
+    def app_server_time(
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        request: None | Callable = None, 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    @staticmethod
+    def app_server_time(
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        request: None | Callable = None, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """获取 123 网盘的服务器时间戳
+
+        GET https://www.123pan.com/api/get/server/time
+        """
+        request_kwargs["url"] = complete_url("/api/get/server/time", base_url)
+        request_kwargs.setdefault("parse", default_parse)
+        if request is None:
+            request = get_default_request()
+            request_kwargs["async_"] = async_
+        return request(**request_kwargs)
+
     @overload
     def download_info(
         self, 
@@ -4531,8 +4576,7 @@ class P123Client(P123OpenClient):
                 )
                 resp["payload"] = payload
                 check_response(resp)
-                info_list = resp["data"]["infoList"]
-                if not info_list:
+                if not (info_list := resp["data"]["infoList"]):
                     raise FileNotFoundError(ENOENT, resp)
                 payload = cast(dict, info_list[0])
                 if payload["Type"]:
@@ -4549,7 +4593,7 @@ class P123Client(P123OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def download_info_batch(
@@ -4641,12 +4685,22 @@ class P123Client(P123OpenClient):
     ) -> str | Coroutine[Any, Any, str]:
         """获取下载链接
 
+        .. note::
+            `payload` 支持多种格式的输入，按下面的规则按顺序进行判断：
+
+            1. 如果是 `int` 或 `str`，则视为文件 id，必须在你的网盘中存在此文件
+            2. 如果是 `dict`（不区分大小写），有 "S3KeyFlag", "Etag" 和 "Size" 的值，则直接获取链接，文件不必在你网盘中
+            3. 如果是 `dict`（不区分大小写），有 "Etag" 和 "Size" 的值，则会先秒传（临时文件路径为 /.tempfile）再获取链接，文件不必在你网盘中
+            4. 如果是 `dict`（不区分大小写），有 "FileID"，则会先获取信息，再获取链接，必须在你的网盘中存在此文件
+            5. 否则会报错 ValueError
+
         :params payload: 文件 id 或者文件信息，文件信息必须包含的信息如下：
 
-            - S3KeyFlag: str            💡 存储桶名
-            - Etag: str                 💡 文件的 MD5 散列值
-            - Size: int                 💡 文件大小
-            - FileName: str = <default> 💡 默认用 Etag（即 MD5）作为文件名
+            - FileID: int | str 💡 下载链接
+            - S3KeyFlag: str    💡 s3 存储名
+            - Etag: str         💡 文件的 MD5 散列值
+            - Size: int         💡 文件大小
+            - FileName: str     💡 默认用 Etag（即 MD5）作为文件名，可以省略
 
         :params async_: 是否异步
         :params request_kwargs: 其它请求参数
@@ -4654,7 +4708,37 @@ class P123Client(P123OpenClient):
         :return: 下载链接
         """
         def gen_step():
+            nonlocal payload
             if isinstance(payload, dict):
+                payload = dict_to_lower(payload)
+                if not ("size" in payload and "etag" in payload):
+                    if fileid := payload.get("fileid"):
+                        resp = yield self.fs_info(fileid, async_=async_, **request_kwargs)
+                        check_response(resp)
+                        if not (info_list := resp["data"]["infoList"]):
+                            raise P123OSError(ENOENT, resp)
+                        info = info_list[0]
+                        if info["Type"]:
+                            raise IsADirectoryError(EISDIR, resp)
+                        payload = dict_to_lower_merge(payload, info)
+                    else:
+                        raise ValueError("`Size` and `Etag` must be provided")
+                if "s3keyflag" not in payload:
+                    resp = yield self.upload_request(
+                        {
+                            "filename": ".tempfile", 
+                            "duplicate": 2, 
+                            "etag": payload["etag"], 
+                            "size": payload["size"], 
+                            "type": 0, 
+                        }, 
+                        async_=async_, 
+                        **request_kwargs, 
+                    )
+                    check_response(resp)
+                    if not resp["data"]["Reuse"]:
+                        raise P123OSError(ENOENT, resp)
+                    payload["s3keyflag"] = resp["data"]["Info"]["S3KeyFlag"]
                 resp = yield self.download_info(
                     payload, 
                     async_=async_, 
@@ -4670,7 +4754,7 @@ class P123Client(P123OpenClient):
                 )
                 check_response(resp)
                 return resp["data"]["downloadUrl"]
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def fs_copy(
@@ -4746,7 +4830,7 @@ class P123Client(P123OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def fs_detail(
@@ -5013,7 +5097,7 @@ class P123Client(P123OpenClient):
             - next: int = 0    💡 下一批拉取开始的 id
             - orderBy: str = "file_id" 💡 排序依据
 
-                - "file_id": 文件 id
+                - "file_id": 文件 id，也可以写作 "fileId"
                 - "file_name": 文件名
                 - "size":  文件大小
                 - "create_at": 创建时间
@@ -5109,7 +5193,7 @@ class P123Client(P123OpenClient):
             - next: int = 0    💡 下一批拉取开始的 id
             - orderBy: str = "file_id" 💡 排序依据
 
-                - "file_id": 文件 id
+                - "file_id": 文件 id，也可以写作 "fileId"
                 - "file_name": 文件名
                 - "size":  文件大小
                 - "create_at": 创建时间
@@ -5118,7 +5202,7 @@ class P123Client(P123OpenClient):
                 - ...
 
             - orderDirection: "asc" | "desc" = "asc" 💡 排序顺序
-            - Page: int = <default> 💡 第几页，从 1 开始，可以是 0
+            - Page: int = 1 💡 第几页，从 1 开始
             - parentFileId: int | str = 0 💡 父目录 id
             - trashed: "false" | "true" = <default> 💡 是否查看回收站的文件
             - inDirectSpace: "false" | "true" = "false"
@@ -5129,8 +5213,13 @@ class P123Client(P123OpenClient):
                 - "syncFileList": 同步空间
 
             - operateType: int | str = <default> 💡 操作类型，如果在同步空间，则需要指定为 "SyncSpacePage"
+
+                .. note::
+                    这个值似乎不影响结果，所以可以忽略。我在浏览器中，看到罗列根目录为 1，搜索（指定 `SearchData`）为 2，同步空间的根目录为 3，罗列其它目录大多为 4，偶尔为 8，也可能是其它值
+
             - SearchData: str = <default> 💡 搜索关键字（将无视 `parentFileId` 参数）
-            - OnlyLookAbnormalFile: int = <default>
+            - OnlyLookAbnormalFile: int = 0 💡 大概可传入 0 或 1
+            - RequestSource: int = <default> 💡 浏览器中，在同步空间中为 1
         """
         if isinstance(payload, (int, str)):
             payload = {"parentFileId": payload}
@@ -5143,6 +5232,8 @@ class P123Client(P123OpenClient):
             "parentFileId": 0, 
             "inDirectSpace": "false", 
             "event": event, 
+            "OnlyLookAbnormalFile": 0, 
+            "Page": 1, 
         })
         if not payload.get("trashed"):
             match payload["event"]:
@@ -5280,6 +5371,50 @@ class P123Client(P123OpenClient):
             **request_kwargs, 
         )
 
+    @overload
+    def fs_fresh(
+        self, 
+        payload: dict = {}, 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def fs_fresh(
+        self, 
+        payload: dict = {}, 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def fs_fresh(
+        self, 
+        payload: dict = {}, 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """刷新列表和直链缓存
+
+        POST https://www.123pan.com/api/restful/goapi/v1/cdnLink/cache/refresh
+        """
+        return self.request(
+            "restful/goapi/v1/cdnLink/cache/refresh", 
+            "POST", 
+            json=payload, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
+
     @overload # type: ignore
     def fs_rename(
         self, 
@@ -5336,6 +5471,56 @@ class P123Client(P123OpenClient):
             **request_kwargs, 
         )
 
+    @overload
+    def fs_sync_log(
+        self, 
+        payload: dict | int = 1, 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def fs_sync_log(
+        self, 
+        payload: dict | int = 1, 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def fs_sync_log(
+        self, 
+        payload: dict | int = 1, 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """获取同步空间的操作记录
+
+        GET https://www.123pan.com/api/restful/goapi/v1/sync-disk/file/log
+
+        :payload:
+            - page: int = 1               💡 第几页
+            - pageSize: int = 100         💡 每页大小
+            - searchData: str = <default> 💡 搜索关键字
+        """
+        if not isinstance(payload, dict):
+            payload = {"page": payload, "pageSize": 100}
+        return self.request(
+            "restful/goapi/v1/sync-disk/file/log", 
+            params=payload, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
+
     @overload # type: ignore
     def fs_trash(
         self, 
@@ -5391,6 +5576,8 @@ class P123Client(P123OpenClient):
                 - "recycleRestore": 移出回收站
 
             - operation: bool = <default>
+            - operatePlace: int = <default>
+            - RequestSource: int = <default>
         """
         if isinstance(payload, (int, str)):
             payload = {"fileTrashInfoList": [{"FileId": payload}]}
@@ -7004,8 +7191,10 @@ class P123Client(P123OpenClient):
                 if async_:
                     async def request():
                         chunks = bio_chunk_async_iter(file, chunksize=slice_size) # type: ignore
-                        upload_data["partNumberStart"] = 1
+                        slice_no = 1
                         async for chunk in chunks:
+                            upload_data["partNumberStart"] = slice_no
+                            upload_data["partNumberEnd"]   = slice_no + 1
                             resp = await self.upload_prepare(
                                 upload_data, 
                                 base_url=base_url, 
@@ -7014,17 +7203,18 @@ class P123Client(P123OpenClient):
                             )
                             check_response(resp)
                             await self.request(
-                                resp["data"]["presignedUrls"]["1"], 
+                                resp["data"]["presignedUrls"][str(slice_no)], 
                                 data=chunk, 
                                 async_=True, 
                                 **upload_request_kwargs, 
                             )
-                            upload_data["partNumberStart"] += 1
+                            slice_no += 1
                     yield request()
                 else:
                     chunks = bio_chunk_iter(file, chunksize=slice_size) # type: ignore
                     for slice_no, chunk in enumerate(chunks, 1):
                         upload_data["partNumberStart"] = slice_no
+                        upload_data["partNumberEnd"]   = slice_no + 1
                         resp = self.upload_prepare(
                             upload_data, 
                             base_url=base_url, 
@@ -7032,7 +7222,7 @@ class P123Client(P123OpenClient):
                         )
                         check_response(resp)
                         self.request(
-                            resp["data"]["presignedUrls"]["1"], 
+                            resp["data"]["presignedUrls"][str(slice_no)], 
                             data=chunk, 
                             **upload_request_kwargs, 
                         )
@@ -7057,7 +7247,7 @@ class P123Client(P123OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def upload_file_fast(
@@ -7218,7 +7408,56 @@ class P123Client(P123OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
+
+    @overload
+    def user_device_list(
+        self, 
+        payload: dict | str = "deviceManagement", 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def user_device_list(
+        self, 
+        payload: dict | str = "deviceManagement", 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def user_device_list(
+        self, 
+        payload: dict | str = "deviceManagement", 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """用户设备列表
+
+        GET https://www.123pan.com/api/user/device_list
+
+        :payload:
+            - event: str = "deviceManagement" 💡 事件类型，"deviceManagement" 为管理登录设备列表
+            - operateType: int = <default>
+        """
+        if not isinstance(payload, dict):
+            payload = {"event": payload}
+        return self.request(
+            "user/device_list", 
+            params=payload, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
     @overload
     def user_info(
@@ -7312,4 +7551,57 @@ class P123Client(P123OpenClient):
             request_kwargs["async_"] = async_
         return request(url=api, method="POST", json=payload, **request_kwargs)
 
-# TODO: 添加扫码登录接口，以及通过扫码登录的方法
+    @overload
+    def user_use_history(
+        self, 
+        payload: dict | str = "loginRecord", 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def user_use_history(
+        self, 
+        payload: dict | str = "loginRecord", 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def user_use_history(
+        self, 
+        payload: dict | str = "loginRecord", 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """用户使用记录
+
+        GET https://www.123pan.com/api/user/use_history
+
+        :payload:
+            - event: str = "loginRecord" 💡 事件类型，"loginRecord" 为登录记录
+        """
+        if not isinstance(payload, dict):
+            payload = {"event": payload}
+        return self.request(
+            "user/use_history", 
+            params=payload, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
+
+# TODO: 添加扫码登录接口，以及通过扫码登录的方法，特别是用已登录的设备扫描一个新的 token 出来
+# TODO: 添加 同步空间 和 直链空间 的操作接口
+# TODO: 添加 图床 的操作接口
+# TODO: 添加 视频转码 的操作接口
+# TODO: 对于某些工具的接口封装，例如 重复文件清理
+# TODO: 开放接口有更新了，从此开始 https://123yunpan.yuque.com/org-wiki-123yunpan-muaork/cr6ced/xogi45g7okqk7svr

p123client/tool/__init__.py

@@ -6,14 +6,14 @@ __all__ = ["make_uri", "upload_uri", "get_downurl", "iterdir", "share_iterdir"]
 
 from asyncio import sleep as async_sleep
 from collections import deque
-from collections.abc import AsyncIterator, Callable, Coroutine, Iterator
+from collections.abc import AsyncIterator, Callable, Coroutine, Iterable, Iterator, Mapping
 from errno import EISDIR, ENOENT
 from functools import partial
 from itertools import count
 from time import sleep, time
 from typing import Literal
 from typing import overload, Any, Literal
-from urllib.parse import unquote
+from urllib.parse import unquote, urlsplit
 
 from encode_uri import encode_uri_component_loose
 from iterutils import run_gen_step, run_gen_step_iter, Yield
@@ -73,7 +73,7 @@ def make_uri(
         size = info["Size"]
         s3_key_flag = info["S3KeyFlag"]
         return f"123://{name}|{size}|{md5}?{s3_key_flag}"
-    return run_gen_step(gen_step, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -194,19 +194,16 @@ def get_downurl(
             size = int(size_s)
             if s3_key_flag:
                 payload = {
-                    "S3KeyFlag": s3_key_flag, 
                     "FileName": name, 
                     "Etag": md5, 
                     "Size": size, 
+                    "S3KeyFlag": s3_key_flag, 
                 }
             else:
-                resp = yield client.fs_mkdir("我的秒传", async_=async_, **request_kwargs)
-                check_response(resp)
                 resp = yield client.upload_file_fast(
+                    file_name=".tempfile", 
                     file_md5=md5, 
-                    file_name=f"{md5}-{size}", 
                     file_size=size, 
-                    parent_id=resp["data"]["Info"]["FileId"], 
                     duplicate=2, 
                     async_=async_, 
                     **request_kwargs, 
@@ -216,9 +213,12 @@ def get_downurl(
         resp = yield client.download_info(payload, async_=async_, **request_kwargs)
         check_response(resp)
         return resp["data"]["DownloadUrl"]
-    return run_gen_step(gen_step, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
+# TODO: _iterdir 支持广度优先遍历
+# TODO: 失败时，报错信息支持返回已经成功和未成功的列表，并且形式上也要利于断点重试
+# TODO: 支持传入其它自定义的查询参数
 @overload
 def _iterdir(
     fs_files: Callable, 
@@ -227,7 +227,9 @@ def _iterdir(
     min_depth: int = 1, 
     max_depth: int = 1, 
     predicate: None | Callable[[dict], Literal[None, 0, 1, False, True]] = None, 
-    interval: int | float = 0, 
+    cooldown: int | float = 0, 
+    base_url: None | str | Callable[[], str] = None, 
+    extra_data: None | Mapping | Iterable[tuple[str, Any]] = None, 
     *, 
     async_: Literal[False] = False, 
     **request_kwargs, 
@@ -241,7 +243,9 @@ def _iterdir(
     min_depth: int = 1, 
     max_depth: int = 1, 
     predicate: None | Callable[[dict], Literal[None, 0, 1, False, True]] = None, 
-    interval: int | float = 0, 
+    cooldown: int | float = 0, 
+    base_url: None | str | Callable[[], str] = None, 
+    extra_data: None | Mapping | Iterable[tuple[str, Any]] = None, 
     *, 
     async_: Literal[True], 
     **request_kwargs, 
@@ -254,7 +258,9 @@ def _iterdir(
     min_depth: int = 1, 
     max_depth: int = 1, 
     predicate: None | Callable[[dict], Literal[None, 0, 1, False, True]] = None, 
-    interval: int | float = 0, 
+    cooldown: int | float = 0, 
+    base_url: None | str | Callable[[], str] = None, 
+    extra_data: None | Mapping | Iterable[tuple[str, Any]] = None, 
     *, 
     async_: Literal[False, True] = False, 
     **request_kwargs, 
@@ -273,7 +279,9 @@ def _iterdir(
         - 如果返回值是 False，则跳过此节点（但依然会继续处理位于此节点之下的节点）
         - 如果返回值是 True，则输出此节点
 
-    :param interval: 两次调用之间，休息的时间
+    :param cooldown: 两次调用之间，冷却的时间（用两次调用开始时的时间差，而不是一次完成到下一次开始的时间差）
+    :param base_url: 基地址，如果为空，则用默认
+    :param extra_data: 附加数据
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
 
@@ -281,6 +289,8 @@ def _iterdir(
     """
     default_payload = payload
     page_size = int(payload.setdefault("limit", 100))
+    if base_url:
+        request_kwargs["base_url"] = base_url
     def gen_step():
         nonlocal parent_id
         dq: deque[tuple[int, int, str]] = deque()
@@ -293,13 +303,13 @@ def _iterdir(
             payload = {**default_payload, "parentFileId": parent_id}
             for i in count(1):
                 payload["Page"] = i
-                if last_ts and interval > 0 and (remains := last_ts + interval - time()) > 0:
+                if last_ts and cooldown > 0 and (remains := last_ts + cooldown - time()) > 0:
                     if async_:
                         yield async_sleep(remains)
                     else:
                         sleep(remains)
                 resp = yield fs_files(payload, async_=async_, **request_kwargs)
-                if interval > 0:
+                if cooldown > 0:
                     last_ts = time()
                 check_response(resp)
                 info_list = resp["data"]["InfoList"]
@@ -323,6 +333,8 @@ def _iterdir(
                         continue
                     elif pred:
                         if depth >= min_depth:
+                            if extra_data:
+                                info = dict(extra_data, **info)
                             yield Yield(info)
                         if pred is 1:
                             continue
@@ -336,7 +348,7 @@ def _iterdir(
                     break
                 if next_id := resp["data"]["Next"]:
                     payload["next"] = next_id
-    return run_gen_step_iter(gen_step, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -346,7 +358,8 @@ def iterdir(
     min_depth: int = 1, 
     max_depth: int = 1, 
     predicate: None | Callable[[dict], Literal[None, 0, 1, False, True]] = None, 
-    interval: int | float = 0, 
+    cooldown: int | float = 0, 
+    base_url: None | str | Callable[[], str] = None, 
     use_list_new: bool = False, 
     *, 
     async_: Literal[False] = False, 
@@ -360,7 +373,8 @@ def iterdir(
     min_depth: int = 1, 
     max_depth: int = 1, 
     predicate: None | Callable[[dict], Literal[None, 0, 1, False, True]] = None, 
-    interval: int | float = 0, 
+    cooldown: int | float = 0, 
+    base_url: None | str | Callable[[], str] = None, 
     use_list_new: bool = False, 
     *, 
     async_: Literal[True], 
@@ -373,7 +387,8 @@ def iterdir(
     min_depth: int = 1, 
     max_depth: int = 1, 
     predicate: None | Callable[[dict], Literal[None, 0, 1, False, True]] = None, 
-    interval: int | float = 0, 
+    cooldown: int | float = 0, 
+    base_url: None | str | Callable[[], str] = None, 
     use_list_new: bool = False, 
     *, 
     async_: Literal[False, True] = False, 
@@ -392,7 +407,8 @@ def iterdir(
         - 如果返回值是 False，则跳过此节点（但依然会继续处理位于此节点之下的节点）
         - 如果返回值是 True，则输出此节点
 
-    :param interval: 两次调用之间，休息的时间
+    :param cooldown: 两次调用之间，冷却的时间（用两次调用开始时的时间差，而不是一次完成到下一次开始的时间差）
+    :param base_url: 基地址，如果为空，则用默认
     :param use_list_new: 使用 `P123Client.fs_list_new` 而不是 `P123Client.fs_list`
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
@@ -405,7 +421,8 @@ def iterdir(
         min_depth=min_depth, 
         max_depth=max_depth, 
         predicate=predicate, 
-        interval=interval, 
+        cooldown=cooldown, 
+        base_url=base_url, 
         async_=async_, 
         **request_kwargs, 
     )
@@ -419,7 +436,8 @@ def share_iterdir(
     min_depth: int = 1, 
     max_depth: int = 1, 
     predicate: None | Callable[[dict], Literal[None, 0, 1, False, True]] = None, 
-    interval: int | float = 0, 
+    cooldown: int | float = 0, 
+    base_url: None | str | Callable[[], str] = None, 
     *, 
     async_: Literal[False] = False, 
     **request_kwargs, 
@@ -433,7 +451,8 @@ def share_iterdir(
     min_depth: int = 1, 
     max_depth: int = 1, 
     predicate: None | Callable[[dict], Literal[None, 0, 1, False, True]] = None, 
-    interval: int | float = 0, 
+    cooldown: int | float = 0, 
+    base_url: None | str | Callable[[], str] = None, 
     *, 
     async_: Literal[True], 
     **request_kwargs, 
@@ -446,15 +465,24 @@ def share_iterdir(
     min_depth: int = 1, 
     max_depth: int = 1, 
     predicate: None | Callable[[dict], Literal[None, 0, 1, False, True]] = None, 
-    interval: int | float = 0, 
+    cooldown: int | float = 0, 
+    base_url: None | str | Callable[[], str] = None, 
     *, 
     async_: Literal[False, True] = False, 
     **request_kwargs, 
 ) -> Iterator[dict] | AsyncIterator[dict]:
     """遍历分享的文件列表
 
-    :param share_key: 分享码，在分享链接中的位置形如 "https://www.123pan.com/s/{share_key}"
-    :param share_pwd: 密码，如果没有就不传
+    :param share_key: 分享码或者分享链接（可以携带提取码）
+
+        .. note::
+            在分享链接中的位置形如 f"https://www.123pan.com/s/{share_key}"
+
+            如果携带提取码，要写成 f"https://www.123pan.com/s/{share_key}?提取码:{share_pwd}"
+
+            上面的基地址不必是 "https://www.123pan.com"
+
+    :param share_pwd: 提取码（4个文字），可以为空
     :param parent_id: 父目录 id，默认是根目录
     :param min_depth: 最小深度，小于此深度的不会输出
     :param max_depth: 最大深度，大于此深度的不会输出，如果小于 0 则无限
@@ -465,20 +493,33 @@ def share_iterdir(
         - 如果返回值是 False，则跳过此节点（但依然会继续处理位于此节点之下的节点）
         - 如果返回值是 True，则输出此节点
 
-    :param interval: 两次调用之间，休息的时间
+    :param cooldown: 两次调用之间，冷却的时间（用两次调用开始时的时间差，而不是一次完成到下一次开始的时间差）
+    :param base_url: 基地址，如果为空，则用默认（如果 `share_key` 是分享链接，则用它的 origin）
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
 
     :return: 迭代器，产生文件或目录的信息
     """
+    if share_key.startswith(("http://", "https://")):
+        urlp = urlsplit(share_key)
+        if not base_url:
+            base_url = f"{urlp.scheme}://{urlp.netloc}"
+        share_key = urlp.path.rsplit("/", 1)[-1]
+        if not share_pwd:
+            share_pwd = urlp.query.rpartition(":")[-1]
+            if len(share_pwd) != 4:
+                share_pwd = ""
+    payload = {"ShareKey": share_key, "SharePwd": share_pwd}
     return _iterdir(
         P123Client.share_fs_list, 
-        {"ShareKey": share_key, "SharePwd": share_pwd}, 
+        payload, 
         parent_id=parent_id, 
         min_depth=min_depth, 
         max_depth=max_depth, 
         predicate=predicate, 
-        interval=interval, 
+        cooldown=cooldown, 
+        base_url=base_url, 
+        extra_data=payload, 
         async_=async_, 
         **request_kwargs, 
     )

{p123client-0.0.6.4.dist-info → p123client-0.0.6.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p123client
-Version: 0.0.6.4
+Version: 0.0.6.9
 Summary: Python 123 webdisk client.
 Home-page: https://github.com/ChenyangGao/p123client
 License: MIT
@@ -31,7 +31,7 @@ Requires-Dist: python-filewrap (>=0.2.6.1)
 Requires-Dist: python-hashtools (>=0.0.3.3)
 Requires-Dist: python-http_request (>=0.0.7)
 Requires-Dist: python-httpfile (>=0.0.5)
-Requires-Dist: python-iterutils (>=0.2)
+Requires-Dist: python-iterutils (>=0.2.4.1)
 Requires-Dist: python-property (>=0.0.3)
 Requires-Dist: yarl
 Project-URL: Repository, https://github.com/ChenyangGao/p123client

{p123client-0.0.6.4.dist-info → p123client-0.0.6.9.dist-info}/RECORD

@@ -1,12 +1,12 @@
 LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
 p123client/__init__.py,sha256=gfUum-q3f_XuXOk2HpArDAIxAlscZm8Fau1kiNkNFpg,214
-p123client/client.py,sha256=Ha09EnH9tC2CfacGH7DaO93BUVB6wRDiSym32In2WFw,248614
+p123client/client.py,sha256=sjv9kzsiVl8hFMsaaAMGjCpsbewo3LaXqbYUpzhh5bI,258804
 p123client/const.py,sha256=T17OzPQrnIG6w_Hzjc8TF_fFMKa-hQMSn1gff8pVcBc,56
 p123client/exception.py,sha256=020xGo8WQmGCJz1UzNg9oFzpEvToQcgTye0s6lkFASQ,1540
 p123client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-p123client/tool/__init__.py,sha256=2k_tcc67O9QG4wzESIdnAwqNHybCGlrsnxo_uBqBhEI,16673
+p123client/tool/__init__.py,sha256=rZIgiXMNN21acq6OdT3ywQdPQRSmxDrifzHmhj-5E8E,18860
 p123client/type.py,sha256=T17OzPQrnIG6w_Hzjc8TF_fFMKa-hQMSn1gff8pVcBc,56
-p123client-0.0.6.4.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p123client-0.0.6.4.dist-info/METADATA,sha256=7l04-PIItAf9zNy88qMzDiis2KeBX8HNucLCtvsO3ik,8855
-p123client-0.0.6.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p123client-0.0.6.4.dist-info/RECORD,,
+p123client-0.0.6.9.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p123client-0.0.6.9.dist-info/METADATA,sha256=BGbHQeCskMwE3Lxh985P00v3W4BDi49-b-5-YRKJEHc,8859
+p123client-0.0.6.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p123client-0.0.6.9.dist-info/RECORD,,