p115client 0.0.5.10.2__py3-none-any.whl → 0.0.5.10.4__py3-none-any.whl

p115client/tool/iterdir.py

@@ -8,8 +8,8 @@ __all__ = [
     "iter_nodes_skim", "iter_stared_dirs_raw", "iter_stared_dirs", "ensure_attr_path", 
     "ensure_attr_path_by_category_get", "iterdir_raw", "iterdir", "iterdir_limited", 
     "iter_files_raw", "iter_files", "traverse_files", "iter_dirs", "iter_dupfiles", 
-    "iter_image_files", "share_iterdir", "share_iter_files", "iter_selected_nodes", 
-    "iter_selected_nodes_by_pickcode", "iter_selected_nodes_using_category_get", 
+    "iter_image_files", "share_iterdir", "share_iter_files", "share_get_id_to_path", 
+    "iter_selected_nodes", "iter_selected_nodes_by_pickcode", "iter_selected_nodes_using_category_get", 
     "iter_selected_nodes_using_edit", "iter_selected_nodes_using_star_event", 
     "iter_selected_dirs_using_star", "iter_files_with_dirname", "iter_files_with_path", 
     "iter_files_with_path_by_export_dir", "iter_parents_3_level", "iter_dir_nodes", 
@@ -104,7 +104,7 @@ class OverviewAttr:
 
 
 #: 用于缓存每个用户（根据用户 id 区别）的每个目录 id 到所对应的 (名称, 父id) 的元组的字典的字典
-ID_TO_DIRNODE_CACHE: Final[defaultdict[int, dict[int, tuple[str, int] | DirNode]]] = defaultdict(dict)
+ID_TO_DIRNODE_CACHE: Final[defaultdict[int | tuple[int, str], dict[int, tuple[str, int] | DirNode]]] = defaultdict(dict)
 
 
 def _overview_attr(info: Mapping, /) -> OverviewAttr:
@@ -117,8 +117,8 @@ def _overview_attr(info: Mapping, /) -> OverviewAttr:
         else:
             id = int(info["fid"])
             pid = int(info["cid"])
-        ctime = int(info["tp"])
-        mtime = int(info["te"])
+        ctime = int(info.get("tp") or info["t"])
+        mtime = int(info.get("te") or info["t"])
     elif "fn" in info:
         is_dir = info["fc"] == "0"
         name = info["fn"]
@@ -596,18 +596,18 @@ def get_ancestors_to_cid(
     return run_gen_step(gen_step, async_=async_)
 
 
-
-
 # TODO: 使用 search 接口以在特定目录之下搜索某个名字，以便减少风控
 @overload
 def get_id_to_path(
     client: str | P115Client, 
     path: str | Sequence[str], 
+    parent_id: int = 0, 
     ensure_file: None | bool = None, 
     is_posixpath: bool = False, 
     refresh: bool = False, 
     id_to_dirnode: None | dict[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
+    dont_use_getid: bool = False, 
     *, 
     async_: Literal[False] = False, 
     **request_kwargs, 
@@ -617,11 +617,13 @@ def get_id_to_path(
 def get_id_to_path(
     client: str | P115Client, 
     path: str | Sequence[str], 
+    parent_id: int = 0, 
     ensure_file: None | bool = None, 
     is_posixpath: bool = False, 
     refresh: bool = False, 
     id_to_dirnode: None | dict[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
+    dont_use_getid: bool = False, 
     *, 
     async_: Literal[True], 
     **request_kwargs, 
@@ -630,11 +632,13 @@ def get_id_to_path(
 def get_id_to_path(
     client: str | P115Client, 
     path: str | Sequence[str], 
+    parent_id: int = 0, 
     ensure_file: None | bool = None, 
     is_posixpath: bool = False, 
     refresh: bool = False, 
     id_to_dirnode: None | dict[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
+    dont_use_getid: bool = False, 
     *, 
     async_: Literal[False, True] = False, 
     **request_kwargs, 
@@ -643,6 +647,7 @@ def get_id_to_path(
 
     :param client: 115 客户端或 cookies
     :param path: 路径
+    :param parent_id: 上级目录的 id
     :param ensure_file: 是否确保为文件
 
         - True: 必须是文件
@@ -653,6 +658,7 @@ def get_id_to_path(
     :param refresh: 是否刷新。如果为 True，则会执行网络请求以查询；如果为 False，则直接从 `id_to_dirnode` 中获取
     :param id_to_dirnode: 字典，保存 id 到对应文件的 `DirNode(name, parent_id)` 命名元组的字典
     :param app: 使用某个 app （设备）的接口
+    :param dont_use_getid: 不要使用 `client.fs_dir_getid` 或 `client.fs_dir_getid_app`，以便 `id_to_dirnode` 有缓存
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
 
@@ -664,178 +670,124 @@ 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 client, ensure_file
-        if not isinstance(path, str):
-            patht = ["", *filter(None, path)]
-            if len(patht) == 1:
-                return 0
-            if is_posixpath:
-                for i in range(1, len(patht)):
-                    patht[i] = patht[i].replace("/", "|")
-        elif path in (".", "..", "/"):
-            if ensure_file:
-                raise error
-            return 0
-        elif path.startswith("根目录 > "):
-            patht = path.split(" > ")
-            patht[0] = ""
-            if is_posixpath:
-                for i in range(1, len(patht)):
-                    patht[i] = patht[i].replace("/", "|")
-        elif is_posixpath:
-            if ensure_file is None and path.endswith("/"):
-                ensure_file = False
-            patht = ["", *filter(None, path.split("/"))]
+        nonlocal ensure_file, parent_id
+        if isinstance(path, str):
+            if path.startswith("/"):
+                parent_id = 0
+            if path in (".", "..", "/"):
+                if ensure_file:
+                    raise error
+                return parent_id
+            elif path.startswith("根目录 > "):
+                parent_id = 0
+                patht = path.split(" > ")[1:]
+            elif is_posixpath:
+                if ensure_file is None and path.endswith("/"):
+                    ensure_file = False
+                patht = [p for p in path.split("/") if p]
+            else:
+                if ensure_file is None and path_is_dir_form(path):
+                    ensure_file = False
+                patht, _ = splits(path.lstrip("/"))
         else:
-            if ensure_file is None and path_is_dir_form(path):
-                ensure_file = False
-            patht, _ = splits("/" + path)
-        if len(patht) == 1:
+            if path and not path[0]:
+                parent_id = 0
+                patht = list(path[1:])
+            else:
+                patht = [p for p in path if p]
+            if not patht:
+                return parent_id
+        if not patht:
             if ensure_file:
                 raise error
-            return 0
-        stop = len(patht) - bool(ensure_file)
-        obj = "|" if is_posixpath else "/"
-        for i in range(stop):
-            if obj in patht[i]:
-                break
-        else:
-            i += 1
-        j = 1
-        pid = 0
-        if stop > 1 and not refresh and id_to_dirnode:
-            if stop == 2:
-                if is_posixpath:
-                    needle = (patht[1].replace("/", "|"), pid)
-                else:
-                    needle = (patht[1], pid)
-                for k, t in id_to_dirnode.items():
-                    if is_posixpath:
-                        t = (t[0].replace("/", "|"), t[1])
-                    if t == needle:
-                        pid = k
-                        j = 2
-            else:
-                if is_posixpath:
-                    table = {(n.replace("/", "|"), pid): k for k, (n, pid) in id_to_dirnode.items()}
+            return parent_id
+        i = 0
+        start_parent_id = parent_id
+        if not refresh and id_to_dirnode and id_to_dirnode is not ...:
+            if i := len(patht) - bool(ensure_file):
+                obj = "|" if is_posixpath else "/"
+                for i in range(i):
+                    if obj in patht[i]:
+                        break
                 else:
-                    table = {cast(tuple[str, int], tuple(t)): k for k, t in id_to_dirnode.items()}
-                try:
-                    for j in range(1, stop):
-                        if is_posixpath:
-                            needle = (patht[j].replace("/", "|"), pid)
-                        else:
-                            needle = (patht[j], pid)
-                        pid = table[needle]
-                    j += 1
-                except KeyError:
-                    pass
-        if j >= i:
-            i = j
-            cid = pid
-        else:
-            if ensure_file and len(patht) == i:
-                i -= 1
-            if app in ("", "web", "desktop", "harmony"):
-                fs_dir_getid: Callable = client.fs_dir_getid
-            else:
-                fs_dir_getid = partial(client.fs_dir_getid_app, app=app)
-            cid = 0
-            while i > 1:
-                dirname = "/".join(patht[:i])
-                resp = yield fs_dir_getid(dirname, async_=async_, **request_kwargs)
-                if not (resp["state"] and (cid := resp["id"])):
-                    if len(patht) == i and ensure_file is None:
-                        ensure_file = True
-                        i -= 1
-                        continue
-                    raise error
-                cid = int(cid)
-                if not refresh and cid not in id_to_dirnode:
-                    yield get_path_to_cid(
-                        client, 
-                        cid, 
-                        id_to_dirnode=id_to_dirnode, 
-                        app=app, 
-                        async_=async_, 
-                        **request_kwargs, 
-                    )
-                break
-        if len(patht) == i:
-            return cid
-        for name in patht[i:-1]:
-            if async_:
-                async def request():
-                    nonlocal cid
-                    async for info in iterdir_raw(
-                        client, 
-                        cid, 
-                        ensure_file=False, 
-                        app=app, 
-                        id_to_dirnode=id_to_dirnode, 
-                        async_=True, 
-                        **request_kwargs, 
-                    ):
-                        attr = _overview_attr(info)
-                        if (attr.name.replace("/", "|") if is_posixpath else attr.name) == name:
-                            cid = attr.id
+                    i += 1
+            if i:
+                for i in range(i):
+                    needle = (patht[i], parent_id)
+                    for fid, key in id_to_dirnode.items():
+                        if needle == key:
+                            parent_id = fid
                             break
                     else:
-                        raise error
-                yield request
-            else:
-                for info in iterdir_raw(
-                    client, 
-                    cid, 
-                    ensure_file=False, 
-                    app=app, 
-                    id_to_dirnode=id_to_dirnode, 
-                    **request_kwargs, 
-                ):
-                    attr = _overview_attr(info)
-                    if (attr.name.replace("/", "|") if is_posixpath else attr.name) == name:
-                        cid = attr.id
                         break
                 else:
-                    raise error
-        name = patht[-1]
-        if async_:
-            async def request():
-                async for info in iterdir_raw(
-                    client, 
-                    cid, 
-                    app=app, 
-                    id_to_dirnode=id_to_dirnode, 
-                    async_=True, 
-                    **request_kwargs, 
-                ):
-                    attr = _overview_attr(info)
-                    if (attr.name.replace("/", "|") if is_posixpath else attr.name) == name:
-                        if ensure_file:
-                            if not attr.is_dir:
-                                return P115ID(attr.id, info, about="path")
-                        elif attr.is_dir:
-                            return P115ID(attr.id, info, about="path")
+                    i += 1
+        if i == len(patht):
+            return parent_id
+        if not start_parent_id:
+            stop = 0
+            if j := len(patht) - bool(ensure_file):
+                for stop, part in enumerate(patht[:j]):
+                    if "/" in part:
+                        break
                 else:
-                    raise error
-            return (yield request)
-        else:
-            for info in iterdir_raw(
+                    stop += 1
+            if not dont_use_getid:
+                while stop > i:
+                    if app in ("", "web", "desktop", "harmony"):
+                        fs_dir_getid: Callable = client.fs_dir_getid
+                    else:
+                        fs_dir_getid = partial(client.fs_dir_getid_app, app=app)
+                    dirname = "/".join(patht[:stop])
+                    resp = yield fs_dir_getid(dirname, async_=async_, **request_kwargs)
+                    check_response(resp)
+                    cid = int(resp["id"])
+                    if not cid:
+                        if stop == len(patht) and ensure_file is None:
+                            stop -= 1
+                            continue
+                        raise error
+                    parent_id = cid
+                    i = stop
+                    break
+        if i == len(patht):
+            return parent_id
+        for name in patht[i:-1]:
+            if is_posixpath:
+                name = name.replace("/", "|")
+            with with_iter_next(iterdir(
                 client, 
-                cid, 
+                parent_id, 
+                ensure_file=False, 
                 app=app, 
                 id_to_dirnode=id_to_dirnode, 
+                async_=async_, 
                 **request_kwargs, 
-            ):
-                attr = _overview_attr(info)
-                if (attr.name.replace("/", "|") if is_posixpath else attr.name) == name:
-                    if ensure_file:
-                        if not attr.is_dir:
-                            return P115ID(attr.id, info, about="path")
-                    elif attr.is_dir:
-                        return P115ID(attr.id, info, about="path")
-            else:
-                raise error
+            )) as get_next:
+                found = False
+                while not found:
+                    attr = yield get_next
+                    found = (attr["name"].replace("/", "|") if is_posixpath else attr["name"]) == name
+                    parent_id = attr["id"]
+                if not found:
+                    raise error
+        name = patht[-1]
+        if is_posixpath:
+            name = name.replace("/", "|")
+        with with_iter_next(iterdir(
+            client, 
+            parent_id, 
+            app=app, 
+            id_to_dirnode=id_to_dirnode, 
+            async_=async_, 
+            **request_kwargs, 
+        )) as get_next:
+            while True:
+                attr = yield get_next
+                if (attr["name"].replace("/", "|") if is_posixpath else attr["name"]) == name:
+                    if ensure_file is None or ensure_file ^ attr["is_dir"]:
+                        return P115ID(attr["id"], attr, about="path")
+        raise error
     return run_gen_step(gen_step, async_=async_)
 
 
@@ -1135,6 +1087,11 @@ def _iter_fs_files(
                         pid, name = int(info["cid"]), info["name"]
                         id_to_dirnode[pid] = DirNode(name, int(info["pid"]))
                 if ensure_file is None:
+                    if id_to_dirnode is not ...:
+                        for info in resp["data"]:
+                            attr = _overview_attr(info)
+                            if attr.is_dir:
+                                id_to_dirnode[attr.id] = DirNode(attr.name, attr.parent_id)
                     yield YieldFrom(resp["data"], identity=True)
                 else:
                     for info in resp["data"]:
@@ -3118,6 +3075,7 @@ def share_iterdir(
     order: Literal["file_name", "file_size", "file_type", "user_utime", "user_ptime", "user_otime"] = "user_ptime", 
     asc: Literal[0, 1] = 1, 
     normalize_attr: None | Callable[[dict], dict] = normalize_attr, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     *, 
     async_: Literal[False] = False, 
     **request_kwargs, 
@@ -3133,6 +3091,7 @@ def share_iterdir(
     order: Literal["file_name", "file_size", "file_type", "user_utime", "user_ptime", "user_otime"] = "user_ptime", 
     asc: Literal[0, 1] = 1, 
     normalize_attr: None | Callable[[dict], dict] = normalize_attr, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     *, 
     async_: Literal[True], 
     **request_kwargs, 
@@ -3147,6 +3106,7 @@ def share_iterdir(
     order: Literal["file_name", "file_size", "file_type", "user_utime", "user_ptime", "user_otime"] = "user_ptime", 
     asc: Literal[0, 1] = 1, 
     normalize_attr: None | Callable[[dict], dict] = normalize_attr, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     *, 
     async_: Literal[False, True] = False, 
     **request_kwargs, 
@@ -3169,6 +3129,7 @@ def share_iterdir(
 
     :param asc: 升序排列。0: 否，1: 是
     :param normalize_attr: 把数据进行转换处理，使之便于阅读
+    :param id_to_dirnode: 字典，保存 id 到对应文件的 `DirNode(name, parent_id)` 命名元组的字典
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
 
@@ -3176,7 +3137,9 @@ def share_iterdir(
     """
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
-    if page_size < 0:
+    if id_to_dirnode is None:
+        id_to_dirnode = ID_TO_DIRNODE_CACHE[(client.user_id, share_code)]
+    if page_size <= 0:
         page_size = 10_000
     def gen_step():
         nonlocal receive_code
@@ -3202,6 +3165,10 @@ def share_iterdir(
             for attr in resp["data"]["list"]:
                 attr["share_code"] = share_code
                 attr["receive_code"] = receive_code
+                if id_to_dirnode is not ...:
+                    oattr = _overview_attr(attr)
+                    if oattr.is_dir:
+                        id_to_dirnode[oattr.id] = DirNode(oattr.name, oattr.parent_id)
                 if normalize_attr is not None:
                     attr = normalize_attr(attr)
                 yield Yield(attr, identity=True)
@@ -3216,6 +3183,7 @@ def share_iter_files(
     client: str | P115Client, 
     share_link: str, 
     receive_code: str = "", 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     *, 
     async_: Literal[False] = False, 
     **request_kwargs, 
@@ -3226,6 +3194,7 @@ def share_iter_files(
     client: str | P115Client, 
     share_link: str, 
     receive_code: str = "", 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     *, 
     async_: Literal[True], 
     **request_kwargs, 
@@ -3235,6 +3204,7 @@ def share_iter_files(
     client: str | P115Client, 
     share_link: str, 
     receive_code: str = "", 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None,  
     *, 
     async_: Literal[False, True] = False, 
     **request_kwargs, 
@@ -3274,6 +3244,7 @@ def share_iter_files(
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def gen_step():
+        nonlocal id_to_dirnode
         payload: dict = cast(dict, share_extract_payload(share_link))
         if receive_code:
             payload["receive_code"] = receive_code
@@ -3281,7 +3252,10 @@ def share_iter_files(
             resp = yield client.share_info(payload["share_code"], async_=async_, **request_kwargs)
             check_response(resp)
             payload["receive_code"] = resp["data"]["receive_code"]
+        if id_to_dirnode is None:
+            id_to_dirnode = ID_TO_DIRNODE_CACHE[(client.user_id, payload["share_code"])]
         payload["cid"] = 0
+        payload["id_to_dirnode"] = id_to_dirnode
         it = share_iterdir(client, **payload, async_=async_, **request_kwargs)
         do_next: Callable = anext if async_ else next
         try:
@@ -3307,6 +3281,176 @@ def share_iter_files(
     return run_gen_step(gen_step, async_=async_)
 
 
+@overload
+def share_get_id_to_path(
+    client: str | P115Client, 
+    share_code: str, 
+    receive_code: str = "", 
+    path: str | Sequence[str] = "", 
+    parent_id: int = 0, 
+    ensure_file: None | bool = None, 
+    is_posixpath: bool = False, 
+    refresh: bool = False, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> int:
+    ...
+@overload
+def share_get_id_to_path(
+    client: str | P115Client, 
+    share_code: str, 
+    receive_code: str = "", 
+    path: str | Sequence[str] = "", 
+    parent_id: int = 0, 
+    ensure_file: None | bool = None, 
+    is_posixpath: bool = False, 
+    refresh: bool = False, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> Coroutine[Any, Any, int]:
+    ...
+def share_get_id_to_path(
+    client: str | P115Client, 
+    share_code: str, 
+    receive_code: str = "", 
+    path: str | Sequence[str] = "", 
+    parent_id: int = 0, 
+    ensure_file: None | bool = None, 
+    is_posixpath: bool = False, 
+    refresh: bool = False, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> int | Coroutine[Any, Any, int]:
+    """对分享链接，获取路径对应的 id
+
+    :param client: 115 客户端或 cookies
+    :param share_code: 分享码
+    :param receive_code: 密码
+    :param path: 路径
+    :param parent_id: 上级目录的 id
+    :param ensure_file: 是否确保为文件
+
+        - True: 必须是文件
+        - False: 必须是目录
+        - None: 可以是目录或文件
+
+    :param is_posixpath: 使用 posixpath，会把 "/" 转换为 "|"，因此解析的时候，会对 "|" 进行特别处理
+    :param refresh: 是否刷新。如果为 True，则会执行网络请求以查询；如果为 False，则直接从 `id_to_dirnode` 中获取
+    :param id_to_dirnode: 字典，保存 id 到对应文件的 `DirNode(name, parent_id)` 命名元组的字典
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 文件或目录的 id
+    """
+    if isinstance(client, str):
+        client = P115Client(client, check_for_relogin=True)
+    if id_to_dirnode is None:
+        id_to_dirnode = ID_TO_DIRNODE_CACHE[(client.user_id, share_code)]
+    error = FileNotFoundError(ENOENT, f"no such path: {path!r}")
+    def gen_step():
+        nonlocal ensure_file, parent_id, receive_code
+        if isinstance(path, str):
+            if path.startswith("/"):
+                parent_id = 0
+            if path in (".", "..", "/"):
+                if ensure_file:
+                    raise error
+                return parent_id
+            elif path.startswith("根目录 > "):
+                parent_id = 0
+                patht = path.split(" > ")[1:]
+            elif is_posixpath:
+                if ensure_file is None and path.endswith("/"):
+                    ensure_file = False
+                patht = [p for p in path.split("/") if p]
+            else:
+                if ensure_file is None and path_is_dir_form(path):
+                    ensure_file = False
+                patht, _ = splits(path.lstrip("/"))
+        else:
+            if path and not path[0]:
+                parent_id = 0
+                patht = list(path[1:])
+            else:
+                patht = [p for p in path if p]
+            if not patht:
+                return parent_id
+        if not patht:
+            if ensure_file:
+                raise error
+            return parent_id
+        if not receive_code:
+            resp = yield client.share_info(share_code, async_=async_, **request_kwargs)
+            check_response(resp)
+            receive_code = resp["data"]["receive_code"]
+        i = 0
+        if not refresh and id_to_dirnode and id_to_dirnode is not ...:
+            if i := len(patht) - bool(ensure_file):
+                obj = "|" if is_posixpath else "/"
+                for i in range(i):
+                    if obj in patht[i]:
+                        break
+                else:
+                    i += 1
+            if i:
+                for i in range(i):
+                    needle = (patht[i], parent_id)
+                    for fid, key in id_to_dirnode.items():
+                        if needle == key:
+                            parent_id = fid
+                            break
+                    else:
+                        break
+                else:
+                    i += 1
+        if i == len(patht):
+            return parent_id
+        for name in patht[i:-1]:
+            if is_posixpath:
+                name = name.replace("/", "|")
+            with with_iter_next(share_iterdir(
+                client, 
+                share_code, 
+                receive_code=receive_code, 
+                cid=parent_id, 
+                id_to_dirnode=id_to_dirnode, 
+                async_=async_, 
+                **request_kwargs, 
+            )) as get_next:
+                found = False
+                while not found:
+                    attr = yield get_next
+                    found = attr["is_dir"] and (attr["name"].replace("/", "|") if is_posixpath else attr["name"]) == name
+                    parent_id = attr["id"]
+            if not found:
+                raise error
+        name = patht[-1]
+        if is_posixpath:
+            name = name.replace("/", "|")
+        with with_iter_next(share_iterdir(
+            client, 
+            share_code, 
+            receive_code=receive_code, 
+            cid=parent_id, 
+            id_to_dirnode=id_to_dirnode, 
+            async_=async_, 
+            **request_kwargs, 
+        )) as get_next:
+            while True:
+                attr = yield get_next
+                if (attr["name"].replace("/", "|") if is_posixpath else attr["name"]) == name:
+                    if ensure_file is None or ensure_file ^ attr["is_dir"]:
+                        return P115ID(attr["id"], attr, about="path")
+        raise error
+    return run_gen_step(gen_step, async_=async_)
+
+
 @overload
 def iter_selected_nodes(
     client: str | P115Client, 

p115client/tool/pool.py

@@ -24,7 +24,7 @@ from p115client import check_response, P115Client
 from p115client.const import AVAILABLE_APP_IDS
 from p115client.exception import P115OSError, AuthenticationError, LoginError
 
-from .util import get_status, is_timeouterror
+from .util import get_status_code, is_timeouterror
 
 
 @total_ordering
@@ -374,7 +374,7 @@ def call_wrap_with_pool(get_cert_headers: Callable, /, func: Callable) -> Callab
                 except BaseException as e:
                     if isinstance(e, P115OSError) and e.args[1].get("errno") == 40101004:
                         raise
-                    if not isinstance(e, (AuthenticationError, LoginError)) and get_status(e) != 405:
+                    if not isinstance(e, (AuthenticationError, LoginError)) and get_status_code(e) != 405:
                         revert()
                         raise
         return run_gen_step(gen_step, async_=async_)

p115client/tool/util.py

@@ -3,7 +3,7 @@
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
 __all__ = [
-    "get_status", "is_timeouterror", "posix_escape_name", "reduce_image_url_layers", 
+    "get_status_code", "is_timeouterror", "posix_escape_name", "reduce_image_url_layers", 
     "share_extract_payload", "unescape_115_charref", 
 ]
 __doc__ = "这个模块提供了一些工具函数"
@@ -23,7 +23,7 @@ class SharePayload(TypedDict):
     receive_code: None | str
 
 
-def get_status(e: BaseException, /) -> None | int:
+def get_status_code(e: BaseException, /) -> None | int:
     """获取 HTTP 请求异常的状态码（如果有的话）
     """
     status = (

{p115client-0.0.5.10.2.dist-info → p115client-0.0.5.10.4.dist-info}/METADATA

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

{p115client-0.0.5.10.2.dist-info → p115client-0.0.5.10.4.dist-info}/RECORD

@@ -12,15 +12,15 @@ p115client/tool/edit.py,sha256=eRlR1UZMpfGnoetpqSAAx5bPBOEiSlx7HPkpOSs5agk,17739
 p115client/tool/export_dir.py,sha256=iMnKtnESi8HKvW9WhIvOdEoMXSBpAnhFlGeyKXHpQbE,24545
 p115client/tool/fs_files.py,sha256=jY57L4nhB9t-2kT_1j3mdiwOdPZKsimN3eN5mUJAqMI,15745
 p115client/tool/history.py,sha256=2S26BH7uBNfVHlbYFNy-aNOLMcM-HrlR7TLHAZacUJI,7458
-p115client/tool/iterdir.py,sha256=6-ke9yNY3mqHmzEapXk3lYwl3XRkWLH2D_nqJ1nq8Tk,186120
+p115client/tool/iterdir.py,sha256=Qgs1fHwfgCXb-9T_1WQfyhnfXe8LZYwZY7oMTnCz3tQ,192038
 p115client/tool/life.py,sha256=X6Bp0GYKwnZeWlttE2DIVw5iOCXM5QzIkM6Zuj24c5Y,17323
-p115client/tool/pool.py,sha256=zftRR74IR_5zHigJtaImxGYt81rqCAn_V5Nm7HBMj68,13943
+p115client/tool/pool.py,sha256=K-ALC-JEwik3DYCr5Eckok15oQnHRe6yznKIuJ9jyyM,13953
 p115client/tool/request.py,sha256=rjXuQwRganE5Z-4rfgnyPFjE4jzdQSLdIs9s0cIDshU,7043
 p115client/tool/upload.py,sha256=qK1OQYxP-Faq2eMDhc5sBXJiSr8m8EZ_gb0O_iA2TrI,15915
-p115client/tool/util.py,sha256=QrB4CIvIBEhl_MGSPSAenkY76WjEUHdcUjpccdc8x_A,3347
+p115client/tool/util.py,sha256=0o9TrXdoPcljgxDDRdxRon41bq1OjuUYCWsR0XLfmPo,3357
 p115client/tool/xys.py,sha256=WMTisCyN4eYyv4A14yYOpjud2mBhQvBcUHOp6pJUQeA,10140
 p115client/type.py,sha256=7kOp98uLaYqcTTCgCrb3DRcl8ukMpn7ibsnVvtw2nG8,6250
-p115client-0.0.5.10.2.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client-0.0.5.10.2.dist-info/METADATA,sha256=C-Qh-vXqaJgXYsfdNs17Mm1jM_xuVm1FWPvGhqumlPo,8276
-p115client-0.0.5.10.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p115client-0.0.5.10.2.dist-info/RECORD,,
+p115client-0.0.5.10.4.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.10.4.dist-info/METADATA,sha256=-zPTpPGe0IpuPfetzVHdvKDXQ9PGxPIu--dw7MFJxns,8276
+p115client-0.0.5.10.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.10.4.dist-info/RECORD,,