p115client 0.0.5.13.2__tar.gz → 0.0.5.14.1__tar.gz

{p115client-0.0.5.13.2 → p115client-0.0.5.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.13.2
+Version: 0.0.5.14.1
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT
@@ -29,7 +29,7 @@ Requires-Dist: iter_collect (>=0.0.5.1)
 Requires-Dist: multidict
 Requires-Dist: orjson
 Requires-Dist: p115cipher (>=0.0.3)
-Requires-Dist: p115pickcode (>=0.0.2)
+Requires-Dist: p115pickcode (>=0.0.4)
 Requires-Dist: posixpatht (>=0.0.3)
 Requires-Dist: python-argtools (>=0.0.1)
 Requires-Dist: python-asynctools (>=0.1.3)
@@ -41,7 +41,7 @@ Requires-Dist: python-filewrap (>=0.2.8)
 Requires-Dist: python-hashtools (>=0.0.3.3)
 Requires-Dist: python-http_request (>=0.0.6)
 Requires-Dist: python-httpfile (>=0.0.5.2)
-Requires-Dist: python-iterutils (>=0.2.5)
+Requires-Dist: python-iterutils (>=0.2.5.3)
 Requires-Dist: python-property (>=0.0.3)
 Requires-Dist: python-startfile (>=0.0.2)
 Requires-Dist: python-undefined (>=0.0.3)

{p115client-0.0.5.13.2 → p115client-0.0.5.14.1}/p115client/client.py

@@ -59,7 +59,7 @@ from orjson import dumps, loads
 from p115cipher.fast import (
     rsa_encode, rsa_decode, ecdh_encode_token, ecdh_aes_encode, ecdh_aes_decode, make_upload_payload, 
 )
-from p115pickcode import id_to_pickcode
+from p115pickcode import get_stable_point
 from property import locked_cacheproperty
 from re import compile as re_compile
 from startfile import startfile, startfile_async # type: ignore
@@ -679,8 +679,6 @@ def normalize_attr_web[D: dict[str, Any]](
     attr["size"] = int(info.get("s") or 0)
     if "pc" in info:
         attr["pickcode"] = info["pc"]
-    else:
-        attr["pickcode"] = id_to_pickcode(attr["id"], is_dir=is_dir)
     if simple:
         if "c" in info:
             attr["is_collect"] = int(info["c"])
@@ -818,8 +816,6 @@ def normalize_attr_app[D: dict[str, Any]](
     attr["size"] = int(info.get("fs") or 0)
     if "pc" in info:
         attr["pickcode"] = info["pc"]
-    else:
-        attr["pickcode"] = id_to_pickcode(attr["id"], is_dir=is_dir)
     if simple:
         if "ic" in info:
             attr["is_collect"] = int(info["ic"])
@@ -956,8 +952,6 @@ def normalize_attr_app2[D: dict[str, Any]](
     attr["size"] = int(info.get("file_size") or 0)
     if "pick_code" in info:
         attr["pickcode"] = info["pick_code"]
-    else:
-        attr["pickcode"] = id_to_pickcode(attr["id"], is_dir=is_dir)
     if simple:
         if "is_collect" in info:
             attr["is_collect"] = int(info["is_collect"])
@@ -3127,6 +3121,18 @@ class P115OpenClient(ClientRequestMixin):
         resp = check_response(self.user_info_open())
         return int(resp["data"]["user_id"])
 
+    @locked_cacheproperty
+    def pickcode_stable_point(self, /) -> str:
+        """获取 pickcode 的不动点
+
+        .. todo::
+            不动点可能和用户 id 有某种联系，但目前样本不足，难以推断，以后再尝试分析
+        """
+        resp = self.fs_files({"show_dir": 1, "limit": 1, "cid": 0})
+        check_response(resp)
+        info = resp["data"][0]
+        return get_stable_point(normalize_attr(info)["pickcode"])
+
     @overload
     def refresh_access_token(
         self, 

{p115client-0.0.5.13.2 → p115client-0.0.5.14.1}/p115client/tool/download.py

@@ -94,14 +94,15 @@ def batch_get_url(
     """
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
+    stable_point = client.pickcode_stable_point
     if headers := request_kwargs.get("headers"):
         request_kwargs["headers"] = dict(headers, **{"user-agent": user_agent})
     else:
         request_kwargs["headers"] = {"user-agent": user_agent}
     if isinstance(pickcode, (int, str)):
-        pickcode = to_pickcode(pickcode)
+        pickcode = to_pickcode(pickcode, stable_point)
     elif not isinstance(pickcode, str):
-        pickcode = ",".join(map(to_pickcode, pickcode))
+        pickcode = ",".join(to_pickcode(pc, stable_point) for pc in pickcode)
     if not isinstance(client, P115Client) or app == "open":
         get_download_url: Callable = client.download_url_info_open
     else:
@@ -183,6 +184,7 @@ def iter_url_batches(
     """
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
+    stable_point = client.pickcode_stable_point
     if headers := request_kwargs.get("headers"):
         request_kwargs["headers"] = dict(headers, **{"user-agent": user_agent})
     else:
@@ -194,7 +196,7 @@ def iter_url_batches(
     if batch_size <= 0:
         batch_size = 1
     def gen_step():
-        for pcs in batched(map(to_pickcode, pickcodes), batch_size):
+        for pcs in batched((to_pickcode(pc, stable_point) for pc in pickcodes), batch_size):
             resp = yield get_download_url(
                 ",".join(pcs), 
                 async_=async_, 
@@ -1208,6 +1210,7 @@ def iter_download_nodes(
     """
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
+    stable_point = client.pickcode_stable_point
     get_base_url = cycle(("http://proapi.115.com", "https://proapi.115.com")).__next__
     if async_:
         if max_workers is None or max_workers <= 0:
@@ -1221,6 +1224,7 @@ def iter_download_nodes(
         if id_to_dirnode is None:
             id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
     file_skim = client.fs_file_skim
+    need_yield = files and ensure_name
     def normalize_attrs(attrs: list[dict], /):
         if files:
             for i, info in enumerate(attrs):
@@ -1243,7 +1247,7 @@ def iter_download_nodes(
                 for attr in attrs:
                     id_to_dirnode[attr["id"]] = DirNode(attr["name"], attr["parent_id"])
         return attrs
-    if files and ensure_name:
+    if need_yield:
         prepare = normalize_attrs
         @as_gen_step
         def normalize_attrs(attrs: list[dict], /):
@@ -1262,6 +1266,7 @@ def iter_download_nodes(
                         attr["sha1"] = node["sha1"]
                         attr["name"] = unescape_115_charref(node["file_name"])
             return attrs
+    need_yield = need_yield and async_
     get_nodes = partial(
         method, 
         async_=async_, 
@@ -1269,7 +1274,7 @@ def iter_download_nodes(
     )
     if max_workers == 1:
         def gen_step(pickcode: int | str, /):
-            pickcode = to_pickcode(pickcode)
+            pickcode = to_pickcode(pickcode, stable_point)
             for i in count(1):
                 payload = {"pickcode": pickcode, "page": i}
                 resp = yield get_nodes(payload)
@@ -1300,7 +1305,10 @@ def iter_download_nodes(
                     put(e)
                     return
                 data = resp["data"]
-                put((yield normalize_attrs(data["list"])))
+                attrs = normalize_attrs(data["list"])
+                if need_yield:
+                    attrs = yield attrs
+                put(attrs)
                 if not data["has_next_page"]:
                     max_page = page
         def gen_step(pickcode: int | str, /):
@@ -1316,7 +1324,7 @@ def iter_download_nodes(
                 n = executor._max_workers
                 submit = executor.submit
                 shutdown = lambda: executor.shutdown(False, cancel_futures=True)
-            pickcode = to_pickcode(pickcode)
+            pickcode = to_pickcode(pickcode, stable_point)
             try:
                 sentinel = object()
                 countdown: Callable
@@ -1441,6 +1449,7 @@ def iter_download_files(
     """
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
+    stable_point = client.pickcode_stable_point
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
     elif id_to_dirnode is ...:
@@ -1507,7 +1516,7 @@ def iter_download_files(
             ))
         finally:
             ancestors_loaded = True
-    def gen_step(pickcode: str = to_pickcode(cid), /):
+    def gen_step(pickcode: str, /):
         nonlocal ancestors_loaded
         if pickcode:
             if cid:
@@ -1585,7 +1594,7 @@ def iter_download_files(
             for pickcode in pickcodes:
                 yield YieldFrom(run_gen_step_iter(gen_step(pickcode), async_))
                 ancestors_loaded = False
-    return run_gen_step_iter(gen_step, async_)
+    return run_gen_step_iter(gen_step(to_pickcode(cid, stable_point)), async_)
 
 
 @overload

{p115client-0.0.5.13.2 → p115client-0.0.5.14.1}/p115client/tool/iterdir.py

@@ -14,11 +14,13 @@ __all__ = [
     "iter_nodes", "iter_nodes_skim", "iter_nodes_by_pickcode", 
     "iter_nodes_using_update", "iter_nodes_using_info", 
     "iter_nodes_using_star_event",  "iter_dir_nodes_using_star", 
-    "iter_parents", "iter_dupfiles", "iter_image_files", "search_iter", 
-    "share_iterdir", "share_iter_files", "share_search_iter", 
+    "iter_parents", "iter_files_shortcut", "iter_dupfiles", "iter_image_files", 
+    "search_iter", "share_iterdir", "share_iter_files", "share_search_iter", 
 ]
 __doc__ = "这个模块提供了一些和目录信息罗列有关的函数"
 
+# TODO: 再实现 2 个方法，利用 iter_download_nodes，一个有 path，一个没有，可以把某个目录下的所有节点都搞出来，导出时，先导出目录节点，再导出文件节点，但它们是并发执行的，然后必有字段：id, parent_id, pickcode, name, is_dir, sha1 等
+
 # TODO: 路径表示法，应该支持 / 和 > 开头，而不仅仅是 / 开头
 # TODO: 对于路径，增加 top_id 和 relpath 字段，表示搜素目录的 id 和相对于搜索路径的相对路径
 # TODO: get_id* 这类方法，应该放在 attr.py，用来获取某个 id 对应的值（根本还是 get_attr）
@@ -2292,6 +2294,7 @@ def iter_files_with_path(
         raise ValueError("please set the non-zero value of suffix or type")
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
+    stable_point = client.pickcode_stable_point
     if isinstance(escape, bool):
         if escape:
             from posixpatht import escape
@@ -2303,36 +2306,6 @@ def iter_files_with_path(
     elif id_to_dirnode is ...:
         id_to_dirnode = {}
         path_already = False
-    _path_already: None | bool = None if path_already else False
-    if not path_already:
-        from .download import iter_download_nodes
-        def set_path_already(*_):
-            nonlocal _path_already
-            _path_already = True
-        @as_gen_step
-        def fetch_dirs(id: int | str, /):
-            if id:
-                yield through(iter_download_nodes(
-                    client, 
-                    to_pickcode(id), 
-                    files=False, 
-                    id_to_dirnode=id_to_dirnode, 
-                    max_workers=None, 
-                    async_=async_, 
-                    **request_kwargs, 
-                ))
-            else:
-                with with_iter_next(iterdir(
-                    client, 
-                    ensure_file=False, 
-                    id_to_dirnode=id_to_dirnode, 
-                    app=app, 
-                    async_=async_, 
-                    **request_kwargs, 
-                )) as get_next:
-                    while True:
-                        attr = yield get_next()
-                        yield fetch_dirs(attr["pickcode"])
     if with_ancestors:
         id_to_ancestors: dict[int, list[dict]] = {}
         def get_ancestors(id: int, attr: dict | tuple[str, int] | DirNode, /) -> list[dict]:
@@ -2374,17 +2347,8 @@ def iter_files_with_path(
             pass
         return attr
     cid = to_id(cid)
-    def gen_step():
-        nonlocal _path_already
-        cache: list[dict] = []
-        add_to_cache = cache.append
-        if not path_already:
-            if async_:
-                task: Any = create_task(fetch_dirs(cid))
-            else:
-                task = run_as_thread(fetch_dirs, cid)
-            task.add_done_callback(set_path_already)
-        with with_iter_next(iter_files(
+    if path_already:
+        return do_map(update_path, iter_files(
             client, 
             cid, 
             page_size=page_size, 
@@ -2401,30 +2365,88 @@ def iter_files_with_path(
             cooldown=cooldown, 
             async_=async_, # type: ignore
             **request_kwargs, 
-        )) as get_next:
-            while True:
-                attr = yield get_next()
-                if _path_already is None:
-                    yield Yield(update_path(attr))
-                elif _path_already:
-                    if async_:
-                        yield task
+        ))
+    else:
+        _path_already: None | bool = None if path_already else False
+        from .download import iter_download_nodes
+        def set_path_already(*_):
+            nonlocal _path_already
+            _path_already = True
+        @as_gen_step
+        def fetch_dirs(id: int | str, /):
+            if id:
+                yield through(iter_download_nodes(
+                    client, 
+                    to_pickcode(id, stable_point), 
+                    files=False, 
+                    id_to_dirnode=id_to_dirnode, 
+                    max_workers=None, 
+                    async_=async_, 
+                    **request_kwargs, 
+                ))
+            else:
+                with with_iter_next(iterdir(
+                    client, 
+                    ensure_file=False, 
+                    id_to_dirnode=id_to_dirnode, 
+                    app=app, 
+                    async_=async_, 
+                    **request_kwargs, 
+                )) as get_next:
+                    while True:
+                        attr = yield get_next()
+                        yield fetch_dirs(attr["pickcode"])
+        def gen_step():
+            nonlocal _path_already
+            cache: list[dict] = []
+            add_to_cache = cache.append
+            if not path_already:
+                if async_:
+                    task: Any = create_task(fetch_dirs(cid))
+                else:
+                    task = run_as_thread(fetch_dirs, cid)
+                task.add_done_callback(set_path_already)
+            with with_iter_next(iter_files(
+                client, 
+                cid, 
+                page_size=page_size, 
+                suffix=suffix, 
+                type=type, 
+                order=order, 
+                asc=asc, 
+                cur=cur, 
+                normalize_attr=normalize_attr, 
+                id_to_dirnode=id_to_dirnode, 
+                raise_for_changed_count=raise_for_changed_count, 
+                max_workers=max_workers, 
+                app=app, 
+                cooldown=cooldown, 
+                async_=async_, # type: ignore
+                **request_kwargs, 
+            )) as get_next:
+                while True:
+                    attr = yield get_next()
+                    if _path_already is None:
+                        yield Yield(update_path(attr))
+                    elif _path_already:
+                        if async_:
+                            yield task
+                        else:
+                            task.result()
+                        if cache:
+                            yield YieldFrom(map(update_path, cache))
+                            cache.clear()
+                        yield Yield(update_path(attr))
+                        _path_already = None
                     else:
-                        task.result()
-                    if cache:
-                        yield YieldFrom(map(update_path, cache))
-                        cache.clear()
-                    yield Yield(update_path(attr))
-                    _path_already = None
+                        add_to_cache(attr)
+            if cache:
+                if async_:
+                    yield task
                 else:
-                    add_to_cache(attr)
-        if cache:
-            if async_:
-                yield task
-            else:
-                task.result()
-            yield YieldFrom(map(update_path, cache))
-    return run_gen_step_iter(gen_step, async_)
+                    task.result()
+                yield YieldFrom(map(update_path, cache))
+        return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -2494,6 +2516,7 @@ def iter_files_with_path_skim(
     from .download import iter_download_nodes
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
+    stable_point = client.pickcode_stable_point
     if isinstance(escape, bool):
         if escape:
             from posixpatht import escape
@@ -2505,45 +2528,6 @@ def iter_files_with_path_skim(
     elif id_to_dirnode is ...:
         id_to_dirnode = {}
         path_already = False
-    _path_already: None | bool = None if path_already else False
-    if not path_already:
-        def set_path_already(*_):
-            nonlocal _path_already
-            _path_already = True
-        @as_gen_step
-        def fetch_dirs(id: int | str, /):
-            if id:
-                if cid:
-                    do_next: Callable = anext if async_ else next
-                    yield do_next(_iter_fs_files(
-                        client, 
-                        to_id(id), 
-                        page_size=1, 
-                        id_to_dirnode=id_to_dirnode, 
-                        async_=async_, 
-                        **request_kwargs, 
-                    ))
-                yield through(iter_download_nodes(
-                    client, 
-                    to_pickcode(id), 
-                    files=False, 
-                    id_to_dirnode=id_to_dirnode, 
-                    max_workers=max_workers, 
-                    async_=async_, 
-                    **request_kwargs, 
-                ))
-            else:
-                with with_iter_next(iterdir(
-                    client, 
-                    ensure_file=False, 
-                    id_to_dirnode=id_to_dirnode, 
-                    app=app, 
-                    async_=async_, 
-                    **request_kwargs, 
-                )) as get_next:
-                    while True:
-                        attr = yield get_next()
-                        yield fetch_dirs(attr["pickcode"])
     if with_ancestors:
         id_to_ancestors: dict[int, list[dict]] = {}
         def get_ancestors(id: int, attr: dict | tuple[str, int] | DirNode, /) -> list[dict]:
@@ -2585,17 +2569,8 @@ def iter_files_with_path_skim(
             pass
         return attr
     cid = to_id(cid)
-    def gen_step():
-        nonlocal _path_already
-        cache: list[dict] = []
-        add_to_cache = cache.append
-        if not path_already:
-            if async_:
-                task: Any = create_task(fetch_dirs(cid))
-            else:
-                task = run_as_thread(fetch_dirs, cid)
-            task.add_done_callback(set_path_already)
-        with with_iter_next(iter_download_nodes(
+    if path_already:
+        return do_map(update_path, iter_download_nodes(
             client, 
             cid, 
             files=True, 
@@ -2604,30 +2579,89 @@ def iter_files_with_path_skim(
             app=app, 
             async_=async_, 
             **request_kwargs, 
-        )) as get_next:
-            while True:
-                attr = yield get_next()
-                if _path_already is None:
-                    yield Yield(update_path(attr))
-                elif _path_already:
-                    if async_:
-                        yield task
+        ))
+    else:
+        _path_already: None | bool = None if path_already else False
+        def set_path_already(*_):
+            nonlocal _path_already
+            _path_already = True
+        @as_gen_step
+        def fetch_dirs(id: int | str, /):
+            if id:
+                if cid:
+                    do_next: Callable = anext if async_ else next
+                    yield do_next(_iter_fs_files(
+                        client, 
+                        to_id(id), 
+                        page_size=1, 
+                        id_to_dirnode=id_to_dirnode, 
+                        async_=async_, 
+                        **request_kwargs, 
+                    ))
+                yield through(iter_download_nodes(
+                    client, 
+                    to_pickcode(id, stable_point), 
+                    files=False, 
+                    id_to_dirnode=id_to_dirnode, 
+                    max_workers=max_workers, 
+                    async_=async_, 
+                    **request_kwargs, 
+                ))
+            else:
+                with with_iter_next(iterdir(
+                    client, 
+                    ensure_file=False, 
+                    id_to_dirnode=id_to_dirnode, 
+                    app=app, 
+                    async_=async_, 
+                    **request_kwargs, 
+                )) as get_next:
+                    while True:
+                        attr = yield get_next()
+                        yield fetch_dirs(attr["pickcode"])
+        def gen_step():
+            nonlocal _path_already
+            cache: list[dict] = []
+            add_to_cache = cache.append
+            if not path_already:
+                if async_:
+                    task: Any = create_task(fetch_dirs(cid))
+                else:
+                    task = run_as_thread(fetch_dirs, cid)
+                task.add_done_callback(set_path_already)
+            with with_iter_next(iter_download_nodes(
+                client, 
+                cid, 
+                files=True, 
+                ensure_name=True, 
+                max_workers=max_workers, 
+                app=app, 
+                async_=async_, 
+                **request_kwargs, 
+            )) as get_next:
+                while True:
+                    attr = yield get_next()
+                    if _path_already is None:
+                        yield Yield(update_path(attr))
+                    elif _path_already:
+                        if async_:
+                            yield task
+                        else:
+                            task.result()
+                        if cache:
+                            yield YieldFrom(map(update_path, cache))
+                            cache.clear()
+                        yield Yield(update_path(attr))
+                        _path_already = None
                     else:
-                        task.result()
-                    if cache:
-                        yield YieldFrom(map(update_path, cache))
-                        cache.clear()
-                    yield Yield(update_path(attr))
-                    _path_already = None
+                        add_to_cache(attr)
+            if cache:
+                if async_:
+                    yield task
                 else:
-                    add_to_cache(attr)
-        if cache:
-            if async_:
-                yield task
-            else:
-                task.result()
-            yield YieldFrom(map(update_path, cache))
-    return run_gen_step_iter(gen_step, async_)
+                    task.result()
+                yield YieldFrom(map(update_path, cache))
+        return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -2838,6 +2872,7 @@ def iter_nodes_by_pickcode(
     """
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
+    stable_point = client.pickcode_stable_point
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
     methods: list[Callable] = []
@@ -2875,7 +2910,7 @@ def iter_nodes_by_pickcode(
         project, 
         conmap(
             get_response, 
-            map(to_pickcode, pickcodes), 
+            (to_pickcode(pc, stable_point) for pc in pickcodes), 
             max_workers=max_workers, 
             kwargs=request_kwargs, 
             async_=async_, 
@@ -3426,6 +3461,91 @@ def iter_parents(
     ))
 
 
+@overload
+def iter_files_shortcut(
+    client: str | P115Client, 
+    cid: int | str = 0, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
+    max_workers: None | int = None, 
+    is_skim: bool = True, 
+    with_path: bool = False, 
+    app: str = "android", 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> Iterator[dict]:
+    ...
+@overload
+def iter_files_shortcut(
+    client: str | P115Client, 
+    cid: int | str = 0, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
+    max_workers: None | int = None, 
+    is_skim: bool = True, 
+    with_path: bool = False, 
+    app: str = "android", 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> AsyncIterator[dict]:
+    ...
+def iter_files_shortcut(
+    client: str | P115Client, 
+    cid: int | str = 0, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
+    max_workers: None | int = None, 
+    is_skim: bool = True, 
+    with_path: bool = False, 
+    app: str = "android", 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> Iterator[dict] | AsyncIterator[dict]:
+    """遍历目录树，获取（仅文件而非目录）文件信息（整合了多个函数的入口）
+
+    .. node::
+        `is_skim` 和 `with_path` 的不同取值组合，会决定采用不同的函数:
+
+        1. `iter_download_nodes`: is_skim=True and with_path=False
+        2. `iter_files_with_path_skim`: is_skim=True and with_path=True
+        3. `iter_files`: is_skim=False and with_path=False
+        4. `iter_files_with_path`: is_skim=False and with_path=True
+
+    :param client: 115 客户端或 cookies
+    :param cid: 待被遍历的目录 id 或 pickcode
+    :param id_to_dirnode: 字典，保存 id 到对应文件的 `DirNode(name, parent_id)` 命名元组的字典
+    :param max_workers: 最大并发数，如果为 None 或 <= 0，则自动确定
+    :param is_skim: 是否拉取简要信息
+    :param with_path: 是否需要 "path" 和 "ancestors" 字段
+    :param app: 使用指定 app（设备）的接口
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 迭代器，产生文件信息
+    """
+    if with_path:
+        request_kwargs.setdefault("with_ancestors", True)
+        if is_skim:
+            method: Callable = iter_files_with_path_skim
+        else:
+            method = iter_files_with_path
+    elif is_skim:
+        request_kwargs.update(files=True, ensure_name=True)
+        from .download import iter_download_nodes as method
+    else:
+        request_kwargs.setdefault("cooldown", 0.5)
+        method = iter_files
+    return method(
+        client, 
+        cid, 
+        id_to_dirnode=id_to_dirnode, 
+        max_workers=max_workers, 
+        app=app, 
+        async_=async_, 
+        **request_kwargs, 
+    )
+
+
 @overload
 def iter_dupfiles[K](
     client: str | P115Client, 
@@ -3434,6 +3554,8 @@ def iter_dupfiles[K](
     keep_first: None | bool | Callable[[dict], SupportsLT] = None, 
     id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     max_workers: None | int = None, 
+    is_skim: bool = True, 
+    with_path: bool = False, 
     app: str = "android", 
     *, 
     async_: Literal[False] = False, 
@@ -3448,6 +3570,8 @@ def iter_dupfiles[K](
     keep_first: None | bool | Callable[[dict], SupportsLT] = None, 
     id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     max_workers: None | int = None, 
+    is_skim: bool = True, 
+    with_path: bool = False, 
     app: str = "android", 
     *, 
     async_: Literal[True], 
@@ -3461,6 +3585,8 @@ def iter_dupfiles[K](
     keep_first: None | bool | Callable[[dict], SupportsLT] = None, 
     id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     max_workers: None | int = None, 
+    is_skim: bool = True, 
+    with_path: bool = False, 
     app: str = "android", 
     *, 
     async_: Literal[False, True] = False, 
@@ -3480,22 +3606,22 @@ def iter_dupfiles[K](
 
     :param id_to_dirnode: 字典，保存 id 到对应文件的 `DirNode(name, parent_id)` 命名元组的字典
     :param max_workers: 最大并发数，如果为 None 或 <= 0，则自动确定
+    :param is_skim: 是否拉取简要信息
+    :param with_path: 是否需要 "path" 和 "ancestors" 字段
     :param app: 使用指定 app（设备）的接口
-    :param cooldown: 冷却时间，大于 0，则使用此时间间隔执行并发
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
 
     :return: 迭代器，返回 key 和 重复文件信息 的元组
     """
-    from .download import iter_download_nodes
     return iter_keyed_dups(
-        iter_download_nodes(
+        iter_files_shortcut(
             client, 
             cid, 
-            files=True, 
-            ensure_name=True, 
             id_to_dirnode=id_to_dirnode, 
             max_workers=max_workers, 
+            is_skim=is_skim, 
+            with_path=with_path, 
             app=app, 
             async_=async_, # type: ignore
             **request_kwargs, 

{p115client-0.0.5.13.2 → p115client-0.0.5.14.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p115client"
-version = "0.0.5.13.2"
+version = "0.0.5.14.1"
 description = "Python 115 webdisk client."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
@@ -37,7 +37,7 @@ iter_collect = ">=0.0.5.1"
 multidict = "*"
 orjson = "*"
 p115cipher = ">=0.0.3"
-p115pickcode = ">=0.0.2"
+p115pickcode = ">=0.0.4"
 posixpatht = ">=0.0.3"
 python-argtools = ">=0.0.1"
 python-asynctools = ">=0.1.3"
@@ -49,7 +49,7 @@ python-filewrap = ">=0.2.8"
 python-hashtools = ">=0.0.3.3"
 python-httpfile = ">=0.0.5.2"
 python-http_request = ">=0.0.6"
-python-iterutils = ">=0.2.5"
+python-iterutils = ">=0.2.5.3"
 python-property = ">=0.0.3"
 python-startfile = ">=0.0.2"
 python-undefined = ">=0.0.3"