p115client 0.0.5.8__tar.gz → 0.0.5.8.2__tar.gz

{p115client-0.0.5.8 → p115client-0.0.5.8.2}/PKG-INFO

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

{p115client-0.0.5.8 → p115client-0.0.5.8.2}/p115client/client.py

@@ -17863,8 +17863,8 @@ class P115Client(P115OpenClient):
 
     @overload
     def share_skip_login_download_url(
-        self, 
-        payload: int | str | dict, 
+        self: int | str | dict | P115Client, 
+        payload: None | int | str | dict = None, 
         /, 
         url: str = "", 
         strict: bool = True, 
@@ -17877,8 +17877,8 @@ class P115Client(P115OpenClient):
         ...
     @overload
     def share_skip_login_download_url(
-        self, 
-        payload: int | str | dict, 
+        self: int | str | dict | P115Client, 
+        payload: None | int | str | dict = None, 
         /, 
         url: str = "", 
         strict: bool = True, 
@@ -17890,8 +17890,8 @@ class P115Client(P115OpenClient):
     ) -> Coroutine[Any, Any, P115URL]:
         ...
     def share_skip_login_download_url(
-        self, 
-        payload: int | str | dict, 
+        self: int | str | dict | P115Client, 
+        payload: None | int | str | dict = None, 
         /, 
         url: str = "", 
         strict: bool = True, 
@@ -17903,6 +17903,9 @@ class P115Client(P115OpenClient):
     ) -> P115URL | Coroutine[Any, Any, P115URL]:
         """获取分享链接中某个文件的下载链接
 
+        .. important::
+            这个函数可以作为 staticmethod 使用，只要 `self` 不是 P115Client 类型，此时不需要登录
+
         :param payload: 请求参数，如果为 int 或 str，则视为 `file_id`
 
             - file_id: int | str 💡 文件 id
@@ -17918,6 +17921,12 @@ class P115Client(P115OpenClient):
 
         :return: 下载链接
         """
+        if isinstance(self, P115Client):
+            assert payload is not None
+            inst: P115Client | type[P115Client] = self
+        else:
+            payload = self
+            inst = __class__ # type: ignore
         if isinstance(payload, (int, str)):
             payload = {"file_id": payload}
         else:
@@ -17928,9 +17937,9 @@ class P115Client(P115OpenClient):
             payload["share_code"] = share_payload["share_code"]
             payload["receive_code"] = share_payload["receive_code"] or ""
         if use_web_api:
-            resp = self.share_skip_login_download_url_web(payload, async_=async_, **request_kwargs)
+            resp = inst.share_skip_login_download_url_web(payload, async_=async_, **request_kwargs)
         else:
-            resp = self.share_skip_login_download_url_app(payload, app=app, async_=async_, **request_kwargs)
+            resp = inst.share_skip_login_download_url_app(payload, app=app, async_=async_, **request_kwargs)
         def get_url(resp: dict, /) -> P115URL:
             info = check_response(resp)["data"]
             file_id = payload["file_id"]
@@ -17962,8 +17971,8 @@ class P115Client(P115OpenClient):
 
     @overload
     def share_skip_login_download_url_app(
-        self, 
-        payload: dict, 
+        self: dict | P115Client, 
+        payload: None | dict = None, 
         /, 
         app: str = "", 
         base_url: bool | str | Callable[[], str] = False, 
@@ -17974,8 +17983,8 @@ class P115Client(P115OpenClient):
         ...
     @overload
     def share_skip_login_download_url_app(
-        self, 
-        payload: dict, 
+        self: dict | P115Client, 
+        payload: None | dict = None, 
         /, 
         app: str = "", 
         base_url: bool | str | Callable[[], str] = False, 
@@ -17985,8 +17994,8 @@ class P115Client(P115OpenClient):
     ) -> Coroutine[Any, Any, dict]:
         ...
     def share_skip_login_download_url_app(
-        self, 
-        payload: dict, 
+        self: dict | P115Client, 
+        payload: None | dict = None, 
         /, 
         app: str = "", 
         base_url: bool | str | Callable[[], str] = False, 
@@ -17996,16 +18005,22 @@ class P115Client(P115OpenClient):
     ) -> dict | Coroutine[Any, Any, dict]:
         """获取免登录下载链接
 
-        POST https://proapi.115.com/app/share/downurl
+        POST https://proapi.115.com/app/share/skip_login_downurl
+
+        .. important::
+            这个函数可以作为 staticmethod 使用，只要 `self` 不是 P115Client 类型，此时不需要登录
 
         :payload:
             - file_id: int | str
             - receive_code: str
             - share_code: str
         """
+        if isinstance(self, dict):
+            payload = self
+        else:
+            assert payload is not None
         if app:
             api = complete_proapi("/2.0/share/skip_login_downurl", base_url, app)
-            return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
         else:
             api = complete_proapi("/app/share/skip_login_downurl", base_url)
             def parse(resp, content: bytes, /) -> dict:
@@ -18015,12 +18030,20 @@ class P115Client(P115OpenClient):
                 return resp
             request_kwargs.setdefault("parse", parse)
             payload = {"data": rsa_encode(dumps(payload)).decode()}
+        if isinstance(self, P115Client):
             return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
+        else:
+            request_kwargs.setdefault("parse", default_parse)
+            request = request_kwargs.pop("request", None)
+            if request is None:
+                return get_default_request()(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
+            else:
+                return request(url=api, method="POST", data=payload, **request_kwargs)
 
     @overload
     def share_skip_login_download_url_web(
-        self, 
-        payload: dict, 
+        self: dict | P115Client, 
+        payload: None | dict = None, 
         /, 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
@@ -18030,8 +18053,8 @@ class P115Client(P115OpenClient):
         ...
     @overload
     def share_skip_login_download_url_web(
-        self, 
-        payload: dict, 
+        self: dict | P115Client, 
+        payload: None | dict = None, 
         /, 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
@@ -18040,8 +18063,8 @@ class P115Client(P115OpenClient):
     ) -> Coroutine[Any, Any, dict]:
         ...
     def share_skip_login_download_url_web(
-        self, 
-        payload: dict, 
+        self: dict | P115Client, 
+        payload: None | dict = None, 
         /, 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
@@ -18052,13 +18075,28 @@ class P115Client(P115OpenClient):
 
         POST https://webapi.115.com/share/skip_login_downurl
 
+        .. important::
+            这个函数可以作为 staticmethod 使用，只要 `self` 不是 P115Client 类型，此时不需要登录
+
         :payload:
             - share_code: str    💡 分享码
             - receive_code: str  💡 接收码（访问密码）
             - file_id: int | str 💡 文件 id
         """
         api = complete_webapi("/share/skip_login_downurl", base_url=base_url)
-        return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
+        if isinstance(self, dict):
+            payload = self
+        else:
+            assert payload is not None
+        if isinstance(self, P115Client):
+            return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
+        else:
+            request_kwargs.setdefault("parse", default_parse)
+            request = request_kwargs.pop("request", None)
+            if request is None:
+                return get_default_request()(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
+            else:
+                return request(url=api, method="POST", data=payload, **request_kwargs)
 
     @overload
     def share_skip_login_down_first(
@@ -18191,7 +18229,7 @@ class P115Client(P115OpenClient):
         GET https://webapi.115.com/share/snap
 
         .. important::
-            这个函数可以作为 staticmethod 使用，只要 `self` 为 dict 类型，此时不需要登录
+            这个函数可以作为 staticmethod 使用，只要 `self` 不是 P115Client 类型，此时不需要登录
 
             否则，就是登录状态，但如果这个分享是你自己的，则可以不提供 receive_code，而且即使还在审核中，也能获取文件列表
 
@@ -18266,7 +18304,7 @@ class P115Client(P115OpenClient):
         GET https://proapi.115.com/android/2.0/share/snap
 
         .. important::
-            这个函数可以作为 staticmethod 使用，只要 `self` 为 dict 类型，此时不需要登录
+            这个函数可以作为 staticmethod 使用，只要 `self` 不是 P115Client 类型，此时不需要登录
 
             否则，就是登录状态，但如果这个分享是你自己的，则可以不提供 receive_code，而且即使还在审核中，也能获取文件列表
 
@@ -20656,3 +20694,5 @@ for name, method in P115Client.__dict__.items():
         CLIENT_API_MAP[match[1]] = "P115Client." + name
 
 # TODO: 提供一个可随时终止和暂停的上传功能，并且可以输出进度条和获取进度
+# TODO: 更新一下，p115client._upload，做更多的封装，至少让断点续传更易于使用
+

{p115client-0.0.5.8 → p115client-0.0.5.8.2}/pyproject.toml

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