p115client 0.0.5.6.3__tar.gz → 0.0.5.6.5__tar.gz

{p115client-0.0.5.6.3 → p115client-0.0.5.6.5}/PKG-INFO

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

{p115client-0.0.5.6.3 → p115client-0.0.5.6.5}/p115client/client.py

@@ -194,6 +194,8 @@ def complete_proapi(
         base_url = "https://proapi.115.com"
     elif not base_url:
         base_url = "http://proapi.115.com"
+    if not app and path.startswith("/open/") and base_url == "http://proapi.115.com":
+        base_url = "https://proapi.115.com"
     return f"{base_url}{app}{path}"
 
 
@@ -2492,7 +2494,7 @@ class P115OpenClient(ClientRequestMixin):
     def upload_token(self, /) -> dict:
         token = self.__dict__.get("upload_token", {})
         if not token or token["Expiration"] < (datetime.now() - timedelta(hours=7, minutes=30)).strftime("%FT%XZ"):
-            resp = self.upload_gettoken()
+            resp = self.upload_gettoken_open()
             check_response(resp)
             token = self.__dict__["upload_token"] = resp["data"]
         return token
@@ -2585,7 +2587,7 @@ class P115OpenClient(ClientRequestMixin):
 
         :return: 下载链接
         """
-        resp = self.download_url_info(
+        resp = self.download_url_info_open(
             pickcode, 
             async_=async_, 
             **request_kwargs, 
@@ -3595,6 +3597,7 @@ class P115OpenClient(ClientRequestMixin):
         :param filename: 文件名
         :param filesize: 文件大小
         :param filesha1: 文件的 sha1
+        :param preid: 文件的前 128 KB 数据的 sha1 值（目前这个参数没啥用，不要传）
         :param read_range_bytes_or_hash: 调用以获取二次验证的数据或计算 sha1，接受一个数据范围，格式符合 `HTTP Range Requests <https://developer.mozilla.org/en-US/docs/Web/HTTP/Range_requests>`_，返回值如果是 str，则视为计算好的 sha1，如果为 Buffer，则视为数据（之后会被计算 sha1）
         :param pid: 上传文件到此目录的 id
         :param async_: 是否异步
@@ -3613,7 +3616,7 @@ class P115OpenClient(ClientRequestMixin):
                 "preid": preid, 
                 "topupload": 1, 
             }
-            resp = yield self.upload_init(
+            resp = yield self.upload_init_open(
                 payload, 
                 async_=async_, 
                 **request_kwargs, 
@@ -3633,7 +3636,7 @@ class P115OpenClient(ClientRequestMixin):
                     payload["sign_val"] = data.upper()
                 else:
                     payload["sign_val"] = sha1(data).hexdigest().upper()
-                resp = yield self.upload_init(
+                resp = yield self.upload_init_open(
                     payload, 
                     async_=async_, # type: ignore
                     **request_kwargs, 
@@ -3764,7 +3767,7 @@ class P115OpenClient(ClientRequestMixin):
         def gen_step():
             nonlocal file, filename, filesize, filesha1
             def do_upload(file):
-                return self.upload_file(
+                return self.upload_file_open(
                     file=file, 
                     filename=filename, 
                     pid=pid, 
@@ -3922,7 +3925,7 @@ class P115OpenClient(ClientRequestMixin):
                 filename = str(uuid4())
             if filesize < 0:
                 filesize = getattr(file, "length", 0)
-            resp = yield self.upload_file_init(
+            resp = yield self.upload_file_init_open(
                 filename=filename, 
                 filesize=filesize, 
                 filesha1=filesha1, 
@@ -4018,6 +4021,27 @@ class P115OpenClient(ClientRequestMixin):
         api = complete_proapi("/open/vip/qr_url", base_url)
         return self.request(url=api, params=payload, async_=async_, **request_kwargs)
 
+    download_url_open = download_url
+    download_url_info_open = download_url_info
+    fs_copy_open = fs_copy
+    fs_delete_open = fs_delete
+    fs_files_open = fs_files
+    fs_info_open = fs_info
+    fs_mkdir_open = fs_mkdir
+    fs_move_open = fs_move
+    fs_search_open = fs_search
+    fs_update_open = fs_update
+    recyclebin_clean_open = recyclebin_clean
+    recyclebin_list_open = recyclebin_list
+    recyclebin_revert_open = recyclebin_revert
+    upload_gettoken_open = upload_gettoken
+    upload_init_open = upload_init
+    upload_resume_open = upload_resume
+    user_info_open = user_info
+    upload_file_init_open = upload_file_init
+    upload_file_open = upload_file
+    vip_qr_url_open = vip_qr_url
+
 
 class P115Client(ClientRequestMixin):
     """115 的客户端对象
@@ -20355,26 +20379,26 @@ class P115Client(ClientRequestMixin):
 
     access_token = P115OpenClient.access_token
     refresh_access_token = P115OpenClient.refresh_access_token
-    download_url_open = P115OpenClient.download_url
-    download_url_info_open = P115OpenClient.download_url_info
-    fs_copy_open = P115OpenClient.fs_copy
-    fs_delete_open = P115OpenClient.fs_delete
-    fs_files_open = P115OpenClient.fs_files
-    fs_info_open = P115OpenClient.fs_info
-    fs_mkdir_open = P115OpenClient.fs_mkdir
-    fs_move_open = P115OpenClient.fs_move
-    fs_search_open = P115OpenClient.fs_search
-    fs_update_open = P115OpenClient.fs_update
-    recyclebin_clean_open = P115OpenClient.recyclebin_clean
-    recyclebin_list_open = P115OpenClient.recyclebin_list
-    recyclebin_revert_open = P115OpenClient.recyclebin_revert
-    upload_gettoken_open = P115OpenClient.upload_gettoken
-    upload_init_open = P115OpenClient.upload_init
-    upload_resume_open = P115OpenClient.upload_resume
-    user_info_open = P115OpenClient.user_info
-    upload_file_init_open = P115OpenClient.upload_file_init
-    upload_file_open = P115OpenClient.upload_file
-    vip_qr_url_open = P115OpenClient.vip_qr_url
+    download_url_open = P115OpenClient.download_url_open
+    download_url_info_open = P115OpenClient.download_url_info_open
+    fs_copy_open = P115OpenClient.fs_copy_open
+    fs_delete_open = P115OpenClient.fs_delete_open
+    fs_files_open = P115OpenClient.fs_files_open
+    fs_info_open = P115OpenClient.fs_info_open
+    fs_mkdir_open = P115OpenClient.fs_mkdir_open
+    fs_move_open = P115OpenClient.fs_move_open
+    fs_search_open = P115OpenClient.fs_search_open
+    fs_update_open = P115OpenClient.fs_update_open
+    recyclebin_clean_open = P115OpenClient.recyclebin_clean_open
+    recyclebin_list_open = P115OpenClient.recyclebin_list_open
+    recyclebin_revert_open = P115OpenClient.recyclebin_revert_open
+    upload_gettoken_open = P115OpenClient.upload_gettoken_open
+    upload_init_open = P115OpenClient.upload_init_open
+    upload_resume_open = P115OpenClient.upload_resume_open
+    user_info_open = P115OpenClient.user_info_open
+    upload_file_init_open = P115OpenClient.upload_file_init_open
+    upload_file_open = P115OpenClient.upload_file_open
+    vip_qr_url_open = P115OpenClient.vip_qr_url_open
 
 
 for name, method in P115Client.__dict__.items():

{p115client-0.0.5.6.3 → p115client-0.0.5.6.5}/p115client/tool/fs_files.py

@@ -121,7 +121,7 @@ def iter_fs_files(
         request_kwargs.setdefault("base_url", get_webapi_origin)
         fs_files = partial(client.fs_files, **request_kwargs)
     elif app == "open":
-        fs_files = partial(client.fs_files_open, **request_kwargs)
+        fs_files = partial(client.fs_files_open, **request_kwargs) # type: ignore
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
         fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
@@ -219,7 +219,7 @@ def iter_fs_files_threaded(
         request_kwargs.setdefault("base_url", get_webapi_origin)
         fs_files = partial(client.fs_files, **request_kwargs)
     elif app == "open":
-        fs_files = partial(client.fs_files_open, **request_kwargs)
+        fs_files = partial(client.fs_files_open, **request_kwargs) # type: ignore
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
         fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
@@ -336,7 +336,7 @@ async def iter_fs_files_asynchronized(
         request_kwargs.setdefault("base_url", get_webapi_origin)
         fs_files = partial(client.fs_files, **request_kwargs)
     elif app == "open":
-        fs_files = partial(client.fs_files_open, **request_kwargs)
+        fs_files = partial(client.fs_files_open, **request_kwargs) # type: ignore
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
         fs_files = partial(client.fs_files_app, app=app, **request_kwargs)

{p115client-0.0.5.6.3 → p115client-0.0.5.6.5}/pyproject.toml

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