p123client 0.0.6.4__tar.gz → 0.0.6.6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p123client
-Version: 0.0.6.4
+Version: 0.0.6.6
 Summary: Python 123 webdisk client.
 Home-page: https://github.com/ChenyangGao/p123client
 License: MIT

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

@@ -40,6 +40,9 @@ from .exception import P123OSError, P123BrokenUpload
 
 
 # 默认使用的域名
+# "https://www.123pan.com"
+# "https://www.123pan.com/a"
+# "https://www.123pan.com/b"
 DEFAULT_BASE_URL = "https://www.123pan.com/b"
 DEFAULT_LOGIN_BASE_URL = "https://login.123pan.com"
 DEFAULT_OPEN_BASE_URL = "https://open-api.123pan.com"
@@ -4531,8 +4534,7 @@ class P123Client(P123OpenClient):
                 )
                 resp["payload"] = payload
                 check_response(resp)
-                info_list = resp["data"]["infoList"]
-                if not info_list:
+                if not (info_list := resp["data"]["infoList"]):
                     raise FileNotFoundError(ENOENT, resp)
                 payload = cast(dict, info_list[0])
                 if payload["Type"]:
@@ -4641,12 +4643,22 @@ class P123Client(P123OpenClient):
     ) -> str | Coroutine[Any, Any, str]:
         """获取下载链接
 
+        .. note::
+            `payload` 支持多种格式的输入，按下面的规则按顺序进行判断：
+
+            1. 如果是 `int` 或 `str`，则视为文件 id，必须在你的网盘中存在此文件
+            2. 如果是 `dict`（不区分大小写），有 "S3KeyFlag", "Etag" 和 "Size" 的值，则直接获取链接，文件不必在你网盘中
+            3. 如果是 `dict`（不区分大小写），有 "Etag" 和 "Size" 的值，则会先秒传（临时文件路径为 /.tempfile）再获取链接，文件不必在你网盘中
+            4. 如果是 `dict`（不区分大小写），有 "FileID"，则会先获取信息，再获取链接，必须在你的网盘中存在此文件
+            5. 否则会报错 ValueError
+
         :params payload: 文件 id 或者文件信息，文件信息必须包含的信息如下：
 
-            - S3KeyFlag: str            💡 存储桶名
-            - Etag: str                 💡 文件的 MD5 散列值
-            - Size: int                 💡 文件大小
-            - FileName: str = <default> 💡 默认用 Etag（即 MD5）作为文件名
+            - FileID: int | str 💡 下载链接
+            - S3KeyFlag: str    💡 s3 存储名
+            - Etag: str         💡 文件的 MD5 散列值
+            - Size: int         💡 文件大小
+            - FileName: str     💡 默认用 Etag（即 MD5）作为文件名，可以省略
 
         :params async_: 是否异步
         :params request_kwargs: 其它请求参数
@@ -4654,7 +4666,37 @@ class P123Client(P123OpenClient):
         :return: 下载链接
         """
         def gen_step():
+            nonlocal payload
             if isinstance(payload, dict):
+                payload = dict_to_lower(payload)
+                if not ("size" in payload and "etag" in payload):
+                    if fileid := payload.get("fileid"):
+                        resp = yield self.fs_info(fileid, async_=async_, **request_kwargs)
+                        check_response(resp)
+                        if not (info_list := resp["data"]["infoList"]):
+                            raise P123OSError(ENOENT, resp)
+                        info = info_list[0]
+                        if info["Type"]:
+                            raise IsADirectoryError(EISDIR, resp)
+                        payload = dict_to_lower_merge(payload, info)
+                    else:
+                        raise ValueError("`Size` and `Etag` must be provided")
+                if "s3keyflag" not in payload:
+                    resp = yield self.upload_request(
+                        {
+                            "filename": ".tempfile", 
+                            "duplicate": 2, 
+                            "etag": payload["etag"], 
+                            "size": payload["size"], 
+                            "type": 0, 
+                        }, 
+                        async_=async_, 
+                        **request_kwargs, 
+                    )
+                    check_response(resp)
+                    if not resp["data"]["Reuse"]:
+                        raise P123OSError(ENOENT, resp)
+                    payload["s3keyflag"] = resp["data"]["Info"]["S3KeyFlag"]
                 resp = yield self.download_info(
                     payload, 
                     async_=async_, 
@@ -7004,8 +7046,10 @@ class P123Client(P123OpenClient):
                 if async_:
                     async def request():
                         chunks = bio_chunk_async_iter(file, chunksize=slice_size) # type: ignore
-                        upload_data["partNumberStart"] = 1
+                        slice_no = 1
                         async for chunk in chunks:
+                            upload_data["partNumberStart"] = slice_no
+                            upload_data["partNumberEnd"]   = slice_no + 1
                             resp = await self.upload_prepare(
                                 upload_data, 
                                 base_url=base_url, 
@@ -7014,17 +7058,18 @@ class P123Client(P123OpenClient):
                             )
                             check_response(resp)
                             await self.request(
-                                resp["data"]["presignedUrls"]["1"], 
+                                resp["data"]["presignedUrls"][str(slice_no)], 
                                 data=chunk, 
                                 async_=True, 
                                 **upload_request_kwargs, 
                             )
-                            upload_data["partNumberStart"] += 1
+                            slice_no += 1
                     yield request()
                 else:
                     chunks = bio_chunk_iter(file, chunksize=slice_size) # type: ignore
                     for slice_no, chunk in enumerate(chunks, 1):
                         upload_data["partNumberStart"] = slice_no
+                        upload_data["partNumberEnd"]   = slice_no + 1
                         resp = self.upload_prepare(
                             upload_data, 
                             base_url=base_url, 
@@ -7032,7 +7077,7 @@ class P123Client(P123OpenClient):
                         )
                         check_response(resp)
                         self.request(
-                            resp["data"]["presignedUrls"]["1"], 
+                            resp["data"]["presignedUrls"][str(slice_no)], 
                             data=chunk, 
                             **upload_request_kwargs, 
                         )
@@ -7313,3 +7358,7 @@ class P123Client(P123OpenClient):
         return request(url=api, method="POST", json=payload, **request_kwargs)
 
 # TODO: 添加扫码登录接口，以及通过扫码登录的方法
+# TODO: 添加 同步空间 和 直链空间 的操作接口
+# TODO: 添加 图床 的操作接口
+# TODO: 添加 视频转码 的操作接口
+# TODO: 对于某些工具的接口封装，例如 重复文件清理

{p123client-0.0.6.4 → p123client-0.0.6.6}/p123client/tool/__init__.py

@@ -194,19 +194,16 @@ def get_downurl(
             size = int(size_s)
             if s3_key_flag:
                 payload = {
-                    "S3KeyFlag": s3_key_flag, 
                     "FileName": name, 
                     "Etag": md5, 
                     "Size": size, 
+                    "S3KeyFlag": s3_key_flag, 
                 }
             else:
-                resp = yield client.fs_mkdir("我的秒传", async_=async_, **request_kwargs)
-                check_response(resp)
                 resp = yield client.upload_file_fast(
+                    file_name=".tempfile", 
                     file_md5=md5, 
-                    file_name=f"{md5}-{size}", 
                     file_size=size, 
-                    parent_id=resp["data"]["Info"]["FileId"], 
                     duplicate=2, 
                     async_=async_, 
                     **request_kwargs, 

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p123client"
-version = "0.0.6.4"
+version = "0.0.6.6"
 description = "Python 123 webdisk client."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"