p115client 0.0.5.6.5__py3-none-any.whl → 0.0.5.6.7__py3-none-any.whl

p115client/client.py

@@ -4043,7 +4043,7 @@ class P115OpenClient(ClientRequestMixin):
     vip_qr_url_open = vip_qr_url
 
 
-class P115Client(ClientRequestMixin):
+class P115Client(P115OpenClient):
     """115 的客户端对象
 
     :param cookies: 115 的 cookies，要包含 `UID`、`CID`、`KID` 和 `SEID` 等
@@ -4266,7 +4266,7 @@ class P115Client(ClientRequestMixin):
         except OSError:
             self.cookies_mtime = 0
 
-    @overload
+    @overload # type: ignore
     @classmethod
     def init(
         cls, 
@@ -5256,6 +5256,9 @@ class P115Client(ClientRequestMixin):
         elif data is not None:
             request_kwargs["data"] = data
         request_kwargs.setdefault("parse", default_parse)
+        if url.startswith("https://proapi.115.com/open/"):
+            headers["cookie"] = ""
+            return request(url=url, method=method, **request_kwargs)
         def gen_step():
             check_for_relogin = self.check_for_relogin
             cant_relogin = not callable(check_for_relogin)
@@ -16665,7 +16668,7 @@ class P115Client(ClientRequestMixin):
 
     ########## Recyclebin API ##########
 
-    @overload
+    @overload # type: ignore
     def recyclebin_clean(
         self, 
         payload: int | str | Iterable[int | str] | dict = {}, 
@@ -18462,7 +18465,7 @@ class P115Client(ClientRequestMixin):
         api = complete_proapi("/app/uploadinfo", base_url)
         return self.request(url=api, async_=async_, **request_kwargs)
 
-    @overload
+    @overload # type: ignore
     def upload_init(
         self, 
         /, 
@@ -18628,7 +18631,7 @@ class P115Client(ClientRequestMixin):
         payload = {"filename": filename, "target": f"U_1_{pid}"}
         return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
 
-    @overload
+    @overload # type: ignore
     @staticmethod
     def upload_gettoken(
         request: None | Callable = None, 
@@ -18801,7 +18804,7 @@ class P115Client(ClientRequestMixin):
         request_kwargs.setdefault("parse", parse_upload_init_response)
         return self.upload_init(async_=async_, **request_kwargs)
 
-    @overload
+    @overload # type: ignore
     def upload_file_init(
         self, 
         /, 
@@ -19047,7 +19050,7 @@ class P115Client(ClientRequestMixin):
 
     # TODO: 当文件 < 1 MB 时，文件不急着打开，需要时再打开
     # TODO: 对于上传空文件，有特别的速度（sha1写死）
-    @overload
+    @overload # type: ignore
     def upload_file(
         self, 
         /, 
@@ -19510,7 +19513,7 @@ class P115Client(ClientRequestMixin):
         api = complete_webapi("/user/fingerprint", base_url=base_url)
         return self.request(url=api, async_=async_, **request_kwargs)
 
-    @overload
+    @overload # type: ignore
     @staticmethod
     def user_info(
         payload: int | str | dict, 
@@ -20377,29 +20380,6 @@ class P115Client(ClientRequestMixin):
             payload = {"ignore_warn": 0, "share_opt": 1, "safe_pwd": "", **payload}
         return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
 
-    access_token = P115OpenClient.access_token
-    refresh_access_token = P115OpenClient.refresh_access_token
-    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():
     if not (callable(method) and method.__doc__):

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) # type: ignore
+        fs_files = partial(client.fs_files_open, **request_kwargs)
     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) # type: ignore
+        fs_files = partial(client.fs_files_open, **request_kwargs)
     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) # type: ignore
+        fs_files = partial(client.fs_files_open, **request_kwargs)
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
         fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
@@ -377,7 +377,7 @@ async def iter_fs_files_asynchronized(
             if args is None:
                 args = copy(payload)
             ts = time()
-            return create_task(get_files(args)) # type: ignore
+            return create_task(get_files(args))
         task = make_task()
         offset = payload["offset"]
         while True:

{p115client-0.0.5.6.5.dist-info → p115client-0.0.5.6.7.dist-info}/METADATA

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

{p115client-0.0.5.6.5.dist-info → p115client-0.0.5.6.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
 LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
 p115client/__init__.py,sha256=1mx7njuAlqcuEWONTjSiiGnXyyNyqOcJyNX1FMHqQ-4,214
 p115client/_upload.py,sha256=j2XHz6-hc9qyfiF92aZY-LPJ3UgbB6e4Jy6CNGQ5rwk,29904
-p115client/client.py,sha256=E2F9OFrHIbG1HMrZ_IDoHN47OrMw4OlxWLooAfxbK7Q,698751
+p115client/client.py,sha256=yGLptXBHO7Gy2GHPb0K3Z-alqsD90GwCUohaqNetFXs,697792
 p115client/const.py,sha256=maIZfJAiUuEnXIKc8TMAyW_UboDUJPwYpPS8LjPFp_U,4321
 p115client/exception.py,sha256=Ugjr__aSlYRDYwoOz7273ngV-gFX2z-ohsJmCba8nnQ,2657
 p115client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -9,7 +9,7 @@ p115client/tool/__init__.py,sha256=2YrKoAcFYOuqu2nUBoPVhxMOseAvcLE_LcnbZV11UKw,3
 p115client/tool/download.py,sha256=KY-8QHhCm_Mk-ygtuQXuPtoIIJHRWg5XNQQx0WDncGA,56232
 p115client/tool/edit.py,sha256=NQiyVoOKKed6VbUj_AamGmTWXfcioOFqq5buFUWOh_8,16428
 p115client/tool/export_dir.py,sha256=QFHK5HKllTV6ZgCnnf_BFd4CQq-gqcuLx49clcbvmDo,23871
-p115client/tool/fs_files.py,sha256=91Zbp0yI3ToMiq_yisbKjFWGYer-Y_mGnn26gFKNN8A,16489
+p115client/tool/fs_files.py,sha256=XbPgiXrTSNPSGFLFrv5-Wab5vByyxO5GZrWeIkDt9mY,16429
 p115client/tool/iterdir.py,sha256=hpzOCaYi0-8XA6yS3RVnMp9a1FT25qjpZwnPJYNOXYw,183974
 p115client/tool/life.py,sha256=8STXfjL8DPp0YTLFsE7Dt_6c2wj_0AvScq6WrjX9i9M,17583
 p115client/tool/pool.py,sha256=vFV3t4g8KuQ4Rlttd1bs7d0Lc8jFUufdmDQweMcLZZw,9779
@@ -17,7 +17,7 @@ p115client/tool/request.py,sha256=SWsezW9EYZGS3R-TbZxMG-8bN3YWJ0-GzgvKlvRBSCM,70
 p115client/tool/upload.py,sha256=qK1OQYxP-Faq2eMDhc5sBXJiSr8m8EZ_gb0O_iA2TrI,15915
 p115client/tool/xys.py,sha256=6NZUkWNsWW6dHDBUpMitmE-1YlkobWIUQ86CBjKJ4mQ,3633
 p115client/type.py,sha256=e4g9URQBE23XN2dGomldj8wC6NlDWBBSVC5Bmd8giBc,5993
-p115client-0.0.5.6.5.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client-0.0.5.6.5.dist-info/METADATA,sha256=BZUJI_fN2MtqckSjUf8mdFUmzlEjZwlExlCP4o9_HV8,8233
-p115client-0.0.5.6.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p115client-0.0.5.6.5.dist-info/RECORD,,
+p115client-0.0.5.6.7.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.6.7.dist-info/METADATA,sha256=5mW2_RYpa838q19Xp9-fcZIeYnNFdfQ_QnQXNhX5Nfw,8233
+p115client-0.0.5.6.7.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.6.7.dist-info/RECORD,,