p115client 0.0.5.13__py3-none-any.whl → 0.0.5.13.2__py3-none-any.whl

p115client/tool/download.py

@@ -872,6 +872,7 @@ def iter_subtitle_batches(
 
 
 # TODO: 要支持 open 接口
+# TODO: 后续还可用 iter_download_nodes 接口，来更快地拉取数据
 @overload
 def make_strm(
     client: str | P115Client, 
@@ -1220,7 +1221,6 @@ 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
-    @as_gen_step
     def normalize_attrs(attrs: list[dict], /):
         if files:
             for i, info in enumerate(attrs):
@@ -1231,20 +1231,6 @@ def iter_download_nodes(
                     "parent_id": int(info["pid"]), 
                     "size": info["fs"], 
                 }
-            if ensure_name:
-                resp = yield file_skim(
-                    (a["id"] for a in attrs), 
-                    method="POST", 
-                    async_=async_, 
-                    **request_kwargs, 
-                )
-                if resp.get("error") != "文件不存在":
-                    check_response(resp)
-                    nodes = {int(a["file_id"]): a for a in resp["data"]}
-                    for attr in attrs:
-                        if node := nodes.get(attr["id"]):
-                            attr["sha1"] = node["sha1"]
-                            attr["name"] = unescape_115_charref(node["file_name"])
         else:
             for i, info in enumerate(attrs):
                 attrs[i] = {
@@ -1257,6 +1243,25 @@ 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:
+        prepare = normalize_attrs
+        @as_gen_step
+        def normalize_attrs(attrs: list[dict], /):
+            prepare(attrs)
+            resp = yield file_skim(
+                (a["id"] for a in attrs), 
+                method="POST", 
+                async_=async_, 
+                **request_kwargs, 
+            )
+            if resp.get("error") != "文件不存在":
+                check_response(resp)
+                nodes = {int(a["file_id"]): a for a in resp["data"]}
+                for attr in attrs:
+                    if node := nodes.get(attr["id"]):
+                        attr["sha1"] = node["sha1"]
+                        attr["name"] = unescape_115_charref(node["file_name"])
+            return attrs
     get_nodes = partial(
         method, 
         async_=async_, 

p115client/tool/export_dir.py

@@ -363,8 +363,8 @@ def export_dir(
     """导出目录树
 
     :param client: 115 客户端或 cookies
-    :param export_file_ids: 待导出的目录 id、pickcode 或 路径（如果有多个，需传入可迭代对象）
-    :param target_pid: 导出到的目标目录 id、pickcode 或 路径
+    :param export_file_ids: 待导出的目录 id 或 pickcode
+    :param target_pid: 导出到的目标目录 id 或 pickcode
     :param layer_limit: 层级深度，小于等于 0 时不限
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
@@ -373,45 +373,16 @@ def export_dir(
     """
     if not isinstance(client, P115Client):
         client = P115Client(client, check_for_relogin=True)
-    from .iterdir import get_id_to_path
-    @as_gen_step
-    def get_id(s: str, /):
-        if len(s) >= 17 and is_valid_pickcode(s):
-            try:
-                return to_id(s)
-            except Exception:
-                pass
-        return (yield get_id_to_path(
-            client, 
-            s, 
-            ensure_file=False, 
-            async_=async_, 
-            **request_kwargs, 
-        ))
     def gen_step():
         nonlocal export_file_ids, target_pid
         if isinstance(export_file_ids, int):
             pass
         elif isinstance(export_file_ids, str):
-            export_file_ids = yield get_id(export_file_ids)
+            if "," not in export_file_ids:
+                export_file_ids = to_id(export_file_ids)
         else:
-            cids: set[int] = set()
-            add_cid = cids.add
-            for cid in export_file_ids:
-                if isinstance(cid, str):
-                    cid = yield get_id(cid)
-                add_cid(cid)
-            if not cids:
-                raise ValueError("`export_file_ids` is empty")
-            export_file_ids = ",".join(map(str, cids))
-        if isinstance(target_pid, str):
-            target_pid = yield get_id_to_path(
-                client, 
-                target_pid, 
-                ensure_file=False, 
-                async_=async_, 
-                **request_kwargs, 
-            )
+            export_file_ids = ",".join(str(to_id(eid)) for eid in export_file_ids)
+        target_pid = to_id(target_pid)
         payload = {"file_ids": export_file_ids, "target": f"U_0_{target_pid}"}
         if layer_limit > 0:
             payload["layer_limit"] = layer_limit
@@ -557,7 +528,7 @@ def export_dir_parse_iter(
     :param client: 115 客户端或 cookies
     :param export_file_ids: 待导出的目录 id、pickcode 或 路径（如果有多个，需传入可迭代对象）
     :param export_id: 优先级高于 `export_file_ids`，之前提交的 `export_dir` 任务的 id，如果是 str，则视为导出的目录树文件的提取码（因此无需导出）
-    :param target_pid: 导出到的目标目录 id 或 路径
+    :param target_pid: 导出到的目标目录 id 或 pickcode
     :param layer_limit: 层级深度，小于等于 0 时不限
     :param parse_iter: 解析打开的二进制文件，返回可迭代对象
     :param delete: 最终删除目录树文件（如果 export_id 为 str（即提取码），则这个值不生效，必不删除）

p115client/tool/fs_files.py

@@ -115,20 +115,20 @@ def iter_fs_files(
         "limit": first_page_size, "show_dir": 1, **payload, 
     }
     cid = int(payload["cid"])
-    @as_gen_step
-    def get_files(payload: dict, /):
+    def gen_step():
         nonlocal count
         while True:
-            try:
-                resp = yield fs_files(payload, async_=async_)
-                check_response(resp)
-            except DataError:
-                if payload["limit"] <= 1150:
-                    raise
-                payload["limit"] -= 1_000
-                if payload["limit"] < 1150:
-                    payload["limit"] = 1150
-            else:
+            while True:
+                try:
+                    resp = yield fs_files(payload, async_=async_)
+                    check_response(resp)
+                except DataError:
+                    if payload["limit"] <= 1150:
+                        raise
+                    payload["limit"] -= 1_000
+                    if payload["limit"] < 1150:
+                        payload["limit"] = 1150
+                    continue
                 if cid and int(resp["path"][-1]["cid"]) != cid:
                     if count < 0:
                         raise NotADirectoryError(ENOTDIR, cid)
@@ -146,10 +146,7 @@ def iter_fs_files(
                     count = count_new
                 if callback is not None:
                     resp["callback"] = yield callback(resp)
-                return resp
-    def gen_step():
-        while True:
-            resp = yield get_files(payload)
+                break
             payload["limit"] = page_size
             yield Yield(resp)
             payload["offset"] += len(resp["data"])

p115client/tool/iterdir.py

@@ -19,6 +19,7 @@ __all__ = [
 ]
 __doc__ = "这个模块提供了一些和目录信息罗列有关的函数"
 
+# TODO: 路径表示法，应该支持 / 和 > 开头，而不仅仅是 / 开头
 # TODO: 对于路径，增加 top_id 和 relpath 字段，表示搜素目录的 id 和相对于搜索路径的相对路径
 # TODO: get_id* 这类方法，应该放在 attr.py，用来获取某个 id 对应的值（根本还是 get_attr）
 # TODO: 创造函数 get_id, get_parent_id, get_ancestors, get_sha1, get_pickcode, get_path 等，支持多种类型的参数，目前已有的名字太长，需要改造，甚至转为私有，另外这些函数或许可以放到另一个包中，attr.py
@@ -46,9 +47,9 @@ from warnings import warn
 from asynctools import to_list
 from concurrenttools import run_as_thread, taskgroup_map, threadpool_map, conmap
 from iterutils import (
-    as_gen_step, bfs_gen, chunked, chain, chain_from_iterable, collect, run_gen_step, 
-    run_gen_step_iter, through, with_iter_next, map as do_map, filter as do_filter, 
-    Yield, YieldFrom, 
+    as_gen_step, bfs_gen, chunked, chain, chain_from_iterable, collect, foreach, 
+    run_gen_step, run_gen_step_iter, through, with_iter_next, map as do_map, 
+    filter as do_filter, Yield, YieldFrom, 
 )
 from iter_collect import iter_keyed_dups, SupportsLT
 from orjson import loads
@@ -135,6 +136,46 @@ def _overview_attr(info: Mapping, /) -> OverviewAttr:
     return OverviewAttr(is_dir, id, pid, name, ctime, mtime)
 
 
+def _update_resp_2_id_to_dirnode(
+    resp: dict, 
+    id_to_dirnode: EllipsisType | MutableMapping[int, tuple[str, int] | DirNode], 
+    /, 
+    error: None | OSError = FileNotFoundError(ENOENT, "not found"), 
+) -> dict:
+    if "path" in resp:
+        if id_to_dirnode is not ...:
+            for info in resp["path"][1:]:
+                id_to_dirnode[int(info["cid"])] = DirNode(info["name"], int(info["pid"]))
+    else:
+        if not resp:
+            if error is None:
+                return resp
+            raise error
+        if "paths" not in resp:
+            check_response(resp)
+            resp = resp["data"]
+            if not resp:
+                if error is None:
+                    return resp
+                raise error
+        if id_to_dirnode is not ...:
+            paths = resp["paths"]
+            info = paths[0]
+            pid = int(info["file_id"])
+            for info in paths[1:]:
+                fid = int(info["file_id"])
+                id_to_dirnode[fid] = DirNode(info["file_name"], pid)
+                pid = fid
+            if not resp["sha1"]:
+                if "file_id" in resp:
+                    fid = int(resp["file_id"])
+                else:
+                    fid = to_id(resp["pick_code"])
+                id_to_dirnode[fid] = DirNode(resp["file_name"], pid)
+    return resp
+
+
+# TODO: 支持 open
 @overload
 def get_path_to_cid(
     client: str | P115Client, 
@@ -368,25 +409,15 @@ def get_file_count(
             return int(resp["count"])
         else:
             resp = yield get_resp_of_category_get(cid)
-            if not resp:
-                raise FileNotFoundError(ENOENT, cid)
-            if "paths" not in resp:
-                check_response(resp)
-                resp = resp["data"]
-                if not resp:
-                    raise FileNotFoundError(ENOENT, cid)
-            if int(resp["file_category"]):
+            resp = _update_resp_2_id_to_dirnode(resp, id_to_dirnode, FileNotFoundError(ENOENT, cid))
+            if resp["sha1"]:
                 resp["cid"] = cid
                 raise NotADirectoryError(ENOTDIR, resp)
-            if id_to_dirnode is not ...:
-                pid = int(resp["paths"][0]["file_id"])
-                for info in resp["paths"][1:]:
-                    node = DirNode(info["file_name"], pid)
-                    id_to_dirnode[(pid := int(info["file_id"]))] = node
             return int(resp["count"]) - int(resp.get("folder_count") or 0)
     return run_gen_step(gen_step, async_)
 
 
+# TODO: 支持 open
 @overload
 def get_ancestors(
     client: str | P115Client, 
@@ -544,22 +575,13 @@ def get_ancestors(
                 return ancestors
             else:
                 resp = yield get_resp_of_category_get(fid)
-                if not resp:
-                    raise FileNotFoundError(ENOENT, attr)
-                if "paths" not in resp:
-                    check_response(resp)
-                    resp = resp["data"]
-                    if not resp:
-                        raise FileNotFoundError(ENOENT, attr)
+                resp = _update_resp_2_id_to_dirnode(resp, id_to_dirnode)
                 for info in resp["paths"]:
                     add_ancestor({
                         "parent_id": pid, 
                         "id": (pid := int(info["file_id"])), 
                         "name": info["file_name"], 
                     })
-                if id_to_dirnode is not ...:
-                    for ans in ancestors[1:]:
-                        id_to_dirnode[ans["id"]] = DirNode(ans["name"], ans["parent_id"])
                 ans = {"id": fid, "parent_id": pid, "name": resp["file_name"]}
                 add_ancestor(ans)
                 if not resp.get("sha1") and id_to_dirnode is not ...:
@@ -583,22 +605,13 @@ def get_ancestors(
                     id_to_dirnode[ans["id"]] = DirNode(ans["name"], ans["parent_id"])
         else:
             resp = yield get_resp_of_category_get(fid)
-            if not resp:
-                raise FileNotFoundError(ENOENT, fid)
-            if "paths" not in resp:
-                check_response(resp)
-                resp = resp["data"]
-                if not resp:
-                    raise FileNotFoundError(ENOENT, fid)
+            resp = _update_resp_2_id_to_dirnode(resp, id_to_dirnode)
             for info in resp["paths"]:
                 add_ancestor({
                     "parent_id": pid, 
                     "id": (pid := int(info["file_id"])), 
                     "name": info["file_name"], 
                 })
-            if id_to_dirnode is not ...:
-                for ans in ancestors[1:]:
-                    id_to_dirnode[ans["id"]] = DirNode(ans["name"], ans["parent_id"])
             ans = {"id": fid, "parent_id": pid, "name": resp["file_name"]}
             add_ancestor(ans)
             if not resp.get("sha1") and id_to_dirnode is not ...:
@@ -607,6 +620,7 @@ def get_ancestors(
     return run_gen_step(gen_step, async_)
 
 
+# TODO: 支持 open
 @overload
 def get_ancestors_to_cid(
     client: str | P115Client, 
@@ -714,7 +728,7 @@ def get_ancestors_to_cid(
 # TODO: 立即支持几种形式，分隔符可以是 / 和 > 或 " > "
 @overload
 def get_id_to_path(
-    client: str | P115Client, 
+    client: str | P115Client | P115OpenClient, 
     path: str | Sequence[str], 
     parent_id: int = 0, 
     ensure_file: None | bool = None, 
@@ -730,7 +744,7 @@ def get_id_to_path(
     ...
 @overload
 def get_id_to_path(
-    client: str | P115Client, 
+    client: str | P115Client | P115OpenClient, 
     path: str | Sequence[str], 
     parent_id: int = 0, 
     ensure_file: None | bool = None, 
@@ -745,7 +759,7 @@ def get_id_to_path(
 ) -> Coroutine[Any, Any, int]:
     ...
 def get_id_to_path(
-    client: str | P115Client, 
+    client: str | P115Client | P115OpenClient, 
     path: str | Sequence[str], 
     parent_id: int = 0, 
     ensure_file: None | bool = None, 
@@ -785,7 +799,7 @@ def get_id_to_path(
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
     error = FileNotFoundError(ENOENT, f"no such path: {path!r}")
     def gen_step():
-        nonlocal ensure_file, parent_id
+        nonlocal ensure_file, parent_id, path
         if isinstance(path, str):
             if path.startswith("/"):
                 parent_id = 0
@@ -816,6 +830,11 @@ def get_id_to_path(
             if ensure_file:
                 raise error
             return parent_id
+        if not isinstance(client, P115Client) or app == "open":
+            path = ">" + ">".join(patht)
+            resp = yield client.fs_info_open(path, async_=async_, **request_kwargs)
+            data = _update_resp_2_id_to_dirnode(resp, id_to_dirnode)
+            return P115ID(data["file_id"], data, about="path", path=path)
         i = 0
         start_parent_id = parent_id
         if not refresh and id_to_dirnode and id_to_dirnode is not ...:
@@ -906,12 +925,11 @@ def get_id_to_path(
     return run_gen_step(gen_step, async_)
 
 
-# TODO: 支持 open 接口
 @overload
 def get_id_to_sha1(
-    client: str | P115Client, 
+    client: str | P115Client | P115OpenClient, 
     sha1: str, 
-    app: str = "web", 
+    app: str = "", 
     *, 
     async_: Literal[False] = False, 
     **request_kwargs, 
@@ -919,18 +937,18 @@ def get_id_to_sha1(
     ...
 @overload
 def get_id_to_sha1(
-    client: str | P115Client, 
+    client: str | P115Client | P115OpenClient, 
     sha1: str, 
-    app: str = "web", 
+    app: str = "", 
     *, 
     async_: Literal[True], 
     **request_kwargs, 
 ) -> Coroutine[Any, Any, P115ID]:
     ...
 def get_id_to_sha1(
-    client: str | P115Client, 
+    client: str | P115Client | P115OpenClient, 
     sha1: str, 
-    app: str = "web", 
+    app: str = "", 
     *, 
     async_: Literal[False, True] = False, 
     **request_kwargs, 
@@ -951,12 +969,18 @@ def get_id_to_sha1(
         client = P115Client(client, check_for_relogin=True)
     def gen_step():
         file_sha1 = sha1.upper()
-        if app in ("", "web", "desktop", "harmony"):
+        if app == "" and isinstance(client, P115Client):
             resp = yield client.fs_shasearch(sha1, async_=async_, **request_kwargs)
             check_response(resp)
             data = resp["data"]
         else:
-            resp = yield client.fs_search_app(sha1, async_=async_, **request_kwargs)
+            if not isinstance(client, P115Client) or app == "open":
+                search: Callable = client.fs_search_open
+            elif app in ("", "web", "desktop", "harmony"):
+                search = client.fs_search
+            else:
+                search = partial(client.fs_search_app, app=app)
+            resp = yield search(sha1, async_=async_, **request_kwargs)
             check_response(resp)
             for data in resp["data"]:
                 if data["sha1"] == file_sha1:
@@ -967,7 +991,6 @@ def get_id_to_sha1(
     return run_gen_step(gen_step, async_)
 
 
-
 @overload
 def share_get_id_to_path(
     client: str | P115Client, 
@@ -1277,37 +1300,29 @@ def ensure_attr_path[D: dict](
                 ancestors = get_ancestors(pid, id_to_dirnode[pid])
             ancestors.append(me)
             return ancestors
-    @as_gen_step
-    def ensure_path(attr: dict, /):
-        id  = attr["id"]
-        pid = attr["parent_id"]
-        while pid and pid in id_to_dirnode:
-            pid = id_to_dirnode[pid][1]
-        if pid and pid not in dangling_id_to_name:
-            cur_id = pid
-            resp = yield get_info(pid, async_=async_, **request_kwargs)
-            if app == "open":
-                check_response(resp)
-                resp = resp["data"] 
-            if not resp:
-                dangling_id_to_name[pid] = ""
-                return attr
-            paths = resp["paths"]
-            info: dict = paths[0]
-            if pid := int(info["file_id"]):
-                dangling_id_to_name[pid] = info["file_name"]
-            for info in paths[1:]:
-                fid = int(info["file_id"])
-                id_to_dirnode[fid] = DirNode(info["file_name"], pid)
-                pid = fid
-            id_to_dirnode[pid] = DirNode(resp["file_name"], pid)
-            if not resp["sha1"]:
-                id_to_dirnode[cur_id] = DirNode(resp["file_name"], pid)
-        attr["path"] = get_path(attr)
-        if with_ancestors:
-            attr["ancestors"] = get_ancestors(id, attr)
-        return attr
-    return do_map(ensure_path, attrs)
+    def gen_step():
+        with with_iter_next(attrs) as get_next:
+            while True:
+                attr = yield get_next()
+                id   = attr["id"]
+                pid  = attr["parent_id"]
+                while pid and pid in id_to_dirnode:
+                    pid = id_to_dirnode[pid][1]
+                if pid and pid not in dangling_id_to_name:
+                    resp = yield get_info(pid, async_=async_, **request_kwargs)
+                    resp = _update_resp_2_id_to_dirnode(resp, id_to_dirnode, None)
+                    if not resp:
+                        dangling_id_to_name[pid] = ""
+                        yield Yield(attr)
+                        return
+                    info = resp["paths"][0]
+                    if pid := int(info["file_id"]):
+                        dangling_id_to_name[pid] = info["file_name"]
+                attr["path"] = get_path(attr)
+                if with_ancestors:
+                    attr["ancestors"] = get_ancestors(id, attr)
+                yield Yield(attr)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -1423,7 +1438,6 @@ def ensure_attr_path_using_star_event[D: dict](
                 ancestors = get_ancestors(pid, id_to_dirnode[pid])
             ancestors.append(me)
             return ancestors
-
     def gen_step():
         cache: Sequence[dict]
         if id_to_dirnode:
@@ -1586,26 +1600,25 @@ def _iter_fs_files(
         with_dirname = False
     if with_dirname:
         pid_to_name = {0: ""}
-        def get_pid(info: dict, /):
+        def get_pid(info: dict, /) -> int:
             for key in ("parent_id", "pid", "cid"):
                 if key in info:
                     return int(info[key])
             raise KeyError("parent_id", "pid", "cid")
-        @as_gen_step
+        setitem = pid_to_name.__setitem__
         def callback(resp: dict, /):
-            pids = (
-                pid for info in resp["data"] 
-                if (pid := get_pid(info)) and pid not in pid_to_name
+            return foreach(
+                lambda info: setitem(info["file_id"], info["file_name"]), 
+                iter_nodes_skim(
+                    cast(P115Client, client), 
+                    (
+                        pid for info in resp["data"] 
+                        if (pid := get_pid(info)) and pid not in pid_to_name
+                    ), 
+                    async_=async_, 
+                    **request_kwargs, 
+                )
             )
-            with with_iter_next(iter_nodes_skim(
-                cast(P115Client, client), 
-                pids, 
-                async_=async_, 
-                **request_kwargs, 
-            )) as get_next:
-                while True:
-                    info = yield get_next()
-                    pid_to_name[info["file_id"]] = info["file_name"]
         request_kwargs["callback"] = callback
     def gen_step():
         if cooldown <= 0 or max_workers == 1:
@@ -1937,7 +1950,7 @@ def iter_dirs(
 def iter_dirs_with_path(
     client: str | P115Client, 
     cid: int | str = 0, 
-    with_ancestors: bool = True, 
+    with_ancestors: bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     app: str = "android", 
@@ -1951,7 +1964,7 @@ def iter_dirs_with_path(
 def iter_dirs_with_path(
     client: str | P115Client, 
     cid: int | str = 0, 
-    with_ancestors: bool = True, 
+    with_ancestors: bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     app: str = "android", 
@@ -1964,7 +1977,7 @@ def iter_dirs_with_path(
 def iter_dirs_with_path(
     client: str | P115Client, 
     cid: int | str = 0, 
-    with_ancestors: bool = True, 
+    with_ancestors: bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     app: str = "android", 
@@ -2168,7 +2181,7 @@ def iter_files_with_path(
     cur: Literal[0, 1] = 0, 
     normalize_attr: None | Callable[[dict], dict] = normalize_attr, 
     escape: None | bool | Callable[[str], str] = True, 
-    with_ancestors: bool = True, 
+    with_ancestors: bool = False, 
     id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     path_already: bool = False, 
     raise_for_changed_count: bool = False, 
@@ -2192,7 +2205,7 @@ def iter_files_with_path(
     cur: Literal[0, 1] = 0, 
     normalize_attr: None | Callable[[dict], dict] = normalize_attr, 
     escape: None | bool | Callable[[str], str] = True, 
-    with_ancestors: bool = True, 
+    with_ancestors: bool = False, 
     id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     path_already: bool = False, 
     raise_for_changed_count: bool = False, 
@@ -2215,7 +2228,7 @@ def iter_files_with_path(
     cur: Literal[0, 1] = 0, 
     normalize_attr: None | Callable[[dict], dict] = normalize_attr, 
     escape: None | bool | Callable[[str], str] = True, 
-    with_ancestors: bool = True, 
+    with_ancestors: bool = False, 
     id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     path_already: bool = False, 
     raise_for_changed_count: bool = False, 
@@ -2296,6 +2309,7 @@ def iter_files_with_path(
         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(
@@ -2318,7 +2332,7 @@ def iter_files_with_path(
                 )) as get_next:
                     while True:
                         attr = yield get_next()
-                        yield run_gen_step(fetch_dirs(attr["pickcode"]), async_)
+                        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]:
@@ -2366,9 +2380,9 @@ def iter_files_with_path(
         add_to_cache = cache.append
         if not path_already:
             if async_:
-                task: Any = create_task(run_gen_step(fetch_dirs(cid), True))
+                task: Any = create_task(fetch_dirs(cid))
             else:
-                task = run_as_thread(run_gen_step, fetch_dirs(cid))
+                task = run_as_thread(fetch_dirs, cid)
             task.add_done_callback(set_path_already)
         with with_iter_next(iter_files(
             client, 
@@ -2417,7 +2431,7 @@ def iter_files_with_path(
 def iter_files_with_path_skim(
     client: str | P115Client, 
     cid: int | str = 0, 
-    with_ancestors: bool = True, 
+    with_ancestors: bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     path_already: bool = False, 
@@ -2432,7 +2446,7 @@ def iter_files_with_path_skim(
 def iter_files_with_path_skim(
     client: str | P115Client, 
     cid: int | str = 0, 
-    with_ancestors: bool = True, 
+    with_ancestors: bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     path_already: bool = False, 
@@ -2446,7 +2460,7 @@ def iter_files_with_path_skim(
 def iter_files_with_path_skim(
     client: str | P115Client, 
     cid: int | str = 0, 
-    with_ancestors: bool = True, 
+    with_ancestors: bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     path_already: bool = False, 
@@ -3047,13 +3061,7 @@ def iter_nodes_using_info(
             return None
         check_response(resp)
         if id_to_dirnode is not ...:
-            pid = int(resp["paths"][0]["file_id"])
-            for info in resp["paths"][1:]:
-                fid = int(info["file_id"])
-                id_to_dirnode[fid] = DirNode(info["file_name"], pid)
-                pid = fid
-            if resp["is_dir"]:
-                id_to_dirnode[resp["id"]] = DirNode(resp["name"], pid)
+            _update_resp_2_id_to_dirnode(resp, id_to_dirnode)
         return resp
     return do_filter(None, do_map(
         project, 

{p115client-0.0.5.13.dist-info → p115client-0.0.5.13.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.13
+Version: 0.0.5.13.2
 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.1)
+Requires-Dist: p115pickcode (>=0.0.2)
 Requires-Dist: posixpatht (>=0.0.3)
 Requires-Dist: python-argtools (>=0.0.1)
 Requires-Dist: python-asynctools (>=0.1.3)

{p115client-0.0.5.13.dist-info → p115client-0.0.5.13.2.dist-info}/RECORD

@@ -8,12 +8,12 @@ p115client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 p115client/tool/__init__.py,sha256=IwwzbCQ7jpRoFGTQUCfGBx8zvjqjgSFs98yKpYyI46s,429
 p115client/tool/attr.py,sha256=G91V71EhsqIIPkhGDnv2z6nxVq7wgl6nNPDj3AKzw1I,3079
 p115client/tool/auth.py,sha256=qlRcfEjzebseiHR2dyBpOoPpxB4k8P6Tj729S2TLB1s,1672
-p115client/tool/download.py,sha256=JGw_AW4qe2Uor9tmbh2ve4wFGhKyO9n26bPG8lsJmpc,64980
+p115client/tool/download.py,sha256=sRp0Jt9PeQjBMlMqTF-1TBR898tuYBWMLzYeR4W190A,65149
 p115client/tool/edit.py,sha256=eAlINrXEAwAwliZFako5vrne_sLmxEyBr1Bk05YZsAc,17332
-p115client/tool/export_dir.py,sha256=jq097N2Crlz4JUFgbqTUZfq8pD3fNjxQOJxDPEMN31I,24491
-p115client/tool/fs_files.py,sha256=3t1R-bDUdIUGwLMZ-GhHMRpYnkYYLcsI3MzFhJzg8g8,15890
+p115client/tool/export_dir.py,sha256=jPD4VP0kbJ1MW9CDgUcInSmt0aJejhn257x30Sm3hss,23557
+p115client/tool/fs_files.py,sha256=4L81eiWblAgURIz8pC6_Dun3MKjWBY05qkn6jDv9qUY,15837
 p115client/tool/history.py,sha256=9pgF9l8VvQkpjsVgtIzNcrUQZzLH9tt4JysBwJ4yHsk,11636
-p115client/tool/iterdir.py,sha256=_oYETYMpeSEBW5t6A6RNMs0-owz4IjJEUV5Tw23zOPw,161383
+p115client/tool/iterdir.py,sha256=SiFfjOuE4HMLsGfy5b3psiIlWMDjv2F5g3mK2eI7gY8,161857
 p115client/tool/life.py,sha256=dfwm5jKfo0K9pIUZKpZ32oPBrlcfrezflSJyyDIbX8E,17721
 p115client/tool/offline.py,sha256=6HaGkbsAAx3FPFvSr_7LZvrUw_fp3QRB2y2kVRHNgZ0,6291
 p115client/tool/pool.py,sha256=PImYG4fU7retZVFDPYib9e87J3RvJvugOW1mxX9jSU0,13831
@@ -22,7 +22,7 @@ p115client/tool/upload.py,sha256=dpww3TGSOyjqz1EogQEJDiZ9QWERd47izZOw9mNCCiA,329
 p115client/tool/util.py,sha256=gvA-o-TcEAR3o754Kn82Bu6yggmnAhScUCrRpMVCI50,3934
 p115client/tool/xys.py,sha256=r9wzE5VgpR6ATYHM1uVZ06uIU4qqVeDyRTYU6W_N_Tc,10190
 p115client/type.py,sha256=h_pGKTlz07g64Y_93ylF-fUyC8g-HiQacMhu4KOXjYA,6457
-p115client-0.0.5.13.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client-0.0.5.13.dist-info/METADATA,sha256=pOvhK7Guy2Pj3uLoq3e8EHWPeBc7RLqts8zENd9Q14k,8226
-p115client-0.0.5.13.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p115client-0.0.5.13.dist-info/RECORD,,
+p115client-0.0.5.13.2.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.13.2.dist-info/METADATA,sha256=9rvUKsIxlIaPJXTyV2pOP8yEhqRmJr4p8VHv_06tSJI,8228
+p115client-0.0.5.13.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.13.2.dist-info/RECORD,,