p115client 0.0.5.10.3__py3-none-any.whl → 0.0.5.10.5__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", 
@@ -59,30 +59,6 @@ from .life import iter_life_behavior_once, life_show
 from .util import posix_escape_name, share_extract_payload, unescape_115_charref
 
 
-WEBAPI_BASE_URLS = (
-    "http://webapi.115.com", 
-    "https://webapi.115.com", 
-    "http://webapi.115.com", 
-    "http://115cdn.com/webapi", 
-    "http://webapi.115.com", 
-    "http://115vod.com/webapi", 
-)
-PROAPI_BASE_URLS = (
-    "http://proapi.115.com", 
-    "https://proapi.115.com", 
-    "http://proapi.115.com", 
-    "https://proapi.115.com", 
-)
-APS_BASE_URLS = (
-    "http://115cdn.com/aps", 
-    "http://aps.115.com", 
-    "http://115vod.com/aps", 
-)
-
-_n_get_ancestors = 0
-_n_get_count = 0
-
-
 class DirNode(NamedTuple):
     name: str
     parent_id: int
@@ -104,7 +80,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 +93,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"]
@@ -152,7 +128,7 @@ def get_path_to_cid(
     root_id: None | int = None, 
     escape: None | bool | Callable[[str], str] = True, 
     refresh: bool = False, 
-    id_to_dirnode: None | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     *, 
     async_: Literal[False] = False, 
@@ -166,7 +142,7 @@ def get_path_to_cid(
     root_id: None | int = None, 
     escape: None | bool | Callable[[str], str] = True, 
     refresh: bool = False, 
-    id_to_dirnode: None | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     *, 
     async_: Literal[True], 
@@ -179,7 +155,7 @@ def get_path_to_cid(
     root_id: None | int = None, 
     escape: None | bool | Callable[[str], str] = True, 
     refresh: bool = False, 
-    id_to_dirnode: None | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     *, 
     async_: Literal[False, True] = False, 
@@ -215,14 +191,31 @@ def get_path_to_cid(
     escape = cast(None | Callable[[str], str], escape)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
+    elif id_to_dirnode is ...:
+        id_to_dirnode = {}
     def gen_step():
         nonlocal cid
         parts: list[str] = []
         if cid and (refresh or cid not in id_to_dirnode):
-            if app in ("", "web", "desktop", "harmony"):
-                resp = yield client.fs_files({"cid": cid, "limit": 1}, async_=async_, **request_kwargs)
+            if not isinstance(client, P115Client) or app == "open":
+                resp = yield client.fs_files_open(
+                    {"cid": cid, "cur": 1, "nf": 1, "hide_data": 1}, 
+                    async_=async_, 
+                    **request_kwargs, 
+                )
+            elif app in ("", "web", "desktop", "harmony"):
+                resp = yield client.fs_files_aps(
+                    {"cid": cid, "limit": 1, "nf": 1, "star": 1}, 
+                    async_=async_, 
+                    **request_kwargs, 
+                )
             else:
-                resp = yield client.fs_files_app({"cid": cid, "hide_data": 1}, async_=async_, **request_kwargs)
+                resp = yield client.fs_files_app(
+                    {"cid": cid, "cur": 1, "nf": 1, "hide_data": 1}, 
+                    app=app, 
+                    async_=async_, 
+                    **request_kwargs, 
+                )
             check_response(resp)
             if cid and int(resp["path"][-1]["cid"]) != cid:
                 raise FileNotFoundError(ENOENT, cid)
@@ -252,6 +245,8 @@ def get_file_count(
     client: str | P115Client, 
     cid: int = 0, 
     id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    app: str = "web", 
+    use_fs_files: bool = True, 
     *, 
     async_: Literal[False] = False, 
     **request_kwargs, 
@@ -262,6 +257,8 @@ def get_file_count(
     client: str | P115Client, 
     cid: int = 0, 
     id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    app: str = "web", 
+    use_fs_files: bool = True, 
     *, 
     async_: Literal[True], 
     **request_kwargs, 
@@ -271,6 +268,8 @@ def get_file_count(
     client: str | P115Client, 
     cid: int = 0, 
     id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    app: str = "web", 
+    use_fs_files: bool = True, 
     *, 
     async_: Literal[False, True] = False, 
     **request_kwargs, 
@@ -283,6 +282,8 @@ def get_file_count(
     :param client: 115 客户端或 cookies
     :param cid: 目录 id
     :param id_to_dirnode: 字典，保存 id 到对应文件的 `DirNode(name, parent_id)` 命名元组的字典
+    :param app: 使用某个 app （设备）的接口
+    :param use_fs_files: 使用 `client.fs_files`，否则使用 `client.fs_category_get`
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
 
@@ -292,75 +293,78 @@ def get_file_count(
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
-    n_webapi = len(WEBAPI_BASE_URLS)
-    n_proapi = len(PROAPI_BASE_URLS)
-    n_apsapi = len(APS_BASE_URLS)
-    n_api = n_webapi * 2 + n_proapi * 2 + n_apsapi
-    def get_resp():
-        global _n_get_count
-        n = _n_get_count % n_api
-        if n < n_webapi:
-            _n_get_count += 1
+    def get_resp_of_fs_files(id: int, /):
+        if not isinstance(client, P115Client) or app == "open":
+            return client.fs_files_open(
+                {"cid": id, "hide_data": 1, "show_dir": 0}, 
+                async_=async_, 
+                **request_kwargs, 
+            )
+        elif app in ("", "web", "desktop", "harmony"):
             return client.fs_files(
-                {"cid": cid, "limit": 1, "show_dir": 0}, 
-                base_url=WEBAPI_BASE_URLS[n], 
+                {"cid": id, "limit": 1, "show_dir": 0}, 
                 async_=async_, 
                 **request_kwargs, 
             )
-        n -= n_webapi
-        if n < n_proapi:
-            _n_get_count += 1
+        elif app == "aps":
+            return client.fs_files_aps(
+                {"cid": id, "limit": 1, "show_dir": 0}, 
+                async_=async_, 
+                **request_kwargs, 
+            )
+        else:
             return client.fs_files_app(
-                {"cid": cid, "hide_data": 1, "show_dir": 0}, 
-                base_url=PROAPI_BASE_URLS[n], 
+                {"cid": id, "hide_data": 1, "show_dir": 0}, 
+                app=app, 
                 async_=async_, 
                 **request_kwargs, 
             )
-        n -= n_proapi
-        if n < n_apsapi:
-            _n_get_count += 1
-            return client.fs_files_aps(
-                {"cid": cid, "limit": 1, "show_dir": 0}, 
-                base_url=APS_BASE_URLS[n], 
+    def get_resp_of_category_get(id: int, /):
+        if not isinstance(client, P115Client) or app == "open":
+            return client.fs_info_open(
+                id, 
                 async_=async_, 
                 **request_kwargs, 
             )
-        n -= n_apsapi
-        if n < n_webapi:
-            _n_get_count += 1
+        elif app in ("", "web", "desktop", "harmony", "aps"):
             return client.fs_category_get(
-                cid, 
-                base_url=WEBAPI_BASE_URLS[n], 
+                id, 
+                async_=async_, 
+                **request_kwargs, 
+            )
+        else:
+            return client.fs_category_get_app(
+                id, 
+                app=app, 
                 async_=async_, 
                 **request_kwargs, 
             )
-        n -= n_webapi
-        _n_get_count += 1
-        return client.fs_category_get_app(
-            cid, 
-            base_url=PROAPI_BASE_URLS[n], 
-            async_=async_, 
-            **request_kwargs, 
-        )
     def gen_step():
-        if cid == 0:
+        if not cid:
             resp = yield client.fs_space_summury(async_=async_, **request_kwargs)
             check_response(resp)
             return sum(v["count"] for k, v in resp["type_summury"].items() if k.isupper())
-        resp = yield get_resp()
-        if not resp:
-            raise FileNotFoundError(ENOENT, cid)
-        check_response(resp)
-        resp["cid"] = cid
-        if "path" in resp:
+        if use_fs_files:
+            resp = yield get_resp_of_fs_files(cid)
+            check_response(resp)
             if cid != int(resp["path"][-1]["cid"]):
+                resp["cid"] = cid
                 raise NotADirectoryError(ENOTDIR, 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"]))
             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["cid"] = cid
                 raise NotADirectoryError(ENOTDIR, resp)
             if id_to_dirnode is not ...:
                 pid = 0
@@ -374,8 +378,9 @@ def get_file_count(
 @overload
 def get_ancestors(
     client: str | P115Client, 
-    attr: dict, 
+    attr: int | dict, 
     id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    app: str = "web", 
     *, 
     async_: Literal[False] = False, 
     **request_kwargs, 
@@ -384,8 +389,9 @@ def get_ancestors(
 @overload
 def get_ancestors(
     client: str | P115Client, 
-    attr: dict, 
+    attr: int | dict, 
     id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    app: str = "web", 
     *, 
     async_: Literal[True], 
     **request_kwargs, 
@@ -393,8 +399,9 @@ def get_ancestors(
     ...
 def get_ancestors(
     client: str | P115Client, 
-    attr: dict, 
+    attr: int | dict, 
     id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    app: str = "web", 
     *, 
     async_: Literal[False, True] = False, 
     **request_kwargs, 
@@ -405,8 +412,9 @@ def get_ancestors(
         我通过一些经验，搭配了多个接口的占比和参数分布，可能不够合理，以后会根据实际情况调整
 
     :param client: 115 客户端或 cookies
-    :param attr: 待查询节点的信息（必须有 id 和 parent_id）
+    :param attr: 待查询节点 `id` 或信息（必须有 `id`，可选有 `parent_id`）
     :param id_to_dirnode: 字典，保存 id 到对应文件的 `DirNode(name, parent_id)` 命名元组的字典
+    :param app: 使用某个 app （设备）的接口
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
 
@@ -424,89 +432,168 @@ def get_ancestors(
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
-    n_webapi = len(WEBAPI_BASE_URLS)
-    n_proapi = len(PROAPI_BASE_URLS)
-    n_apsapi = len(APS_BASE_URLS)
-    n_api = n_webapi * 2 + n_proapi * 2 + n_apsapi
-    def get_resp():
-        global _n_get_ancestors
-        n = _n_get_ancestors % n_api
-        if n < n_webapi:
-            _n_get_ancestors += 1
+    def get_resp_of_fs_files(id: int, /):
+        if not isinstance(client, P115Client) or app == "open":
+            return client.fs_files_open(
+                {"cid": id, "cur": 1, "nf": 1, "hide_data": 1}, 
+                async_=async_, 
+                **request_kwargs, 
+            )
+        elif app in ("", "web", "desktop", "harmony"):
             return client.fs_files(
-                {"cid": attr["parent_id"], "limit": 1}, 
-                base_url=WEBAPI_BASE_URLS[n], 
+                {"cid": id, "limit": 1, "nf": 1, "star": 1}, 
                 async_=async_, 
                 **request_kwargs, 
             )
-        n -= n_webapi
-        if n < n_proapi:
-            _n_get_ancestors += 1
+        elif app == "aps":
+            return client.fs_files_aps(
+                {"cid": id, "limit": 1, "nf": 1, "star": 1}, 
+                async_=async_, 
+                **request_kwargs, 
+            )
+        else:
             return client.fs_files_app(
-                {"cid": attr["parent_id"], "hide_data": 1}, 
-                base_url=PROAPI_BASE_URLS[n], 
+                {"cid": id, "cur": 1, "nf": 1, "hide_data": 1}, 
+                app=app, 
                 async_=async_, 
                 **request_kwargs, 
             )
-        n -= n_proapi
-        if n < n_apsapi:
-            _n_get_ancestors += 1
-            return client.fs_files_aps(
-                {"cid": attr["parent_id"], "limit": 1}, 
-                base_url=APS_BASE_URLS[n], 
+    def get_resp_of_category_get(id: int, /):
+        if not isinstance(client, P115Client) or app == "open":
+            return client.fs_info_open(
+                id, 
                 async_=async_, 
                 **request_kwargs, 
             )
-        if attr.get("is_dir", False) or attr.get("is_directory", False):
-            _n_get_ancestors = 0
-            return get_resp()
-        n -= n_apsapi
-        if n < n_webapi:
-            _n_get_ancestors += 1
+        elif app in ("", "web", "desktop", "harmony", "aps"):
             return client.fs_category_get(
-                attr["id"], 
-                base_url=WEBAPI_BASE_URLS[n], 
+                id, 
+                async_=async_, 
+                **request_kwargs, 
+            )
+        else:
+            return client.fs_category_get_app(
+                id, 
+                app=app, 
                 async_=async_, 
                 **request_kwargs, 
             )
-        n -= n_webapi
-        _n_get_ancestors += 1
-        return client.fs_category_get_app(
-            attr["id"], 
-            base_url=PROAPI_BASE_URLS[n], 
-            async_=async_, 
-            **request_kwargs, 
-        )
     def gen_step():
-        if not attr["parent_id"]:
-            return [{"id": 0, "parent_id": 0, "name": ""}]
-        resp = yield get_resp()
-        if not resp:
-            raise FileNotFoundError(ENOENT, attr)
-        check_response(resp)
-        resp["attr"] = attr
         ancestors: list[dict] = [{"id": 0, "parent_id": 0, "name": ""}]
         add_ancestor = ancestors.append
         pid = 0
-        if "path" in resp:
-            if attr["parent_id"] != int(resp["path"][-1]["cid"]):
-                raise FileNotFoundError(ENOENT, resp)
-            for info in resp["path"][1:]:
-                add_ancestor({
-                    "parent_id": pid, 
-                    "id": (pid := int(info["cid"])), 
-                    "name": info["name"], 
-                })
+        is_completed = False
+        if isinstance(attr, dict):
+            fid = cast(int, attr["id"])
+            if not fid:
+                return ancestors
+            is_dir: None | bool = attr.get("is_dir") or attr.get("is_directory")
+            if is_dir is None:
+                if "parent_id" in attr:
+                    cid = cast(int, attr["parent_id"])
+                    resp = yield get_resp_of_fs_files(cid)
+                    if cid != int(resp["path"][-1]["cid"]):
+                        resp["attr"] = attr
+                        raise FileNotFoundError(ENOENT, resp)
+                    for info in resp["path"][1:]:
+                        add_ancestor({
+                            "parent_id": pid, 
+                            "id": (pid := int(info["cid"])), 
+                            "name": info["name"], 
+                        })
+                    if id_to_dirnode is not ...:
+                        for ans in ancestors[1:]:
+                            id_to_dirnode[ans["id"]] = DirNode(ans["name"], ans["parent_id"])
+                    if "name" in attr:
+                        name = attr["name"]
+                        is_dir = bool(attr.get("is_dir"))
+                    else:
+                        resp = yield client.fs_file_skim(attr["id"], async_=async_, **request_kwargs)
+                        check_response(resp)
+                        name = unescape_115_charref(resp["data"]["file_name"])
+                        is_dir = not resp["data"]["sha1"]
+                    ans = {"id": fid, "parent_id": pid, "name": name}
+                    add_ancestor(ans)
+                    if is_dir and id_to_dirnode is not ...:
+                        id_to_dirnode[ans["id"]] = DirNode(ans["name"], ans["parent_id"])
+                    is_completed = True
+            elif is_dir:
+                resp = yield get_resp_of_fs_files(fid)
+                if fid != int(resp["path"][-1]["cid"]):
+                    resp["attr"] = attr
+                    raise FileNotFoundError(ENOENT, resp)
+                for info in resp["path"][1:]:
+                    add_ancestor({
+                        "parent_id": pid, 
+                        "id": (pid := int(info["cid"])), 
+                        "name": info["name"], 
+                    })
+                if id_to_dirnode is not ...:
+                    for ans in ancestors[1:]:
+                        id_to_dirnode[ans["id"]] = DirNode(ans["name"], ans["parent_id"])
+                is_completed = True
+            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)
+                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 ...:
+                    id_to_dirnode[ans["id"]] = DirNode(ans["name"], ans["parent_id"])
+                is_completed = True
         else:
-            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"])
+            fid = attr
+        if not is_completed:
+            if not fid:
+                return ancestors
+            resp = yield get_resp_of_fs_files(fid)
+            check_response(resp)
+            if fid == int(resp["path"][-1]["cid"]):
+                for info in resp["path"][1:]:
+                    add_ancestor({
+                        "parent_id": pid, 
+                        "id": (pid := int(info["cid"])), 
+                        "name": info["name"], 
+                    })
+                if id_to_dirnode is not ...:
+                    for ans in ancestors[1:]:
+                        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)
+                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 ...:
+                    id_to_dirnode[ans["id"]] = DirNode(ans["name"], ans["parent_id"])
         return ancestors
     return run_gen_step(gen_step, async_=async_)
 
@@ -516,7 +603,7 @@ def get_ancestors_to_cid(
     client: str | P115Client, 
     cid: int = 0, 
     refresh: bool = False, 
-    id_to_dirnode: None  | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     *, 
     async_: Literal[False] = False, 
@@ -528,7 +615,7 @@ def get_ancestors_to_cid(
     client: str | P115Client, 
     cid: int = 0, 
     refresh: bool = False, 
-    id_to_dirnode: None  | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     *, 
     async_: Literal[True], 
@@ -539,7 +626,7 @@ def get_ancestors_to_cid(
     client: str | P115Client, 
     cid: int = 0, 
     refresh: bool = False, 
-    id_to_dirnode: None  | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     *, 
     async_: Literal[False, True] = False, 
@@ -569,14 +656,31 @@ def get_ancestors_to_cid(
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
+    elif id_to_dirnode is ...:
+        id_to_dirnode = {}
     def gen_step():
         nonlocal cid
         parts: list[dict] = []
         if cid and (refresh or cid not in id_to_dirnode):
-            if app in ("", "web", "desktop", "harmony"):
-                resp = yield client.fs_files({"cid": cid, "limit": 1}, async_=async_, **request_kwargs)
+            if not isinstance(client, P115Client) or app == "open":
+                resp = yield client.fs_files_open(
+                    {"cid": cid, "cur": 1, "nf": 1, "hide_data": 1}, 
+                    async_=async_, 
+                    **request_kwargs, 
+                )
+            elif app in ("", "web", "desktop", "harmony"):
+                resp = yield client.fs_files_aps(
+                    {"cid": cid, "limit": 1, "nf": 1, "star": 1}, 
+                    async_=async_, 
+                    **request_kwargs, 
+                )
             else:
-                resp = yield client.fs_files_app({"cid": cid, "hide_data": 1}, async_=async_, **request_kwargs)
+                resp = yield client.fs_files_app(
+                    {"cid": cid, "cur": 1, "nf": 1, "hide_data": 1}, 
+                    app=app, 
+                    async_=async_, 
+                    **request_kwargs, 
+                )
             check_response(resp)
             if cid and int(resp["path"][-1]["cid"]) != cid:
                 raise FileNotFoundError(ENOENT, cid)
@@ -596,18 +700,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, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
+    dont_use_getid: bool = False, 
     *, 
     async_: Literal[False] = False, 
     **request_kwargs, 
@@ -617,11 +721,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, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
+    dont_use_getid: bool = False, 
     *, 
     async_: Literal[True], 
     **request_kwargs, 
@@ -630,11 +736,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, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
+    dont_use_getid: bool = False, 
     *, 
     async_: Literal[False, True] = False, 
     **request_kwargs, 
@@ -643,6 +751,7 @@ def get_id_to_path(
 
     :param client: 115 客户端或 cookies
     :param path: 路径
+    :param parent_id: 上级目录的 id
     :param ensure_file: 是否确保为文件
 
         - True: 必须是文件
@@ -653,6 +762,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 +774,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 +1191,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 +3179,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 +3195,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 +3210,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 +3233,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 +3241,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 +3269,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 +3287,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 +3298,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 +3308,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 +3348,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 +3356,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 +3385,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,