p115client 0.0.5.8.5__py3-none-any.whl → 0.0.5.8.6__py3-none-any.whl

p115client/tool/download.py

@@ -25,6 +25,7 @@ from shutil import rmtree
 from threading import Lock
 from time import time
 from typing import cast, overload, Any, Final, Literal, TypedDict
+from types import EllipsisType
 from urllib.parse import quote, urlsplit
 from urllib.request import urlopen, Request
 from uuid import uuid4
@@ -257,7 +258,7 @@ def iter_files_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    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", 
     raise_for_changed_count: bool = False, 
     user_agent: str = "", 
@@ -278,7 +279,7 @@ def iter_files_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    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", 
     raise_for_changed_count: bool = False, 
     user_agent: str = "", 
@@ -298,7 +299,7 @@ def iter_files_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    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", 
     raise_for_changed_count: bool = False, 
     user_agent: str = "", 
@@ -423,7 +424,7 @@ def iter_images_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    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", 
     raise_for_changed_count: bool = False, 
     *, 
@@ -442,7 +443,7 @@ def iter_images_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    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", 
     raise_for_changed_count: bool = False, 
     *, 
@@ -460,7 +461,7 @@ def iter_images_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    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", 
     raise_for_changed_count: bool = False, 
     *, 
@@ -578,7 +579,7 @@ def iter_subtitles_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    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", 
     raise_for_changed_count: bool = False, 
     *, 
@@ -597,7 +598,7 @@ def iter_subtitles_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    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", 
     raise_for_changed_count: bool = False, 
     *, 
@@ -615,7 +616,7 @@ def iter_subtitles_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    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", 
     raise_for_changed_count: bool = False, 
     *, 
@@ -855,7 +856,7 @@ def make_strm(
     suffix: str = "", 
     type: Literal[1, 2, 3, 4, 5, 6, 7, 99] = 4, 
     max_workers: None | int = None, 
-    id_to_dirnode: None | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     path_already: bool = False, 
     app: str = "android", 
     fs_files_cooldown: int | float = 0.5, 
@@ -881,7 +882,7 @@ def make_strm(
     suffix: str = "", 
     type: Literal[1, 2, 3, 4, 5, 6, 7, 99] = 4, 
     max_workers: None | int = None, 
-    id_to_dirnode: None | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     path_already: bool = False, 
     app: str = "android", 
     fs_files_cooldown: int | float = 0.5, 
@@ -906,7 +907,7 @@ def make_strm(
     suffix: str = "", 
     type: Literal[1, 2, 3, 4, 5, 6, 7, 99] = 4, 
     max_workers: None | int = None, 
-    id_to_dirnode: None | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     path_already: bool = False, 
     app: str = "android", 
     fs_files_cooldown: int | float = 0.5, 
@@ -1170,40 +1171,36 @@ def iter_download_nodes(
         method = client.download_files
     else:
         method = client.download_folders
+    get_nodes = partial(method, async_=async_, **{"base_url": get_base_url, **request_kwargs})
     if max_workers == 1:
         def gen_step(pickcode):
             if isinstance(pickcode, int):
                 resp = yield client.fs_file_skim(pickcode, async_=async_, **request_kwargs)
                 check_response(resp)
                 pickcode = resp["data"][0]["pick_code"]
-            request_kwargs.setdefault("base_url", get_base_url)
             for i in count(1):
                 payload = {"pickcode": pickcode, "page": i}
-                resp = yield method(payload, async_=async_, **request_kwargs)
+                resp = yield get_nodes(payload)
                 check_response(resp)
                 data = resp["data"]
                 yield YieldFrom(data["list"], identity=True)
                 if not data["has_next_page"]:
                     break
     else:
+        max_page = 0
         get_next_page = count(1).__next__
         if async_:
             q: Any = AsyncQueue()
         else:
             q = SimpleQueue()
         get, put = q.get, q.put_nowait
-        max_page = 0
         def request(pickcode):
             nonlocal max_page
             while True:
                 page = get_next_page()
                 if max_page and page > max_page:
                     return
-                resp: dict = yield method(
-                    {"pickcode": pickcode, "page": page}, 
-                    async_=async_, # type: ignore
-                    **request_kwargs, 
-                )
+                resp: dict = yield get_nodes({"pickcode": pickcode, "page": page})
                 try:
                     check_response(resp)
                 except BaseException as e:
@@ -1214,7 +1211,9 @@ def iter_download_nodes(
                 if not data["has_next_page"]:
                     max_page = page
         def gen_step(pickcode):
-            nonlocal max_workers
+            nonlocal max_workers, max_page, get_next_page
+            max_page = 0
+            get_next_page = count(1).__next__
             if async_:
                 if max_workers is None or max_workers <= 0:
                     max_workers = 20
@@ -1239,7 +1238,6 @@ def iter_download_nodes(
                 )
                 check_response(resp)
                 pickcode = resp["data"][0]["pick_code"]
-            request_kwargs.setdefault("base_url", cycle(("http://proapi.115.com", "https://proapi.115.com")).__next__)
             try:
                 sentinel = object()
                 countdown: Callable
@@ -1282,6 +1280,11 @@ def iter_download_nodes(
             )) as get_next:
                 while True:
                     attr = yield get_next
+                    if not files:
+                        yield Yield(
+                            {"fid": str(attr["id"]), "pid": "0", "fn": attr["name"]}, 
+                            identity=True, 
+                        )
                     yield YieldFrom(
                         run_gen_step_iter(gen_step(attr["pickcode"]), async_=async_), 
                         identity=True, 
@@ -1293,7 +1296,7 @@ def iter_download_nodes(
 def iter_download_files(
     client: str | P115Client, 
     cid: int = 0, 
-    id_to_dirnode: None | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     escape: None | bool | Callable[[str], str] = True, 
     with_ancestors: bool = True, 
     max_workers: None | int = None, 
@@ -1307,7 +1310,7 @@ def iter_download_files(
 def iter_download_files(
     client: str | P115Client, 
     cid: int = 0, 
-    id_to_dirnode: None | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     escape: None | bool | Callable[[str], str] = True, 
     with_ancestors: bool = True, 
     max_workers: None | int = None, 
@@ -1320,7 +1323,7 @@ def iter_download_files(
 def iter_download_files(
     client: str | P115Client, 
     cid: int = 0, 
-    id_to_dirnode: None | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
     escape: None | bool | Callable[[str], str] = True, 
     with_ancestors: bool = True, 
     max_workers: None | int = None, 

p115client/tool/iterdir.py

@@ -8,9 +8,9 @@ __all__ = [
     "get_ancestors_to_cid", "get_id_to_path", "get_id_to_sha1", "get_id_to_pickcode", 
     "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_dupfiles", "iter_image_files", 
-    "share_extract_payload", "share_iterdir", "share_iter_files", "iter_selected_nodes", 
-    "iter_selected_nodes_by_pickcode", "iter_selected_nodes_using_category_get", 
+    "iter_files_raw", "iter_files", "traverse_files", "iter_dirs", "iter_dupfiles", 
+    "iter_image_files", "share_extract_payload", "share_iterdir", "share_iter_files", 
+    "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", 
@@ -41,9 +41,9 @@ from weakref import WeakValueDictionary
 from asynctools import async_chain, async_filter, async_map, to_list
 from concurrenttools import run_as_thread, taskgroup_map, threadpool_map
 from iterutils import (
-    bfs_gen, chunked, async_foreach, ensure_aiter, foreach, flatten, 
-    iter_unique, run_gen_step, run_gen_step_iter, through, async_through, 
-    with_iter_next, Yield, YieldFrom, 
+    as_gen_step, bfs_gen, chunked, async_foreach, ensure_aiter, foreach, 
+    flatten, iter_unique, run_gen_step, run_gen_step_iter, through, 
+    async_through, with_iter_next, Yield, YieldFrom, 
 )
 from iter_collect import iter_keyed_dups, SupportsLT
 from orjson import loads
@@ -2789,6 +2789,101 @@ def traverse_files(
     return run_gen_step_iter(gen_step, async_=async_)
 
 
+@overload
+def iter_dirs(
+    client: str | P115Client, 
+    cid: int | str = 0, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    with_pickcode: bool = False, 
+    max_workers: None | int = None, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> Iterator[dict]:
+    ...
+@overload
+def iter_dirs(
+    client: str | P115Client, 
+    cid: int | str = 0, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    with_pickcode: bool = False, 
+    max_workers: None | int = None, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> AsyncIterator[dict]:
+    ...
+def iter_dirs(
+    client: str | P115Client, 
+    cid: int | str = 0, 
+    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    with_pickcode: bool = False, 
+    max_workers: None | int = None, 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> Iterator[dict] | AsyncIterator[dict]:
+    """遍历目录树，获取目录信息
+
+    :param client: 115 客户端或 cookies
+    :param cid: 目录 id（如果是 int） 或者 pickcode（如果是 str）
+    :param id_to_dirnode: 字典，保存 id 到对应文件的 `DirNode(name, parent_id)` 命名元组的字典
+    :param with_pickcode: 是否需要包含提取码
+    :param max_workers: 最大并发数
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 迭代器，返回此目录内的（仅目录）文件信息
+    """
+    from .download import iter_download_nodes
+    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]
+    it = iter_download_nodes(
+        client, 
+        cid, 
+        files=False, 
+        max_workers=max_workers, 
+        async_=async_, # type: ignore
+        **request_kwargs, 
+    )
+    do_map: Callable = async_map if async_ else map
+    def project(info: dict, /) -> dict:
+        attr = {"id": int(info["fid"]), "parent_id": int(info["pid"]), "name": info["fn"]}
+        if id_to_dirnode is not ...:
+            id_to_dirnode[attr["id"]] = DirNode(attr["name"], attr["parent_id"])
+        return attr
+    it = do_map(project, it)
+    if with_pickcode:
+        file_skim = client.fs_file_skim
+        @as_gen_step(async_=async_)
+        def batch_load_pickcode(batch: Sequence[dict], /):
+            resp = yield file_skim(
+                (a["id"] for a in batch), 
+                method="POST", 
+                async_=async_, 
+                **request_kwargs, 
+            )
+            check_response(resp)
+            maps = {int(a["file_id"]): a["pick_code"] for a in resp["data"]}
+            for attr in batch:
+                attr["pickcode"] = maps[attr["id"]]
+            return batch
+        def gen_step(iterable):
+            batch_map = taskgroup_map if async_ else threadpool_map
+            with with_iter_next(batch_map(
+                batch_load_pickcode, 
+                chunked(iterable, 3000), 
+                max_workers=max_workers, 
+            )) as get_next:
+                while True:
+                    batch = yield get_next
+                    yield YieldFrom(batch, identity=True)
+        it = run_gen_step_iter(gen_step(it), async_=async_)
+    return it
+
+
 @overload
 def iter_dupfiles[K](
     client: str | P115Client, 

{p115client-0.0.5.8.5.dist-info → p115client-0.0.5.8.6.dist-info}/METADATA

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

{p115client-0.0.5.8.5.dist-info → p115client-0.0.5.8.6.dist-info}/RECORD

@@ -6,18 +6,18 @@ p115client/const.py,sha256=maIZfJAiUuEnXIKc8TMAyW_UboDUJPwYpPS8LjPFp_U,4321
 p115client/exception.py,sha256=Ugjr__aSlYRDYwoOz7273ngV-gFX2z-ohsJmCba8nnQ,2657
 p115client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 p115client/tool/__init__.py,sha256=2YrKoAcFYOuqu2nUBoPVhxMOseAvcLE_LcnbZV11UKw,324
-p115client/tool/download.py,sha256=7eRZw7zuN6V7UhScm-TRZmR3m_wC4TBckod0IHxW6LU,60840
+p115client/tool/download.py,sha256=DneVsbryn4d47RkS62ghF5Xz8vkDq6U0n2hj1W5g4iY,61176
 p115client/tool/edit.py,sha256=3hQ5J3hHQx4yNsGcWSechBYAvZRSQUxfXLXuqXiDKmk,17789
 p115client/tool/export_dir.py,sha256=iMnKtnESi8HKvW9WhIvOdEoMXSBpAnhFlGeyKXHpQbE,24545
 p115client/tool/fs_files.py,sha256=hkezLKrtTAGPDkPxwq6jMrm8s2-unHZQBR7cDvh41qs,16027
-p115client/tool/iterdir.py,sha256=U7N_clidyoFfhRK5f8R_9MRjP5BEK7xBqezCw7bxOeQ,184109
+p115client/tool/iterdir.py,sha256=T6bsD8A896nHgVxKYu2dkIo-5Az2svL4iLm2uHQWyHg,187517
 p115client/tool/life.py,sha256=SJ1dAvRYCWTUz1gPrCWv-_G1Rq5yPfxDgY7KT-2UP4A,17528
 p115client/tool/pool.py,sha256=vM5ItMxELtT7_bvbmdhwWj81rQ0zyaj3uPMny4KDw_E,9757
 p115client/tool/request.py,sha256=SWsezW9EYZGS3R-TbZxMG-8bN3YWJ0-GzgvKlvRBSCM,7042
 p115client/tool/upload.py,sha256=qK1OQYxP-Faq2eMDhc5sBXJiSr8m8EZ_gb0O_iA2TrI,15915
 p115client/tool/xys.py,sha256=n89n9OLBXx6t20L61wJgfrP6V4jW3sHgyaQNBLdUwUQ,3578
 p115client/type.py,sha256=e4g9URQBE23XN2dGomldj8wC6NlDWBBSVC5Bmd8giBc,5993
-p115client-0.0.5.8.5.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client-0.0.5.8.5.dist-info/METADATA,sha256=G8aLCfnwfzwODda-MyneCwCs5If95EeK1IIwdBkIO54,8233
-p115client-0.0.5.8.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p115client-0.0.5.8.5.dist-info/RECORD,,
+p115client-0.0.5.8.6.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.8.6.dist-info/METADATA,sha256=iYXxUpy5PpP618SQZ4utGQSwXWPw2wZ3WVGqJM_wZBc,8233
+p115client-0.0.5.8.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.8.6.dist-info/RECORD,,