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

p115client/client.py

@@ -1364,6 +1364,7 @@ class ClientRequestMixin:
         POST https://qrcodeapi.115.com/open/deviceCodeToToken
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/shtpzfhewv5nag11#QCCVQ
 
         :payload:
@@ -1415,6 +1416,7 @@ class ClientRequestMixin:
         POST https://qrcodeapi.115.com/open/refreshToken
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/shtpzfhewv5nag11#ve54x
 
         :payload:
@@ -1567,6 +1569,7 @@ class ClientRequestMixin:
         GET https://qrcodeapi.115.com/get/status/
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/shtpzfhewv5nag11#lAsp2
 
         :payload:
@@ -1653,6 +1656,7 @@ class ClientRequestMixin:
         POST https://qrcodeapi.115.com/open/authDeviceCode
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/shtpzfhewv5nag11#WzRhM
 
         .. note::
@@ -2464,6 +2468,7 @@ class P115OpenClient(ClientRequestMixin):
     """115 的客户端对象
 
     .. admonition:: Reference
+
         https://www.yuque.com/115yun/open
 
     :param app_id_or_refresh_token: 申请到的 AppID 或 refresh_token
@@ -2747,6 +2752,7 @@ class P115OpenClient(ClientRequestMixin):
             相当于 `P115Client.download_url_app(app="chrome")`
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/um8whr91bxb5997o
 
         :payload:
@@ -2810,6 +2816,7 @@ class P115OpenClient(ClientRequestMixin):
         POST https://proapi.115.com/open/ufile/copy
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/lvas49ar94n47bbk
 
         :payload:
@@ -2866,6 +2873,7 @@ class P115OpenClient(ClientRequestMixin):
         POST https://proapi.115.com/open/ufile/delete
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/kt04fu8vcchd2fnb
 
         :payload:
@@ -2909,7 +2917,7 @@ class P115OpenClient(ClientRequestMixin):
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
-        """更新文件或目录
+        """获取目录中的文件列表和基本信息
 
         GET https://proapi.115.com/open/ufile/files
 
@@ -2917,6 +2925,7 @@ class P115OpenClient(ClientRequestMixin):
             相当于 `P115Client.fs_files_app`
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/kz9ft9a7s57ep868
 
         :payload:
@@ -3036,6 +3045,7 @@ class P115OpenClient(ClientRequestMixin):
             相当于 `P115Client.fs_category_get_app`
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/rl8zrhe2nag21dfw
 
         :payload:
@@ -3085,6 +3095,7 @@ class P115OpenClient(ClientRequestMixin):
         POST https://proapi.115.com/open/folder/add
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/qur839kyx9cgxpxi
 
         :payload:
@@ -3137,6 +3148,7 @@ class P115OpenClient(ClientRequestMixin):
         POST https://proapi.115.com/open/ufile/move
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/vc6fhi2mrkenmav2
 
         :payload:
@@ -3195,6 +3207,7 @@ class P115OpenClient(ClientRequestMixin):
             相当于 `P115Client.fs_search_app2`
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/ft2yelxzopusus38
 
         :payload:
@@ -3350,6 +3363,7 @@ class P115OpenClient(ClientRequestMixin):
             即使文件已经被删除，也可以操作成功
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/gyrpw5a0zc4sengm
 
         :payload:
@@ -3448,6 +3462,7 @@ class P115OpenClient(ClientRequestMixin):
         GET https://proapi.115.com/open/rb/list
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/bg7l4328t98fwgex
 
         :payload:
@@ -3497,6 +3512,7 @@ class P115OpenClient(ClientRequestMixin):
         POST https://proapi.115.com/open/rb/revert
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/gq293z80a3kmxbaq
 
         :payload:
@@ -3542,6 +3558,7 @@ class P115OpenClient(ClientRequestMixin):
         GET https://proapi.115.com/open/upload/get_token
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/kzacvzl0g7aiyyn4
         """
         api = complete_proapi("/open/upload/get_token", base_url)
@@ -3583,6 +3600,7 @@ class P115OpenClient(ClientRequestMixin):
         POST https://proapi.115.com/open/upload/init
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/ul4mrauo5i2uza0q
 
         :payload:
@@ -3641,6 +3659,7 @@ class P115OpenClient(ClientRequestMixin):
         POST https://proapi.115.com/open/upload/resume
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/tzvi9sbcg59msddz
 
         :payload:
@@ -4131,6 +4150,7 @@ class P115OpenClient(ClientRequestMixin):
         GET https://proapi.115.com/open/user/info
 
         .. admonition:: Reference
+
             https://www.yuque.com/115yun/open/ot1litggzxa1czww
         """
         api = complete_proapi("/open/user/info", base_url)
@@ -9057,9 +9077,9 @@ class P115Client(P115OpenClient):
             4. show_dir=0 且 cur=0（或不指定 cur）
 
         .. hint::
-            如果仅指定 natsort=1&show_dir=1，以及一个可选的 cid，则当文件数不大于 1150 时可仅统计某个目录内的文件或目录总数，而不返回具体的文件信息，超过那个数值时，则会返回完整的文件列表
+            如果不指定或者指定的 cid 不存在，则会视为 cid=0 进行处理
 
-            但如果不指定或者指定的 cid 不存在，则会视为 cid=0 进行处理
+            当指定 natsort=1 时，如果里面的数量较少时，可仅统计某个目录内的文件或目录总数，而不返回具体的文件信息
 
         .. hint::
             当一个 cookies 被另一个更新的登录所失效，并不意味着这个 cookies 就直接不可用了。

p115client/tool/attr.py

@@ -66,6 +66,7 @@ def get_attr(
                 pickcode=info["pick_code"], 
                 sha1=info["sha1"], 
                 size=int(info["file_size"]), 
+                is_dir=not info["sha1"], 
             )
         else:
             resp = yield client.fs_file(id, async_=async_, **request_kwargs)

p115client/tool/iterdir.py

@@ -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
@@ -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)
@@ -605,7 +709,7 @@ def get_id_to_path(
     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, 
     *, 
@@ -621,7 +725,7 @@ def get_id_to_path(
     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, 
     *, 
@@ -636,7 +740,7 @@ def get_id_to_path(
     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, 
     *, 

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

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

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

@@ -1,18 +1,18 @@
 LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
 p115client/__init__.py,sha256=1mx7njuAlqcuEWONTjSiiGnXyyNyqOcJyNX1FMHqQ-4,214
 p115client/_upload.py,sha256=DOckFLU_P7Fl0BNu_0-2od6pPsCnzroYY6zZE5_EMnM,30735
-p115client/client.py,sha256=98Zf8CzxeSPcU-U7LUd9KMY2WON7F90kGSokbVcqqXU,727434
+p115client/client.py,sha256=rNLeQTbQp861Vs6L-OfEXh6ykM-NvfycwaCZJiOx91E,727374
 p115client/const.py,sha256=AMyL3QZ172f_RaEkfh27DQxwbkXvPhqfeBWHWTrvSLY,7754
 p115client/exception.py,sha256=kQMI7lwkFIC_tRuj1HT8zqi5HGzz6fTxgK7B1aKrNTI,3447
 p115client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 p115client/tool/__init__.py,sha256=NjT9rroMhLwKI7UlpSCksSsnB3GexXzxvhfunNWzjY0,386
-p115client/tool/attr.py,sha256=u_5JM2LlWFT4IHF2zlz-DY4llgmw4mwouEKMae8BZdQ,2841
+p115client/tool/attr.py,sha256=9xN99lgFxE-48nqiIOSuuo3R0D9lcvuJvcRbJzPKKiw,2883
 p115client/tool/download.py,sha256=3zoxkLPf4Jya-wYowZJmZR65sR3GWNWNmnevKrrgvQY,60509
 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=Qgs1fHwfgCXb-9T_1WQfyhnfXe8LZYwZY7oMTnCz3tQ,192038
+p115client/tool/iterdir.py,sha256=bg59xHMxSuPEAqlmEhF6IBvbSW8piKbfrb6QYtAixa0,197797
 p115client/tool/life.py,sha256=X6Bp0GYKwnZeWlttE2DIVw5iOCXM5QzIkM6Zuj24c5Y,17323
 p115client/tool/pool.py,sha256=K-ALC-JEwik3DYCr5Eckok15oQnHRe6yznKIuJ9jyyM,13953
 p115client/tool/request.py,sha256=rjXuQwRganE5Z-4rfgnyPFjE4jzdQSLdIs9s0cIDshU,7043
@@ -20,7 +20,7 @@ p115client/tool/upload.py,sha256=qK1OQYxP-Faq2eMDhc5sBXJiSr8m8EZ_gb0O_iA2TrI,159
 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.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,,
+p115client-0.0.5.10.6.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.10.6.dist-info/METADATA,sha256=Uahbt1F8XXlWu3VG5PvJps8OsInLt78coGPwhSI1RgI,8276
+p115client-0.0.5.10.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.10.6.dist-info/RECORD,,