p123client 0.0.6.5__tar.gz → 0.0.6.6__tar.gz

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

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

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

@@ -4655,7 +4655,7 @@ class P123Client(P123OpenClient):
         :params payload: 文件 id 或者文件信息，文件信息必须包含的信息如下：
 
             - FileID: int | str 💡 下载链接
-            - S3KeyFlag: str    💡 存储桶名
+            - S3KeyFlag: str    💡 s3 存储名
             - Etag: str         💡 文件的 MD5 散列值
             - Size: int         💡 文件大小
             - FileName: str     💡 默认用 Etag（即 MD5）作为文件名，可以省略
@@ -7046,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, 
@@ -7056,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, 
@@ -7074,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, 
                         )

{p123client-0.0.6.5 → 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.5 → p123client-0.0.6.6}/pyproject.toml

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