p115client 0.0.5.5.4__tar.gz → 0.0.5.5.4.1__tar.gz

{p115client-0.0.5.5.4 → p115client-0.0.5.5.4.1}/PKG-INFO

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

{p115client-0.0.5.5.4 → p115client-0.0.5.5.4.1}/p115client/tool/download.py

@@ -1089,7 +1089,7 @@ def make_strm(
 @overload
 def iter_download_nodes(
     client: str | P115Client, 
-    pickcode: str, 
+    pickcode: int | str, 
     files: bool = True, 
     max_workers: None | int = 1, 
     *, 
@@ -1100,7 +1100,7 @@ def iter_download_nodes(
 @overload
 def iter_download_nodes(
     client: str | P115Client, 
-    pickcode: str, 
+    pickcode: int | str, 
     files: bool = True, 
     max_workers: None | int = 1, 
     *, 
@@ -1110,7 +1110,7 @@ def iter_download_nodes(
     ...
 def iter_download_nodes(
     client: str | P115Client, 
-    pickcode: str, 
+    pickcode: int | str, 
     files: bool = True, 
     max_workers: None | int = 1, 
     *, 
@@ -1134,9 +1134,14 @@ def iter_download_nodes(
         method = client.download_files
     else:
         method = client.download_folders
-    request_kwargs.setdefault("base_url", cycle(("http://proapi.115.com", "https://proapi.115.com")).__next__)
     if max_workers == 1:
         def gen_step():
+            nonlocal 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", cycle(("http://proapi.115.com", "https://proapi.115.com")).__next__)
             for i in count(1):
                 payload = {"pickcode": pickcode, "page": i}
                 resp = yield method(payload, async_=async_, **request_kwargs)
@@ -1174,7 +1179,7 @@ def iter_download_nodes(
                 if not data["has_next_page"]:
                     max_page = page
         def gen_step():
-            nonlocal max_workers
+            nonlocal max_workers, pickcode
             if async_:
                 if max_workers is None or max_workers <= 0:
                     max_workers = 20
@@ -1191,6 +1196,15 @@ def iter_download_nodes(
                 n = executor._max_workers
                 submit = executor.submit
                 shutdown = lambda: executor.shutdown(False, cancel_futures=True)
+            if isinstance(pickcode, int):
+                resp = yield client.fs_file_skim(
+                    pickcode, 
+                    async_=async_, # type: ignore
+                    **request_kwargs, 
+                )
+                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

{p115client-0.0.5.5.4 → p115client-0.0.5.5.4.1}/p115client/tool/fs_files.py

@@ -47,6 +47,7 @@ def iter_fs_files(
     /, 
     first_page_size: int = 0, 
     page_size: int = 10_000, 
+    count: int = -1, 
     callback: None | Callable[[dict], Any] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
@@ -62,6 +63,7 @@ def iter_fs_files(
     /, 
     first_page_size: int = 0, 
     page_size: int = 10_000, 
+    count: int = -1, 
     callback: None | Callable[[dict], Any] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
@@ -76,6 +78,7 @@ def iter_fs_files(
     /, 
     first_page_size: int = 0, 
     page_size: int = 10_000, 
+    count: int = -1, 
     callback: None | Callable[[dict], Any] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
@@ -89,6 +92,7 @@ def iter_fs_files(
     :param payload: 目录的 id 或者详细的查询参数
     :param first_page_size: 首次拉取的分页大小，如果 <= 0，则自动确定
     :param page_size: 分页大小，如果 <= 0，则自动确定
+    :param count: 文件总数
     :param callback: 回调函数，调用后，会获得一个值，会添加到返回值中，key 为 "callback"
     :param app: 使用此设备的接口
     :param raise_for_changed_count: 分批拉取时，发现总数发生变化后，是否报错
@@ -116,7 +120,6 @@ def iter_fs_files(
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
         fs_files = partial(client.fs_files_app, app=app, async_=async_, **request_kwargs)
-    count = -1
     def get_files(payload: dict, /):
         nonlocal count
         while True:
@@ -167,6 +170,8 @@ def iter_fs_files_threaded(
     payload: int | str | dict = 0, 
     /, 
     page_size: int = 7_000, 
+    count: int = -1, 
+    wait_for_count: bool = False, 
     callback: None | Callable[[dict], Any] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
@@ -179,6 +184,8 @@ def iter_fs_files_threaded(
     :param client: 115 网盘客户端对象
     :param payload: 目录的 id 或者详细的查询参数
     :param page_size: 分页大小，如果 <= 0，则自动确定
+    :param count: 文件总数
+    :param wait_for_count: 如果为 True，则在确定 count 前，不进行并发
     :param callback: 回调函数，调用后，会获得一个值，会添加到返回值中，key 为 "callback"
     :param app: 使用此设备的接口
     :param raise_for_changed_count: 分批拉取时，发现总数发生变化后，是否报错
@@ -206,7 +213,6 @@ def iter_fs_files_threaded(
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
         fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
-    count = -1
     def get_files(payload: dict, /):
         nonlocal count
         resp = fs_files(payload)
@@ -245,7 +251,10 @@ def iter_fs_files_threaded(
         offset = payload["offset"]
         while True:
             try:
-                resp = future.result(max(0, ts + cooldown - time()))
+                if wait_for_count and count < 0:
+                    resp = future.result()
+                else:
+                    resp = future.result(max(0, ts + cooldown - time()))
             except TimeoutError:
                 payload["offset"] += page_size
                 if count < 0 or payload["offset"] < count:
@@ -275,6 +284,8 @@ async def iter_fs_files_asynchronized(
     payload: int | str | dict = 0, 
     /, 
     page_size: int = 7_000, 
+    count: int = -1, 
+    wait_for_count: bool = False, 
     callback: None | Callable[[dict], Any] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
@@ -286,6 +297,8 @@ async def iter_fs_files_asynchronized(
     :param client: 115 网盘客户端对象
     :param payload: 目录的 id 或者详细的查询参数
     :param page_size: 分页大小，如果 <= 0，则自动确定
+    :param count: 文件总数
+    :param wait_for_count: 如果为 True，则在确定 count 前，不进行并发
     :param callback: 回调函数，调用后，会获得一个值，会添加到返回值中，key 为 "callback"
     :param app: 使用此设备的接口
     :param raise_for_changed_count: 分批拉取时，发现总数发生变化后，是否报错
@@ -312,7 +325,6 @@ async def iter_fs_files_asynchronized(
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
         fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
-    count = -1
     async def get_files(payload: dict, /):
         nonlocal count
         resp = await fs_files(payload, async_=True) # type: ignore
@@ -355,7 +367,10 @@ async def iter_fs_files_asynchronized(
         offset = payload["offset"]
         while True:
             try:
-                resp = await wait_for(shield(task), max(0, ts + cooldown - time()))
+                if wait_for_count and count < 0:
+                    resp = await task
+                else:
+                    resp = await wait_for(shield(task), max(0, ts + cooldown - time()))
             except TimeoutError:
                 payload["offset"] += page_size
                 if count < 0 or payload["offset"] < count:

{p115client-0.0.5.5.4 → p115client-0.0.5.5.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p115client"
-version = "0.0.5.5.4"
+version = "0.0.5.5.4.1"
 description = "Python 115 webdisk client."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"