p123client 0.0.6.1__py3-none-any.whl → 0.0.6.3__py3-none-any.whl

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, 
     /, 
@@ -742,6 +756,22 @@ class P123OpenClient:
 
         :payload:
             - fileID: int 💡 文件 id
+
+        :return:
+            响应数据的 data 字段是一个字典，键值如下：
+
+            +---------------------+--------+----------+--------------------------------------------------------------+
+            | 名称                | 类型   | 是否必填 | 说明                                                         |
+            +=====================+========+==========+==============================================================+
+            | list                | array  | 必填     | 响应列表                                                     |
+            +---------------------+--------+----------+--------------------------------------------------------------|
+            | list[*].resolutions | string | 必填     | 分辨率                                                       |
+            +---------------------+--------+----------+--------------------------------------------------------------|
+            | list[*].address     | string | 必填     | 播放地址。请将播放地址放入支持的 hls 协议的播放器中进行播放。|
+            |                     |        |          | 示例在线播放地址: https://m3u8-player.com/                   |
+            |                     |        |          | 请注意：转码链接播放过程中将会消耗您的直链流量。             |
+            |                     |        |          | 如果您开启了直链鉴权,也需要将转码链接根据鉴权指引进行签名。  |
+            +---------------------+--------+----------+--------------------------------------------------------------+
         """
         api = complete_url("/api/v1/direct-link/get/m3u8", base_url)
         if not isinstance(payload, dict):
@@ -832,6 +862,17 @@ class P123OpenClient:
 
         :payload:
             - ids: str 💡 视频文件 id 列表
+
+        :return:
+            响应数据的 data 字段是一个字典，键值如下：
+
+            +-----------+-------+----------+-------------------------------------------+
+            | 名称      | 类型  | 是否必填 | 说明                                      |
+            +===========+=======+==========+===========================================+
+            | noneList  | array | 必填     | 未发起过转码的 ID                         |
+            | errorList | array | 必填     | 错误文件ID列表,这些文件ID无法进行转码操作 |
+            | success   | array | 必填     | 转码成功的文件ID列表                      |
+            +-----------+-------+----------+-------------------------------------------+
         """
         api = complete_url("/api/v1/direct-link/queryTranscode", base_url)
         if not isinstance(payload, dict):
@@ -934,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)
@@ -2296,8 +2338,8 @@ class P123OpenClient:
         """
         api = complete_url("/upload/v1/oss/file/create", base_url)
         payload = dict_to_lower_merge(payload, type=1)
-        if not payload.get("duplicate"):
-            payload.pop("duplicate", None)
+        if "duplicate" in payload and not payload["duplicate"]:
+            del payload["duplicate"]
         return self.request(api, "POST", json=payload, async_=async_, **request_kwargs)
 
     @overload
@@ -3642,8 +3684,8 @@ class P123OpenClient:
             "parentFileId": 0, 
             "containDir": "false", 
         })
-        if not payload.get("duplicate"):
-            payload.pop("duplicate", None)
+        if "duplicate" in payload and not payload["duplicate"]:
+            del payload["duplicate"]
         return self.request(api, "POST", json=payload, async_=async_, **request_kwargs)
 
     @overload
@@ -4479,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, 
@@ -5877,12 +5914,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/exception.py

@@ -1,7 +1,10 @@
 #!/usr/bin/env python3
 # encoding: utf-8
 
-__all__ = ["P123Warning", "P123OSError", "P123BrokenUpload"]
+__all__ = [
+    "P123Warning", "P123OSError", "P123BrokenUpload", 
+    "P123AccessTokenError", "P123AuthenticationError", 
+]
 
 import warnings
 
@@ -47,3 +50,11 @@ class P123OSError(OSError):
 class P123BrokenUpload(P123OSError):
     pass
 
+
+class P123AccessTokenError(P123OSError):
+    pass
+
+
+class P123AuthenticationError(P123OSError):
+    pass
+

p123client/tool/__init__.py

@@ -280,7 +280,7 @@ def _iterdir(
     :return: 迭代器，产生文件或目录的信息
     """
     default_payload = payload
-    page_size = int(payload["limit"])
+    page_size = int(payload.setdefault("limit", 100))
     def gen_step():
         nonlocal parent_id
         dq: deque[tuple[int, int, str]] = deque()

{p123client-0.0.6.1.dist-info → p123client-0.0.6.3.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: p123client
-Version: 0.0.6.1
+Version: 0.0.6.3
 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.3.dist-info/RECORD

@@ -0,0 +1,12 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p123client/__init__.py,sha256=gfUum-q3f_XuXOk2HpArDAIxAlscZm8Fau1kiNkNFpg,214
+p123client/client.py,sha256=E4X5qEKnkDb17KGiy7CrhzKBkQ8ukFTFM6qxUzGsnVg,246781
+p123client/const.py,sha256=T17OzPQrnIG6w_Hzjc8TF_fFMKa-hQMSn1gff8pVcBc,56
+p123client/exception.py,sha256=020xGo8WQmGCJz1UzNg9oFzpEvToQcgTye0s6lkFASQ,1540
+p123client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+p123client/tool/__init__.py,sha256=2k_tcc67O9QG4wzESIdnAwqNHybCGlrsnxo_uBqBhEI,16673
+p123client/type.py,sha256=T17OzPQrnIG6w_Hzjc8TF_fFMKa-hQMSn1gff8pVcBc,56
+p123client-0.0.6.3.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p123client-0.0.6.3.dist-info/METADATA,sha256=MgwA-g5ZGjXIchhxrFkYLPIoPeVJU96399yiIkxlBPw,8855
+p123client-0.0.6.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p123client-0.0.6.3.dist-info/RECORD,,

p123client-0.0.6.1.dist-info/RECORD

@@ -1,12 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p123client/__init__.py,sha256=gfUum-q3f_XuXOk2HpArDAIxAlscZm8Fau1kiNkNFpg,214
-p123client/client.py,sha256=T0PcrNCgbFBRIoFXt6iVYjDCS2FSStadAeaFwb_q-hw,244302
-p123client/const.py,sha256=T17OzPQrnIG6w_Hzjc8TF_fFMKa-hQMSn1gff8pVcBc,56
-p123client/exception.py,sha256=d2PN6mRJuw6SXNiTOBfjZQ6qfInAvkERkcbx4PQ-7vA,1369
-p123client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-p123client/tool/__init__.py,sha256=P67eusj4p7O6VyOgRrSJEspI3nTM7mLFySyw55bsOtA,16657
-p123client/type.py,sha256=T17OzPQrnIG6w_Hzjc8TF_fFMKa-hQMSn1gff8pVcBc,56
-p123client-0.0.6.1.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p123client-0.0.6.1.dist-info/METADATA,sha256=2aec3rDPgFBC4UI1QErD4RBR7W76VvblXCZsuELbjlk,8869
-p123client-0.0.6.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p123client-0.0.6.1.dist-info/RECORD,,