p123client 0.0.6.2__tar.gz → 0.0.6.4__tar.gz

{p123client-0.0.6.2 → p123client-0.0.6.4}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: p123client
-Version: 0.0.6.2
+Version: 0.0.6.4
 Summary: Python 123 webdisk client.
-Home-page: https://github.com/ChenyangGao/python-123-client
+Home-page: https://github.com/ChenyangGao/p123client
 License: MIT
 Keywords: 123,webdisk,client
 Author: ChenyangGao
@@ -34,7 +34,7 @@ Requires-Dist: python-httpfile (>=0.0.5)
 Requires-Dist: python-iterutils (>=0.2)
 Requires-Dist: python-property (>=0.0.3)
 Requires-Dist: yarl
-Project-URL: Repository, https://github.com/ChenyangGao/python-123-client
+Project-URL: Repository, https://github.com/ChenyangGao/p123client
 Description-Content-Type: text/markdown
 
 # Python 123 网盘客户端

{p123client-0.0.6.2 → p123client-0.0.6.4}/p123client/client.py

@@ -107,6 +107,20 @@ def dict_to_lower_merge[K, V](
     return m
 
 
+def update_headers_in_kwargs(
+    request_kwargs: dict, 
+    /, 
+    *args, 
+    **kwargs, 
+):
+    if headers := request_kwargs.get("headers"):
+        headers = dict(headers)
+    else:
+        headers = {}
+    headers.update(*args, **kwargs)
+    request_kwargs["headers"] = headers
+
+
 def escape_filename(
     s: str, 
     /, 
@@ -961,6 +975,7 @@ class P123OpenClient:
             - fileId: int 💡 文件 id
         """
         api = complete_url("/api/v1/file/download_info", base_url)
+        update_headers_in_kwargs(request_kwargs, platform="android")
         if not isinstance(payload, dict):
             payload = {"fileId": payload}
         return self.request(api, params=payload, async_=async_, **request_kwargs)
@@ -4506,12 +4521,7 @@ class P123Client(P123OpenClient):
         """
         def gen_step():
             nonlocal payload
-            if headers := request_kwargs.get("headers"):
-                headers = dict(headers)
-            else:
-                headers = {}
-            headers["platform"] = "android"
-            request_kwargs["headers"] = headers
+            update_headers_in_kwargs(request_kwargs, platform="android")
             if not isinstance(payload, dict):
                 resp = yield self.fs_info(
                     payload, 
@@ -4601,6 +4611,67 @@ class P123Client(P123OpenClient):
             **request_kwargs, 
         )
 
+    @overload
+    def download_url(
+        self, 
+        payload: dict | int | str, 
+        /, 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> str:
+        ...
+    @overload
+    def download_url(
+        self, 
+        payload: dict | int | str, 
+        /, 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, str]:
+        ...
+    def download_url(
+        self, 
+        payload: dict | int | str, 
+        /, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> str | Coroutine[Any, Any, str]:
+        """获取下载链接
+
+        :params payload: 文件 id 或者文件信息，文件信息必须包含的信息如下：
+
+            - S3KeyFlag: str            💡 存储桶名
+            - Etag: str                 💡 文件的 MD5 散列值
+            - Size: int                 💡 文件大小
+            - FileName: str = <default> 💡 默认用 Etag（即 MD5）作为文件名
+
+        :params async_: 是否异步
+        :params request_kwargs: 其它请求参数
+
+        :return: 下载链接
+        """
+        def gen_step():
+            if isinstance(payload, dict):
+                resp = yield self.download_info(
+                    payload, 
+                    async_=async_, 
+                    **request_kwargs, 
+                )
+                check_response(resp)
+                return resp["data"]["DownloadUrl"]
+            else:
+                resp = yield self.download_info_open(
+                    payload, 
+                    async_=async_, 
+                    **request_kwargs, 
+                )
+                check_response(resp)
+                return resp["data"]["downloadUrl"]
+        return run_gen_step(gen_step, async_=async_)
+
     @overload
     def fs_copy(
         self, 
@@ -5904,12 +5975,7 @@ class P123Client(P123OpenClient):
             payload = self
             self = None
         assert payload is not None
-        if headers := request_kwargs.get("headers"):
-            headers = dict(headers)
-        else:
-            headers = {}
-        headers["platform"] = "android"
-        request_kwargs["headers"] = headers
+        update_headers_in_kwargs(request_kwargs, platform="android")
         api = complete_url("share/download/info", base_url)
         if self is None:
             request_kwargs.setdefault("parse", default_parse)

{p123client-0.0.6.2 → p123client-0.0.6.4}/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "p123client"
-version = "0.0.6.2"
+version = "0.0.6.4"
 description = "Python 123 webdisk client."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
 readme = "readme.md"
-homepage = "https://github.com/ChenyangGao/python-123-client"
-repository = "https://github.com/ChenyangGao/python-123-client"
+homepage = "https://github.com/ChenyangGao/p123client"
+repository = "https://github.com/ChenyangGao/p123client"
 keywords = ["123", "webdisk", "client"]
 classifiers = [
     "License :: OSI Approved :: MIT License",