p115client 0.0.5.5.5__py3-none-any.whl → 0.0.5.6.1__py3-none-any.whl

p115client/tool/fs_files.py

@@ -19,7 +19,7 @@ from typing import cast, overload, Any, Final, Literal
 from warnings import warn
 
 from iterutils import run_gen_step, run_gen_step_iter, Yield
-from p115client import check_response, P115Client
+from p115client import check_response, P115Client, P115OpenClient
 from p115client.client import get_status_code
 from p115client.exception import BusyOSError, DataError, P115Warning
 
@@ -42,7 +42,7 @@ def is_timeouterror(exc: BaseException, /) -> bool:
 
 @overload
 def iter_fs_files(
-    client: str | P115Client, 
+    client: str | P115Client | P115OpenClient, 
     payload: int | str | dict = 0, 
     /, 
     first_page_size: int = 0, 
@@ -58,7 +58,7 @@ def iter_fs_files(
     ...
 @overload
 def iter_fs_files(
-    client: str | P115Client, 
+    client: str | P115Client | P115OpenClient, 
     payload: int | str | dict = 0, 
     /, 
     first_page_size: int = 0, 
@@ -73,7 +73,7 @@ def iter_fs_files(
 ) -> AsyncIterator[dict]:
     ...
 def iter_fs_files(
-    client: str | P115Client, 
+    client: str | P115Client | P115OpenClient, 
     payload: int | str | dict = 0, 
     /, 
     first_page_size: int = 0, 
@@ -101,7 +101,7 @@ def iter_fs_files(
 
     :return: 迭代器，每次返回一次接口调用的结果
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if page_size <= 0:
         page_size = 10_000
@@ -114,17 +114,20 @@ def iter_fs_files(
         "limit": first_page_size, "show_dir": 1, **payload, 
     }
     cid = int(payload["cid"])
-    if app in ("", "web", "desktop", "harmony"):
+    if isinstance(client, P115OpenClient):
+        request_kwargs.setdefault("base_url", get_proapi_origin)
+        fs_files = partial(client.fs_files, **request_kwargs)
+    elif app in ("", "web", "desktop", "harmony"):
         request_kwargs.setdefault("base_url", get_webapi_origin)
-        fs_files = partial(client.fs_files, async_=async_, **request_kwargs)
+        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, async_=async_, **request_kwargs)
+        fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
     def get_files(payload: dict, /):
         nonlocal count
         while True:
             try:
-                resp = yield fs_files(payload)
+                resp = yield fs_files(payload, async_=async_)
                 check_response(resp)
             except DataError:
                 if payload["limit"] <= 1150:
@@ -166,7 +169,7 @@ def iter_fs_files(
 
 
 def iter_fs_files_threaded(
-    client: str | P115Client, 
+    client: str | P115Client | P115OpenClient, 
     payload: int | str | dict = 0, 
     /, 
     page_size: int = 7_000, 
@@ -195,7 +198,7 @@ def iter_fs_files_threaded(
 
     :return: 迭代器
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if page_size <= 0:
         page_size = 7_000
@@ -206,7 +209,10 @@ def iter_fs_files_threaded(
         "limit": page_size, "show_dir": 1, **payload, 
     }
     cid = int(payload["cid"])
-    if app in ("", "web", "desktop", "harmony"):
+    if isinstance(client, P115OpenClient):
+        request_kwargs.setdefault("base_url", get_proapi_origin)
+        fs_files = partial(client.fs_files, **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)
@@ -280,7 +286,7 @@ def iter_fs_files_threaded(
 
 
 async def iter_fs_files_asynchronized(
-    client: str | P115Client, 
+    client: str | P115Client | P115OpenClient, 
     payload: int | str | dict = 0, 
     /, 
     page_size: int = 7_000, 
@@ -307,7 +313,7 @@ async def iter_fs_files_asynchronized(
 
     :return: 迭代器
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if page_size <= 0:
         page_size = 7_000
@@ -318,7 +324,10 @@ async def iter_fs_files_asynchronized(
         "limit": page_size, "show_dir": 1, **payload, 
     }
     cid = int(payload["cid"])
-    if app in ("", "web", "desktop", "harmony"):
+    if isinstance(client, P115OpenClient):
+        request_kwargs.setdefault("base_url", get_proapi_origin)
+        fs_files = partial(client.fs_files, **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)

{p115client-0.0.5.5.5.dist-info → p115client-0.0.5.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.5.5
+Version: 0.0.5.6.1
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT
@@ -40,7 +40,7 @@ Requires-Dist: python-filewrap (>=0.2.6.1)
 Requires-Dist: python-hashtools (>=0.0.3.3)
 Requires-Dist: python-http_request (>=0.0.6)
 Requires-Dist: python-httpfile (>=0.0.5)
-Requires-Dist: python-iterutils (>=0.1.7)
+Requires-Dist: python-iterutils (>=0.1.8)
 Requires-Dist: python-property (>=0.0.3)
 Requires-Dist: python-startfile (>=0.0.2)
 Requires-Dist: python-undefined (>=0.0.3)
@@ -106,6 +106,39 @@ from pathlib import Path
 client = P115Client(Path("~/115-cookies.txt").expanduser(), check_for_relogin=True)
 ```
 
+如果你有一个申请通过的开放接口的应用，则可以创建开放接口的客户端实例
+
+你可以直接从一个 `P115Client` 实例拿到授权（自动扫码登录并授权）
+
+```python
+app_id = <开放接口应用的 AppID>
+client_open = client.login_another_open(app_id)
+```
+
+也可以用一个已经授权得到的 `refresh_token` (一次性使用)
+
+```python
+from p115client import P115OpenClient
+
+client_open = P115OpenClient(refresh_token)
+```
+
+或者手动扫码登录
+
+```python
+client_open = P115OpenClient(app_id)
+```
+
+所以综上，推荐的初始化代码为
+
+```python
+from p115client import P115Client, P115OpenClient
+from pathlib import Path
+
+client = P115Client(Path("~/115-cookies.txt").expanduser(), check_for_relogin=True)
+client_open = client.login_another_open(app_id)
+```
+
 ### 2. 接口调用
 
 所有需要直接或间接执行 HTTP 请求的接口，都有同步和异步的调用方式

{p115client-0.0.5.5.5.dist-info → p115client-0.0.5.6.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
 p115client/__init__.py,sha256=1mx7njuAlqcuEWONTjSiiGnXyyNyqOcJyNX1FMHqQ-4,214
-p115client/_upload.py,sha256=4Qt7bJOAgob3lcbX1yUZ0hilkAXABD2J9BSLYPIGybQ,29900
-p115client/client.py,sha256=FpB-gG4f3Vv5ZwSET4jBGVJg9FcNPaYEj_aGN8t4e8g,616516
+p115client/_upload.py,sha256=j2XHz6-hc9qyfiF92aZY-LPJ3UgbB6e4Jy6CNGQ5rwk,29904
+p115client/client.py,sha256=ACDHsjrxhPCeEN44Dgtd6l3wUrIKDLUmQqQYs1_dHL4,695455
 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
@@ -9,7 +9,7 @@ p115client/tool/__init__.py,sha256=2YrKoAcFYOuqu2nUBoPVhxMOseAvcLE_LcnbZV11UKw,3
 p115client/tool/download.py,sha256=KY-8QHhCm_Mk-ygtuQXuPtoIIJHRWg5XNQQx0WDncGA,56232
 p115client/tool/edit.py,sha256=NQiyVoOKKed6VbUj_AamGmTWXfcioOFqq5buFUWOh_8,16428
 p115client/tool/export_dir.py,sha256=QFHK5HKllTV6ZgCnnf_BFd4CQq-gqcuLx49clcbvmDo,23871
-p115client/tool/fs_files.py,sha256=aOU2Ea7_CLUfzq3_UJx2SBF8ubJYAkZ4J-e2H3OfqpA,15602
+p115client/tool/fs_files.py,sha256=VxqFvpz-olfuiQu5Gz9RuXaZBE7OX8FOn49-suJUopE,16171
 p115client/tool/iterdir.py,sha256=hpzOCaYi0-8XA6yS3RVnMp9a1FT25qjpZwnPJYNOXYw,183974
 p115client/tool/life.py,sha256=8STXfjL8DPp0YTLFsE7Dt_6c2wj_0AvScq6WrjX9i9M,17583
 p115client/tool/pool.py,sha256=vFV3t4g8KuQ4Rlttd1bs7d0Lc8jFUufdmDQweMcLZZw,9779
@@ -17,7 +17,7 @@ p115client/tool/request.py,sha256=SWsezW9EYZGS3R-TbZxMG-8bN3YWJ0-GzgvKlvRBSCM,70
 p115client/tool/upload.py,sha256=qK1OQYxP-Faq2eMDhc5sBXJiSr8m8EZ_gb0O_iA2TrI,15915
 p115client/tool/xys.py,sha256=6NZUkWNsWW6dHDBUpMitmE-1YlkobWIUQ86CBjKJ4mQ,3633
 p115client/type.py,sha256=e4g9URQBE23XN2dGomldj8wC6NlDWBBSVC5Bmd8giBc,5993
-p115client-0.0.5.5.5.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client-0.0.5.5.5.dist-info/METADATA,sha256=9Q9J8L5qSZGbLuKxSErtiIjKhwkcjhN_2O1aVdvyrFY,7143
-p115client-0.0.5.5.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p115client-0.0.5.5.5.dist-info/RECORD,,
+p115client-0.0.5.6.1.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.6.1.dist-info/METADATA,sha256=wfF5vcyleLccNghmVcChGtRtNnn4hoUCGmUJe4p8cXY,7958
+p115client-0.0.5.6.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.6.1.dist-info/RECORD,,