p115client 0.0.5.12__py3-none-any.whl → 0.0.5.12.2__py3-none-any.whl

p115client/const.py

@@ -5,8 +5,8 @@ from __future__ import annotations
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
 __all__ = [
-    "AVAILABLE_APPS", "APP_TO_SSOENT", "SSOENT_TO_APP", "CLIENT_API_MAP", 
-    "CLASS_TO_TYPE", "SUFFIX_TO_TYPE", "errno", 
+    "AVAILABLE_APPS", "APP_TO_SSOENT", "SSOENT_TO_APP", "CLIENT_METHOD_API_MAP", 
+    "CLIENT_API_METHODS_MAP", "CLASS_TO_TYPE", "SUFFIX_TO_TYPE", "errno", 
 ]
 
 from enum import IntEnum
@@ -69,8 +69,11 @@ SSOENT_TO_APP: Final[dict[str, str]] = {
     "S1": "harmony", 
 }
 
-#: 所有已封装的 115 接口以及对应的方法名
-CLIENT_API_MAP: Final[dict[str, str]] = {}
+#: 所有已封装的方法名和对应的 115 接口
+CLIENT_METHOD_API_MAP: Final[dict[str, str]] = {}
+
+#: 所有已封装的 115 接口和对应的方法名
+CLIENT_API_METHODS_MAP: Final[dict[str, list[str]]] = {}
 
 #: 文件的 class 属性对应的所属类型的整数代码
 CLASS_TO_TYPE: Final[dict[str, int]] = {

p115client/tool/attr.py

@@ -72,7 +72,7 @@ def get_attr(
             resp = yield client.fs_file(id, async_=async_, **request_kwargs)
             check_response(resp)
             return normalize_attr_web(resp["data"][0], dict_cls=AttrDict)
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 def type_of_attr(attr: Mapping, /) -> int:

p115client/tool/auth.py

@@ -58,5 +58,5 @@ def deauth_open(
                 async_=async_, 
                 **request_kwargs, 
             )
-    return run_gen_step(gen_step, async_=async_)
+    return run_gen_step(gen_step, async_)
 

p115client/tool/download.py

@@ -145,7 +145,7 @@ def batch_get_url(
             for id, info in resp["data"].items()
             if info["url"]
         }
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -228,7 +228,7 @@ def iter_url_batches(
                         is_directory=False,
                         headers=headers, 
                     ))
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -403,7 +403,7 @@ def iter_files_with_url(
                         **request_kwargs, 
                     )
                 yield Yield(attr)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -561,7 +561,7 @@ def iter_images_with_url(
                             **request_kwargs, 
                         )
                 yield Yield(attr)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -746,7 +746,7 @@ def iter_subtitles_with_url(
                                 **request_kwargs, 
                             )
                         yield Yield(attr)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -836,7 +836,7 @@ def iter_subtitle_batches(
                 pass
             finally:
                 yield client.fs_delete(scid, async_=async_, **request_kwargs)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -1077,7 +1077,7 @@ def make_strm(
         if use_abspath is not None:
             params["path_already"] = path_already
         yield (async_batch if async_ else thread_batch)(
-            lambda attr: run_gen_step(save(attr), may_call=False, async_=async_), 
+            lambda attr: run_gen_step(save(attr), async_), 
             (iter_files if use_abspath is None else iter_files_with_path)(
                 client, 
                 cid, 
@@ -1114,7 +1114,7 @@ def make_strm(
             "ignore": ignored, 
             "remove": removed, 
         }
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -1265,7 +1265,7 @@ def iter_download_nodes(
             finally:
                 yield shutdown()
     if pickcode:
-        return run_gen_step_iter(gen_step(pickcode), may_call=False, async_=async_)
+        return run_gen_step_iter(gen_step(pickcode), async_)
     else:
         def chain():
             with with_iter_next(iterdir(
@@ -1283,12 +1283,8 @@ def iter_download_nodes(
                         yield Yield(
                             {"fid": str(attr["id"]), "pid": "0", "fn": attr["name"]}
                         )
-                    yield YieldFrom(run_gen_step_iter(
-                        gen_step(attr["pickcode"]), 
-                        may_call=False, 
-                        async_=async_, 
-                    ))
-        return run_gen_step_iter(chain, may_call=False, async_=async_)
+                    yield YieldFrom(run_gen_step_iter(gen_step(attr["pickcode"]), async_))
+        return run_gen_step_iter(chain, async_)
 
 
 @overload
@@ -1435,11 +1431,7 @@ def iter_download_files(
                             **defaults, 
                         })
             for pickcode in pickcodes:
-                yield YieldFrom(run_gen_step_iter(
-                    gen_step(pickcode), 
-                    may_call=False, 
-                    async_=async_, 
-                ))
+                yield YieldFrom(run_gen_step_iter(gen_step(pickcode), async_))
             return
         if not pickcode:
             resp = yield client.fs_file_skim(cid, async_=async_, **request_kwargs)
@@ -1476,7 +1468,7 @@ def iter_download_files(
             finally:
                 ancestors_loaded = True
         if async_:
-            task: Any = create_task(run_gen_step(load_ancestors, may_call=False, async_=True))
+            task: Any = create_task(run_gen_step(load_ancestors, True))
         else:
             task = run_as_thread(run_gen_step, load_ancestors)
         cache: list[dict] = []
@@ -1510,7 +1502,7 @@ def iter_download_files(
             else:
                 task.result()
             yield YieldFrom(map(norm_attr, cache))
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -1586,5 +1578,5 @@ def get_remaining_open_count(
             for f in cache:
                 f.close()
             return len(cache)
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 

p115client/tool/edit.py

@@ -91,7 +91,7 @@ def update_abstract(
                 chunked(ids, batch_size), 
                 max_workers=max_workers
             ))
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -634,5 +634,5 @@ def batch_unstar(
             async_=async_, # type: ignore
             **request_kwargs, 
         )
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 

p115client/tool/export_dir.py

@@ -120,7 +120,7 @@ def parse_export_dir_as_dict_iter(
                         yield ensure_async(close, threaded=True)
                 elif callable(close := getattr(file, "close", None)):
                     close()
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -230,7 +230,7 @@ def parse_export_dir_as_path_iter(
                         yield ensure_async(close, threaded=True)
                 elif callable(close := getattr(file, "close", None)):
                     close()
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -317,7 +317,7 @@ def parse_export_dir_as_patht_iter(
                         yield ensure_async(close, threaded=True)
                 elif callable(close := getattr(file, "close", None)):
                     close()
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -406,7 +406,7 @@ def export_dir(
             payload["layer_limit"] = layer_limit
         resp = yield client.fs_export_dir(payload, async_=async_, **request_kwargs)
         return check_response(resp)["data"]["export_id"]
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -486,7 +486,7 @@ def export_dir_result(
                 raise TimeoutError(export_id)
             if check_interval:
                 yield do_sleep(min(check_interval, remaining_seconds))
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -645,5 +645,5 @@ def export_dir_parse_iter(
                     async_=async_, # type: ignore
                     **request_kwargs, 
                 )
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 

p115client/tool/fs_files.py

@@ -7,18 +7,19 @@ __doc__ = "这个模块利用 P115Client.fs_files 方法做了一些封装"
 
 from asyncio import shield, wait_for, Task, TaskGroup
 from collections import deque
-from collections.abc import AsyncIterator, Callable, Iterator
+from collections.abc import AsyncIterator, Awaitable, Callable, Iterator
 from concurrent.futures import Future, ThreadPoolExecutor
 from copy import copy
 from errno import EBUSY, ENOENT, ENOTDIR
 from functools import partial
 from inspect import isawaitable
 from itertools import cycle
+from sys import exc_info
 from time import time
-from typing import overload, Any, Final, Literal
+from typing import cast, overload, Any, Final, Literal
 from warnings import warn
 
-from iterutils import run_gen_step, run_gen_step_iter, Yield
+from iterutils import as_gen_step, run_gen_step_iter, Yield
 from p115client import check_response, P115Client, P115OpenClient
 from p115client.client import get_status_code
 from p115client.exception import BusyOSError, DataError, P115Warning
@@ -95,6 +96,16 @@ def iter_fs_files(
         client = P115Client(client, check_for_relogin=True)
     if page_size <= 0:
         page_size = 10_000
+    if not isinstance(client, P115Client) or app == "open":
+        page_size = min(page_size, 1150)
+        fs_files = partial(client.fs_files_open, **request_kwargs)
+    elif app in ("", "web", "desktop", "harmony"):
+        page_size = min(page_size, 1150)
+        request_kwargs.setdefault("base_url", get_webapi_origin)
+        fs_files = partial(client.fs_files, **request_kwargs)
+    else:
+        request_kwargs.setdefault("base_url", get_proapi_origin)
+        fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
     if first_page_size <= 0:
         first_page_size = page_size
     if isinstance(payload, (int, str)):
@@ -104,14 +115,7 @@ def iter_fs_files(
         "limit": first_page_size, "show_dir": 1, **payload, 
     }
     cid = int(payload["cid"])
-    if not isinstance(client, P115Client) or app == "open":
-        fs_files = partial(client.fs_files_open, **request_kwargs)
-    elif app in ("", "web", "desktop", "harmony"):
-        request_kwargs.setdefault("base_url", get_webapi_origin)
-        fs_files = partial(client.fs_files, **request_kwargs)
-    else:
-        request_kwargs.setdefault("base_url", get_proapi_origin)
-        fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
+    @as_gen_step
     def get_files(payload: dict, /):
         nonlocal count
         while True:
@@ -145,13 +149,13 @@ def iter_fs_files(
                 return resp
     def gen_step():
         while True:
-            resp = yield run_gen_step(get_files(payload), may_call=False, async_=async_)
+            resp = yield get_files(payload)
             payload["limit"] = page_size
             yield Yield(resp)
             payload["offset"] += len(resp["data"])
             if payload["offset"] >= count:
                 break
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 def iter_fs_files_threaded(
@@ -187,14 +191,7 @@ def iter_fs_files_threaded(
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if page_size <= 0:
-        page_size = 7_000
-    if isinstance(payload, (int, str)):
-        payload = {"cid": payload}
-    payload = {
-        "asc": 1, "cid": 0, "fc_mix": 1, "o": "user_ptime", "offset": 0, 
-        "limit": page_size, "show_dir": 1, **payload, 
-    }
-    cid = int(payload["cid"])
+        page_size = 10_000
     if not isinstance(client, P115Client) or app == "open":
         page_size = min(page_size, 1150)
         fs_files = partial(client.fs_files_open, **request_kwargs)
@@ -205,6 +202,13 @@ 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)
+    if isinstance(payload, (int, str)):
+        payload = {"cid": payload}
+    payload = {
+        "asc": 1, "cid": 0, "fc_mix": 1, "o": "user_ptime", "offset": 0, 
+        "limit": page_size, "show_dir": 1, **payload, 
+    }
+    cid = int(payload["cid"])
     def get_files(payload: dict, /):
         nonlocal count
         resp = fs_files(payload)
@@ -302,27 +306,41 @@ async def iter_fs_files_asynchronized(
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if page_size <= 0:
-        page_size = 7_000
-    if isinstance(payload, (int, str)):
-        payload = {"cid": payload}
-    payload = {
-        "asc": 1, "cid": 0, "fc_mix": 1, "o": "user_ptime", "offset": 0, 
-        "limit": page_size, "show_dir": 1, **payload, 
-    }
-    cid = int(payload["cid"])
+        page_size = 10_000
+    fs_files: Callable[..., Awaitable[dict]]
     if not isinstance(client, P115Client) or app == "open":
         page_size = min(page_size, 1150)
-        fs_files = partial(client.fs_files_open, **request_kwargs)
+        fs_files = cast(Callable, partial(
+            client.fs_files_open, 
+            async_=True, 
+            **request_kwargs, 
+        ))
     elif app in ("", "web", "desktop", "harmony"):
         page_size = min(page_size, 1150)
         request_kwargs.setdefault("base_url", get_webapi_origin)
-        fs_files = partial(client.fs_files, **request_kwargs)
+        fs_files = cast(Callable, partial(
+            client.fs_files, 
+            async_=True, 
+            **request_kwargs, 
+        ))
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
-        fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
+        fs_files = cast(Callable, partial(
+            client.fs_files_app, 
+            app=app, 
+            async_=True, 
+            **request_kwargs, 
+        ))
+    if isinstance(payload, (int, str)):
+        payload = {"cid": payload}
+    payload = {
+        "asc": 1, "cid": 0, "fc_mix": 1, "o": "user_ptime", "offset": 0, 
+        "limit": page_size, "show_dir": 1, **payload, 
+    }
+    cid = int(payload["cid"])
     async def get_files(payload: dict, /):
         nonlocal count
-        resp = await fs_files(payload, async_=True) # type: ignore
+        resp = await fs_files(payload)
         check_response(resp)
         if cid and int(resp["path"][-1]["cid"]) != cid:
             if count < 0:
@@ -390,7 +408,5 @@ async def iter_fs_files_asynchronized(
     finally:
         for t in tuple(tg._tasks):
             t.cancel()
-        await tg.__aexit__(None, None, None)
-
+        await tg.__aexit__(*exc_info())
 
-# TODO: 以上的数据获取方式某种程度上应该是通用的，只要是涉及到 offset 和 count，因此可以总结出一个更抽象的函数

p115client/tool/history.py

@@ -119,7 +119,7 @@ def iter_history_list_once(
             ts_last_call = time()
             resp = yield history_list(payload, async_=async_)
             events = check_response(resp)["data"]["list"]
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -220,5 +220,5 @@ def iter_history_list(
                         from_time = int(event["update_time"])
                         sub_first_loop = False
                     yield Yield(event)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)