p115client 0.0.5.6.6__tar.gz → 0.0.5.6.8__tar.gz

{p115client-0.0.5.6.6 → p115client-0.0.5.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.6.6
+Version: 0.0.5.6.8
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT
@@ -31,15 +31,15 @@ Requires-Dist: orjson
 Requires-Dist: p115cipher (>=0.0.3)
 Requires-Dist: posixpatht (>=0.0.3)
 Requires-Dist: python-argtools (>=0.0.1)
-Requires-Dist: python-asynctools (>=0.0.10)
+Requires-Dist: python-asynctools (>=0.1)
 Requires-Dist: python-concurrenttools (>=0.0.8.2)
 Requires-Dist: python-cookietools (>=0.0.2.1)
 Requires-Dist: python-dictattr (>=0.0.4)
 Requires-Dist: python-encode_uri (>=0.0.1)
-Requires-Dist: python-filewrap (>=0.2.6.1)
+Requires-Dist: python-filewrap (>=0.2.7.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-httpfile (>=0.0.5.1)
 Requires-Dist: python-iterutils (>=0.1.8)
 Requires-Dist: python-property (>=0.0.3)
 Requires-Dist: python-startfile (>=0.0.2)

{p115client-0.0.5.6.6 → p115client-0.0.5.6.8}/p115client/client.py

@@ -1280,7 +1280,7 @@ class ClientRequestMixin:
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
-        """获取 access_token
+        """绑定扫码并获取开放平台应用的 access_token 和 refresh_token
 
         POST https://qrcodeapi.115.com/open/deviceCodeToToken
 
@@ -1331,7 +1331,7 @@ class ClientRequestMixin:
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
-        """获取 access_token
+        """用一个 refresh_token 去获取新的 access_token 和 refresh_token，然后原来的 refresh_token 作废
 
         POST https://qrcodeapi.115.com/open/refreshToken
 
@@ -1569,7 +1569,7 @@ class ClientRequestMixin:
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
-        """获取登录二维码，扫码可用
+        """获取开放平台的登录二维码，扫码可用
 
         POST https://qrcodeapi.115.com/open/authDeviceCode
 
@@ -2676,9 +2676,9 @@ class P115OpenClient(ClientRequestMixin):
             if isinstance(headers, Mapping):
                 headers = ItemsView(headers)
             headers = request_kwargs["headers"] = {
-                "User-Agent": next((v for k, v in headers if k.lower() == "user-agent" and v), "")}
+                "user-agent": next((v for k, v in headers if k.lower() == "user-agent" and v), "")}
         else:
-            headers = request_kwargs["headers"] = {"User-Agent": ""}
+            headers = request_kwargs["headers"] = {"user-agent": ""}
         def parse(_, content: bytes, /) -> dict:
             json = json_loads(content)
             json["headers"] = headers
@@ -3863,12 +3863,12 @@ class P115OpenClient(ClientRequestMixin):
                 if async_:
                     from httpfile import AsyncHttpxFileReader
                     async def request():
-                        file = await AsyncHttpxFileReader.new(url, headers={"User-Agent": ""})
+                        file = await AsyncHttpxFileReader.new(url, headers={"user-agent": ""})
                         async with file:
                             return await do_upload(file)
                     return request
                 else:
-                    with HTTPFileReader(url, headers={"User-Agent": ""}) as file:
+                    with HTTPFileReader(url, headers={"user-agent": ""}) as file:
                         return do_upload(file)
             elif isinstance(file, (str, PathLike)):
                 path = fsdecode(file)
@@ -4043,7 +4043,7 @@ class P115OpenClient(ClientRequestMixin):
     vip_qr_url_open = vip_qr_url
 
 
-class P115Client(ClientRequestMixin):
+class P115Client(P115OpenClient):
     """115 的客户端对象
 
     :param cookies: 115 的 cookies，要包含 `UID`、`CID`、`KID` 和 `SEID` 等
@@ -4266,7 +4266,7 @@ class P115Client(ClientRequestMixin):
         except OSError:
             self.cookies_mtime = 0
 
-    @overload
+    @overload # type: ignore
     @classmethod
     def init(
         cls, 
@@ -6441,9 +6441,9 @@ class P115Client(ClientRequestMixin):
             if isinstance(headers, Mapping):
                 headers = ItemsView(headers)
             headers = request_kwargs["headers"] = {
-                "User-Agent": next((v for k, v in headers if k.lower() == "user-agent" and v), "")}
+                "user-agent": next((v for k, v in headers if k.lower() == "user-agent" and v), "")}
         else:
-            headers = request_kwargs["headers"] = {"User-Agent": ""}
+            headers = request_kwargs["headers"] = {"user-agent": ""}
         def parse(_, content: bytes, /) -> dict:
             json = json_loads(content)
             if json["state"]:
@@ -6506,9 +6506,9 @@ class P115Client(ClientRequestMixin):
             if isinstance(headers, Mapping):
                 headers = ItemsView(headers)
             headers = request_kwargs["headers"] = {
-                "User-Agent": next((v for k, v in headers if k.lower() == "user-agent" and v), "")}
+                "user-agent": next((v for k, v in headers if k.lower() == "user-agent" and v), "")}
         else:
-            headers = request_kwargs["headers"] = {"User-Agent": ""}
+            headers = request_kwargs["headers"] = {"user-agent": ""}
         def parse(resp, content: bytes, /) -> dict:
             json = json_loads(content)
             if "Set-Cookie" in resp.headers:
@@ -6702,9 +6702,9 @@ class P115Client(ClientRequestMixin):
             if isinstance(headers, Mapping):
                 headers = ItemsView(headers)
             headers = request_kwargs["headers"] = {
-                "User-Agent": next((v for k, v in headers if k.lower() == "user-agent" and v), "")}
+                "user-agent": next((v for k, v in headers if k.lower() == "user-agent" and v), "")}
         else:
-            headers = request_kwargs["headers"] = {"User-Agent": ""}
+            headers = request_kwargs["headers"] = {"user-agent": ""}
         def parse(_, content: bytes, /) -> dict:
             json = json_loads(content)
             json["headers"] = headers
@@ -6758,9 +6758,9 @@ class P115Client(ClientRequestMixin):
             if isinstance(headers, Mapping):
                 headers = ItemsView(headers)
             headers = request_kwargs["headers"] = {
-                "User-Agent": next((v for k, v in headers if k.lower() == "user-agent" and v), "")}
+                "user-agent": next((v for k, v in headers if k.lower() == "user-agent" and v), "")}
         else:
-            headers = request_kwargs["headers"] = {"User-Agent": ""}
+            headers = request_kwargs["headers"] = {"user-agent": ""}
         def parse(resp, content: bytes, /) -> dict:
             json = json_loads(content)
             if "Set-Cookie" in resp.headers:
@@ -13878,7 +13878,7 @@ class P115Client(ClientRequestMixin):
         GET http://115.com/api/video/m3u8/{pickcode}.m3u8?definition={definition}
 
         .. attention::
-            这个接口只支持 web 的 cookies，其它设备会返回空数据，而且获取得到的 m3u8 里的链接，也是 m3u8，会绑定前一次请求时的 User-Agent
+            这个接口只支持 web 的 cookies，其它设备会返回空数据，而且获取得到的 m3u8 里的链接，也是 m3u8，会绑定前一次请求时的 user-agent
 
         :param pickcode: 视频文件的 pickcode
         :params definition: 画质，默认列出所有画质。但可进行筛选，常用的为：
@@ -16023,7 +16023,7 @@ class P115Client(ClientRequestMixin):
         payload["app_ver"] = "99.99.99.99"
         request_kwargs["headers"] = {
             **(request_kwargs.get("headers") or {}), 
-            "User-Agent": "Mozilla/5.0 115disk/99.99.99.99 115Browser/99.99.99.99 115wangpan_android/99.99.99.99", 
+            "user-agent": "Mozilla/5.0 115disk/99.99.99.99 115Browser/99.99.99.99 115wangpan_android/99.99.99.99", 
         }
         request_kwargs["ecdh_encrypt"] = False
         def parse(_, content: bytes, /) -> dict:
@@ -16668,7 +16668,7 @@ class P115Client(ClientRequestMixin):
 
     ########## Recyclebin API ##########
 
-    @overload
+    @overload # type: ignore
     def recyclebin_clean(
         self, 
         payload: int | str | Iterable[int | str] | dict = {}, 
@@ -18465,7 +18465,7 @@ class P115Client(ClientRequestMixin):
         api = complete_proapi("/app/uploadinfo", base_url)
         return self.request(url=api, async_=async_, **request_kwargs)
 
-    @overload
+    @overload # type: ignore
     def upload_init(
         self, 
         /, 
@@ -18631,7 +18631,7 @@ class P115Client(ClientRequestMixin):
         payload = {"filename": filename, "target": f"U_1_{pid}"}
         return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
 
-    @overload
+    @overload # type: ignore
     @staticmethod
     def upload_gettoken(
         request: None | Callable = None, 
@@ -18799,12 +18799,12 @@ class P115Client(ClientRequestMixin):
         request_kwargs["headers"] = {
             **(request_kwargs.get("headers") or {}), 
             "Content-Type": "application/x-www-form-urlencoded", 
-            "User-Agent": "Mozilla/5.0 115disk/99.99.99.99 115Browser/99.99.99.99 115wangpan_android/99.99.99.99", 
+            "user-agent": "Mozilla/5.0 115disk/99.99.99.99 115Browser/99.99.99.99 115wangpan_android/99.99.99.99", 
         }
         request_kwargs.setdefault("parse", parse_upload_init_response)
         return self.upload_init(async_=async_, **request_kwargs)
 
-    @overload
+    @overload # type: ignore
     def upload_file_init(
         self, 
         /, 
@@ -19050,7 +19050,7 @@ class P115Client(ClientRequestMixin):
 
     # TODO: 当文件 < 1 MB 时，文件不急着打开，需要时再打开
     # TODO: 对于上传空文件，有特别的速度（sha1写死）
-    @overload
+    @overload # type: ignore
     def upload_file(
         self, 
         /, 
@@ -19276,12 +19276,12 @@ class P115Client(ClientRequestMixin):
                 if async_:
                     from httpfile import AsyncHttpxFileReader
                     async def request():
-                        file = await AsyncHttpxFileReader.new(url, headers={"User-Agent": ""})
+                        file = await AsyncHttpxFileReader.new(url, headers={"user-agent": ""})
                         async with file:
                             return await do_upload(file)
                     return request
                 else:
-                    with HTTPFileReader(url, headers={"User-Agent": ""}) as file:
+                    with HTTPFileReader(url, headers={"user-agent": ""}) as file:
                         return do_upload(file)
             elif isinstance(file, (str, PathLike)):
                 path = fsdecode(file)
@@ -19513,7 +19513,7 @@ class P115Client(ClientRequestMixin):
         api = complete_webapi("/user/fingerprint", base_url=base_url)
         return self.request(url=api, async_=async_, **request_kwargs)
 
-    @overload
+    @overload # type: ignore
     @staticmethod
     def user_info(
         payload: int | str | dict, 
@@ -20380,29 +20380,6 @@ class P115Client(ClientRequestMixin):
             payload = {"ignore_warn": 0, "share_opt": 1, "safe_pwd": "", **payload}
         return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
 
-    access_token = P115OpenClient.access_token
-    refresh_access_token = P115OpenClient.refresh_access_token
-    download_url_open = P115OpenClient.download_url_open
-    download_url_info_open = P115OpenClient.download_url_info_open
-    fs_copy_open = P115OpenClient.fs_copy_open
-    fs_delete_open = P115OpenClient.fs_delete_open
-    fs_files_open = P115OpenClient.fs_files_open
-    fs_info_open = P115OpenClient.fs_info_open
-    fs_mkdir_open = P115OpenClient.fs_mkdir_open
-    fs_move_open = P115OpenClient.fs_move_open
-    fs_search_open = P115OpenClient.fs_search_open
-    fs_update_open = P115OpenClient.fs_update_open
-    recyclebin_clean_open = P115OpenClient.recyclebin_clean_open
-    recyclebin_list_open = P115OpenClient.recyclebin_list_open
-    recyclebin_revert_open = P115OpenClient.recyclebin_revert_open
-    upload_gettoken_open = P115OpenClient.upload_gettoken_open
-    upload_init_open = P115OpenClient.upload_init_open
-    upload_resume_open = P115OpenClient.upload_resume_open
-    user_info_open = P115OpenClient.user_info_open
-    upload_file_init_open = P115OpenClient.upload_file_init_open
-    upload_file_open = P115OpenClient.upload_file_open
-    vip_qr_url_open = P115OpenClient.vip_qr_url_open
-
 
 for name, method in P115Client.__dict__.items():
     if not (callable(method) and method.__doc__):

{p115client-0.0.5.6.6 → p115client-0.0.5.6.8}/p115client/tool/export_dir.py

@@ -628,9 +628,12 @@ def export_dir_parse_iter(
                 yield YieldFrom(parse_iter(file_wrapper), identity=True) # type: ignore
             finally:
                 if async_:
-                    yield getattr(file, "aclose")
-                else:
-                    file.close()
+                    if callable(aclose := getattr(file, "aclose", None)):
+                        yield aclose
+                    elif callable(close := getattr(file, "close", None)):
+                        yield ensure_async(close, threaded=True)
+                elif callable(close := getattr(file, "close", None)):
+                    close()
         finally:
             if delete:
                 yield client.fs_delete(

{p115client-0.0.5.6.6 → p115client-0.0.5.6.8}/p115client/tool/fs_files.py

@@ -114,14 +114,11 @@ def iter_fs_files(
         "limit": first_page_size, "show_dir": 1, **payload, 
     }
     cid = int(payload["cid"])
-    if isinstance(client, P115OpenClient):
-        request_kwargs.setdefault("base_url", get_proapi_origin)
-        fs_files = partial(client.fs_files, **request_kwargs)
+    if isinstance(client, P115OpenClient) 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)
-    elif app == "open":
-        fs_files = partial(client.fs_files_open, **request_kwargs) # type: ignore
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
         fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
@@ -211,15 +208,12 @@ def iter_fs_files_threaded(
         "limit": page_size, "show_dir": 1, **payload, 
     }
     cid = int(payload["cid"])
-    if isinstance(client, P115OpenClient):
-        request_kwargs.setdefault("base_url", get_proapi_origin)
-        fs_files = partial(client.fs_files, **request_kwargs)
+    if isinstance(client, P115OpenClient) or app == "open":
+        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)
-    elif app == "open":
-        fs_files = partial(client.fs_files_open, **request_kwargs) # type: ignore
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
         fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
@@ -328,15 +322,12 @@ async def iter_fs_files_asynchronized(
         "limit": page_size, "show_dir": 1, **payload, 
     }
     cid = int(payload["cid"])
-    if isinstance(client, P115OpenClient):
-        request_kwargs.setdefault("base_url", get_proapi_origin)
-        fs_files = partial(client.fs_files, **request_kwargs)
+    if isinstance(client, P115OpenClient) or app == "open":
+        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)
-    elif app == "open":
-        fs_files = partial(client.fs_files_open, **request_kwargs) # type: ignore
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
         fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
@@ -377,7 +368,7 @@ async def iter_fs_files_asynchronized(
             if args is None:
                 args = copy(payload)
             ts = time()
-            return create_task(get_files(args)) # type: ignore
+            return create_task(get_files(args))
         task = make_task()
         offset = payload["offset"]
         while True:

{p115client-0.0.5.6.6 → p115client-0.0.5.6.8}/p115client/tool/iterdir.py

@@ -3333,11 +3333,25 @@ def iter_selected_nodes(
         return normalize_attr(info)
     if async_:
         request_kwargs["async_"] = True
-        return async_filter(None, async_map(project, taskgroup_map( # type: ignore
-            client.fs_file, ids, max_workers=max_workers, kwargs=request_kwargs)))
+        return async_filter(None, async_map(
+            project, # type: ignore
+            taskgroup_map(
+                client.fs_file, # type: ignore
+                ids, 
+                max_workers=max_workers, 
+                kwargs=request_kwargs, 
+            ), 
+        ))
     else:
-        return filter(None, map(project, threadpool_map(
-            client.fs_file, ids, max_workers=max_workers, kwargs=request_kwargs)))
+        return filter(None, map(
+            project, 
+            threadpool_map(
+                client.fs_file, 
+                ids, 
+                max_workers=max_workers, 
+                kwargs=request_kwargs, 
+            ), 
+        ))
 
 
 @overload
@@ -3521,11 +3535,25 @@ def iter_selected_nodes_using_edit(
     args_it = ({"file_id": fid, "show_play_long": 1} for fid in ids)
     if async_:
         request_kwargs["async_"] = True
-        return async_filter(None, async_map(project, taskgroup_map( # type: ignore
-            client.fs_edit_app, args_it, max_workers=max_workers, kwargs=request_kwargs)))
+        return async_filter(None, async_map(
+            project, # type: ignore
+            taskgroup_map(
+                client.fs_edit_app, # type: ignore
+                args_it, 
+                max_workers=max_workers, 
+                kwargs=request_kwargs, 
+            ), 
+        ))
     else:
-        return filter(None, map(project, threadpool_map(
-            client.fs_edit_app, args_it, max_workers=max_workers, kwargs=request_kwargs)))
+        return filter(None, map(
+            project, 
+            threadpool_map(
+                client.fs_edit_app, 
+                args_it, 
+                max_workers=max_workers, 
+                kwargs=request_kwargs, 
+            ), 
+        ))
 
 
 @overload

{p115client-0.0.5.6.6 → p115client-0.0.5.6.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p115client"
-version = "0.0.5.6.6"
+version = "0.0.5.6.8"
 description = "Python 115 webdisk client."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
@@ -39,14 +39,14 @@ orjson = "*"
 p115cipher = ">=0.0.3"
 posixpatht = ">=0.0.3"
 python-argtools = ">=0.0.1"
-python-asynctools = ">=0.0.10"
+python-asynctools = ">=0.1"
 python-concurrenttools = ">=0.0.8.2"
 python-cookietools = ">=0.0.2.1"
 python-dictattr = ">=0.0.4"
 python-encode_uri = ">=0.0.1"
-python-filewrap = ">=0.2.6.1"
+python-filewrap = ">=0.2.7.1"
 python-hashtools = ">=0.0.3.3"
-python-httpfile = ">=0.0.5"
+python-httpfile = ">=0.0.5.1"
 python-http_request = ">=0.0.6"
 python-iterutils = ">=0.1.8"
 python-property = ">=0.0.3"