p115client 0.0.5.11.10.2__tar.gz → 0.0.5.12__tar.gz

{p115client-0.0.5.11.10.2 → p115client-0.0.5.12}/PKG-INFO

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

{p115client-0.0.5.11.10.2 → p115client-0.0.5.12}/p115client/client.py

@@ -377,6 +377,9 @@ def check_response(resp: dict | Awaitable[dict], /) -> dict | Coroutine[Any, Any
                 # {"state": false, "errno": 911, "error": "请验证账号"}
                 case 911:
                     raise AuthenticationError(errno.EAUTH, resp)
+                # {"state": false, "errno": 10004, "error": "错误的链接"}
+                case 10004:
+                    raise OperationalError(errno.EINVAL, resp)
                 # {"state": false, "errno": 20001, "error": "目录名称不能为空"}
                 case 20001:
                     raise OperationalError(errno.EINVAL, resp)
@@ -3180,8 +3183,8 @@ class P115OpenClient(ClientRequestMixin):
             - `c`: 允许同时打开次数，如果为 0，则是无限次数
             - `f`: 请求时要求携带请求头
                 - 如果为空，则无要求
-                - 如果为 1，则需要 User-Agent（和请求直链时的一致）
-                - 如果为 3，则需要 User-Agent（和请求直链时的一致） 和 Cookie（由请求直链时的响应所返回的 Set-Cookie 响应头）
+                - 如果为 1，则需要 user-agent（和请求直链时的一致）
+                - 如果为 3，则需要 user-agent（和请求直链时的一致） 和 Cookie（由请求直链时的响应所返回的 Set-Cookie 响应头）
 
         :param pickcode: 提取码
         :param strict: 如果为 True，当目标是目录时，会抛出 IsADirectoryError 异常
@@ -7857,8 +7860,8 @@ class P115Client(P115OpenClient):
             - `c`: 允许同时打开次数，如果为 0，则是无限次数
             - `f`: 请求时要求携带请求头
                 - 如果为空，则无要求
-                - 如果为 1，则需要 User-Agent（和请求直链时的一致）
-                - 如果为 3，则需要 User-Agent（和请求直链时的一致） 和 Cookie（由请求直链时的响应所返回的 Set-Cookie 响应头）
+                - 如果为 1，则需要 user-agent（和请求直链时的一致）
+                - 如果为 3，则需要 user-agent（和请求直链时的一致） 和 Cookie（由请求直链时的响应所返回的 Set-Cookie 响应头）
 
         :param pickcode: 提取码
         :param strict: 如果为 True，当目标是目录时，会抛出 IsADirectoryError 异常
@@ -17727,32 +17730,35 @@ class P115Client(P115OpenClient):
     ########## Offline Download API ##########
 
     @overload
-    def _offline_web_post(
+    def _offline_web_request(
         self, 
-        payload: dict, 
+        payload: dict = {}, 
         /, 
         ac: str = "", 
+        method: str = "POST", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
     ) -> dict:
         ...
     @overload
-    def _offline_web_post(
+    def _offline_web_request(
         self, 
-        payload: dict, 
+        payload: dict = {}, 
         /, 
         ac: str = "", 
+        method: str = "POST", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
     ) -> Coroutine[Any, Any, dict]:
         ...
-    def _offline_web_post(
+    def _offline_web_request(
         self, 
-        payload: dict, 
+        payload: dict = {}, 
         /, 
         ac: str = "", 
+        method: str = "POST", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -17760,41 +17766,47 @@ class P115Client(P115OpenClient):
         api = "http://lixian.115.com/web/lixian/"
         if ac:
             payload["ac"] = ac
+        if method.upper() == "POST":
+            request_kwargs["data"] = payload
+        else:
+            request_kwargs["params"] = payload
         return self.request(
             url=api, 
-            method="POST", 
-            data=payload, 
+            method=method, 
             async_=async_, 
             **request_kwargs, 
         )
 
     @overload
-    def _offline_lixian_post(
+    def _offline_lixian_request(
         self, 
-        payload: dict, 
+        payload: dict = {}, 
         /, 
         ac: str = "", 
+        method: str = "POST", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
     ) -> dict:
         ...
     @overload
-    def _offline_lixian_post(
+    def _offline_lixian_request(
         self, 
-        payload: dict, 
+        payload: dict = {}, 
         /, 
         ac: str = "", 
+        method: str = "POST", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
     ) -> Coroutine[Any, Any, dict]:
         ...
-    def _offline_lixian_post(
+    def _offline_lixian_request(
         self, 
-        payload: dict, 
+        payload: dict = {}, 
         /, 
         ac: str = "", 
+        method: str = "POST", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -17802,19 +17814,22 @@ class P115Client(P115OpenClient):
         api = "http://lixian.115.com/lixian/"
         if ac:
             payload["ac"] = ac
-        request_kwargs["ecdh_encrypt"] = True
+        if method.upper() == "POST":
+            request_kwargs["data"] = payload
+            request_kwargs["ecdh_encrypt"] = True
+        else:
+            request_kwargs["params"] = payload
         return self.request(
             url=api, 
-            method="POST", 
-            data=payload, 
+            method=method, 
             async_=async_, 
             **request_kwargs, 
         )
 
     @overload
-    def _offline_lixianssp_post(
+    def _offline_lixianssp_request(
         self, 
-        payload: dict, 
+        payload: dict = {}, 
         /, 
         ac: str = "", 
         *, 
@@ -17823,9 +17838,9 @@ class P115Client(P115OpenClient):
     ) -> dict:
         ...
     @overload
-    def _offline_lixianssp_post(
+    def _offline_lixianssp_request(
         self, 
-        payload: dict, 
+        payload: dict = {}, 
         /, 
         ac: str = "", 
         *, 
@@ -17833,9 +17848,9 @@ class P115Client(P115OpenClient):
         **request_kwargs, 
     ) -> Coroutine[Any, Any, dict]:
         ...
-    def _offline_lixianssp_post(
+    def _offline_lixianssp_request(
         self, 
-        payload: dict, 
+        payload: dict = {}, 
         /, 
         ac: str = "", 
         *, 
@@ -17843,6 +17858,7 @@ class P115Client(P115OpenClient):
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         api = "http://lixian.115.com/lixianssp/"
+        request_kwargs["method"] = "POST"
         for k, v in payload.items():
             payload[k] = str(v)
         if ac:
@@ -17864,61 +17880,81 @@ class P115Client(P115OpenClient):
         request_kwargs.setdefault("parse", parse)
         return self.request(
             url=api, 
-            method="POST", 
             data={"data": rsa_encode(dumps(payload)).decode("ascii")}, 
             async_=async_, 
             **request_kwargs, 
         )
 
     @overload
-    def _offline_post(
+    def _offline_request(
         self, 
-        payload: dict, 
+        payload: dict = {}, 
         /, 
         ac: str = "", 
-        use_web_api: bool = False, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = None, 
+        base_url: None | bool | str | Callable[[], str] = None, 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
     ) -> dict:
         ...
     @overload
-    def _offline_post(
+    def _offline_request(
         self, 
-        payload: dict, 
+        payload: dict = {}, 
         /, 
         ac: str = "", 
-        use_web_api: bool = False, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = None, 
+        base_url: None | bool | str | Callable[[], str] = None, 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
     ) -> Coroutine[Any, Any, dict]:
         ...
-    def _offline_post(
+    def _offline_request(
         self, 
-        payload: dict, 
+        payload: dict = {}, 
         /, 
         ac: str = "", 
-        use_web_api: bool = False, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = None, 
+        base_url: None | bool | str | Callable[[], str] = None, 
         *, 
         async_: Literal[False, True] = False, 
-        ecdh_encrypt: bool = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
-        if use_web_api:
-            method = self._offline_web_post
-        elif ecdh_encrypt:
-            method = self._offline_lixian_post
-        else:
-            method = self._offline_lixianssp_post
-        return method(payload, ac, async_=async_, ecdh_encrypt=ecdh_encrypt, **request_kwargs)
+        if type is None:
+            api = complete_lixian_api("?ct=lixian&ac="+ac, base_url=base_url)
+            if method.upper() == "POST":
+                request_kwargs["data"] = payload
+            else:
+                request_kwargs["params"] = payload
+            return self.request(url=api, method=method, async_=async_, **request_kwargs)
+        match type:
+            case "web":
+                call: Callable = self._offline_web_request
+            case "ssp":
+                call = self._offline_lixianssp_request
+            case _:
+                call = self._offline_lixian_request
+        return call(
+            payload, 
+            ac, 
+            method=method, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
-    @overload # type: ignore
+    @overload
     def offline_add_torrent(
         self, 
         payload: str | dict, 
         /, 
-        use_web_api: bool = False, 
+        base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = "ssp", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -17929,7 +17965,9 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
-        use_web_api: bool = False, 
+        base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = "ssp", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -17939,7 +17977,9 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
-        use_web_api: bool = False, 
+        base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = "ssp", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -17961,14 +18001,24 @@ class P115Client(P115OpenClient):
         """
         if isinstance(payload, str):
             payload = {"info_hash": payload}
-        return self._offline_post(payload, "add_task_bt", use_web_api=use_web_api, async_=async_, **request_kwargs)
+        return self._offline_request(
+            payload, 
+            "add_task_bt", 
+            method=method, 
+            type=type, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
     @overload
     def offline_add_url(
         self, 
         payload: str | dict, 
         /, 
-        use_web_api: bool = False, 
+        base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = "ssp", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -17979,7 +18029,9 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
-        use_web_api: bool = False, 
+        base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = "ssp", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -17989,7 +18041,9 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | dict, 
         /, 
-        use_web_api: bool = False, 
+        base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = "ssp", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -18005,14 +18059,24 @@ class P115Client(P115OpenClient):
         """
         if isinstance(payload, str):
             payload = {"url": payload}
-        return self._offline_post(payload, "add_task_url", use_web_api=use_web_api, async_=async_, **request_kwargs)
+        return self._offline_request(
+            payload, 
+            "add_task_url", 
+            method=method, 
+            type=type, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
-    @overload # type: ignore
+    @overload
     def offline_add_urls(
         self, 
         payload: str | Iterable[str] | dict, 
         /, 
-        use_web_api: bool = False, 
+        base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = "ssp", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -18023,7 +18087,9 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | Iterable[str] | dict, 
         /, 
-        use_web_api: bool = False, 
+        base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = "ssp", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -18033,7 +18099,9 @@ class P115Client(P115OpenClient):
         self, 
         payload: str | Iterable[str] | dict, 
         /, 
-        use_web_api: bool = False, 
+        base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = "ssp", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -18043,6 +18111,7 @@ class P115Client(P115OpenClient):
         POST https://lixian.115.com/lixianssp/?ac=add_task_urls
 
         :payload:
+            - url: str    💡 链接，支持HTTP、HTTPS、FTP、磁力链和电驴链接
             - url[0]: str 💡 链接，支持HTTP、HTTPS、FTP、磁力链和电驴链接
             - url[1]: str
             - ...
@@ -18052,10 +18121,18 @@ class P115Client(P115OpenClient):
         if isinstance(payload, str):
             payload = payload.strip("\n").split("\n")
         if not isinstance(payload, dict):
-            payload = {f"url[{i}]": url for i, url in enumerate(payload)}
+            payload = {f"url[{i}]": url for i, url in enumerate(payload) if url}
             if not payload:
                 raise ValueError("no `url` specified")
-        return self._offline_post(payload, "add_task_urls", use_web_api=use_web_api, async_=async_, **request_kwargs)
+        return self._offline_request(
+            payload, 
+            "add_task_urls", 
+            method=method, 
+            type=type, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
     @overload
     def offline_clear(
@@ -18063,6 +18140,8 @@ class P115Client(P115OpenClient):
         payload: int | dict = 0, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -18074,6 +18153,8 @@ class P115Client(P115OpenClient):
         payload: int | dict = 0, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -18084,13 +18165,15 @@ class P115Client(P115OpenClient):
         payload: int | dict = 0, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """清空离线任务列表
 
-        POST https://115.com/web/lixian/?ct=lixian&ac=task_clear
+        POST https://lixian.115.com/lixian/?ac=task_clear
 
         :payload:
             - flag: int = 0 💡 标识，用于对应某种情况
@@ -18102,10 +18185,17 @@ class P115Client(P115OpenClient):
               - 4: 已完成+删除源文件
               - 5: 全部+删除源文件
         """
-        api = complete_lixian_api("?ct=lixian&ac=task_clear", base_url=base_url)
         if isinstance(payload, int):
             payload = {"flag": payload}
-        return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
+        return self._offline_request(
+            payload, 
+            "task_clear", 
+            method=method, 
+            type=type, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
     @overload
     def offline_download_path(
@@ -18142,6 +18232,49 @@ class P115Client(P115OpenClient):
         api = complete_webapi("/offine/downpath", base_url=base_url)
         return self.request(url=api, async_=async_, **request_kwargs)
 
+    @overload
+    def offline_download_path_set(
+        self, 
+        payload: int | str | dict, 
+        /, 
+        base_url: bool | str | Callable[[], str] = False, 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def offline_download_path_set(
+        self, 
+        payload: int | str | dict, 
+        /, 
+        base_url: bool | str | Callable[[], str] = False, 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def offline_download_path_set(
+        self, 
+        payload: int | str | dict, 
+        /, 
+        base_url: bool | str | Callable[[], str] = False, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """设置默认选择的离线下载到的目录信息
+
+        POST https://webapi.115.com/offine/downpath
+
+        :payload:
+            - file_id: int | str 💡 目录 id
+        """
+        api = complete_webapi("/offine/downpath", base_url=base_url)
+        if isinstance(payload, (int, str)):
+            payload = {"file_id": payload}
+        return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
+
     @overload
     def offline_info(
         self, 
@@ -18177,12 +18310,14 @@ class P115Client(P115OpenClient):
         api = complete_api("/?ct=offline&ac=space", base_url=base_url)
         return self.request(url=api, async_=async_, **request_kwargs)
 
-    @overload # type: ignore
+    @overload
     def offline_list(
         self, 
         payload: int | dict = 1, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -18191,9 +18326,11 @@ class P115Client(P115OpenClient):
     @overload
     def offline_list(
         self, 
-        payload: int | dict, 
+        payload: int | dict = 1, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -18204,27 +18341,38 @@ class P115Client(P115OpenClient):
         payload: int | dict = 1, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """获取当前的离线任务列表
 
-        POST https://lixian.115.com/lixian/?ct=lixian&ac=task_lists
+        GET https://lixian.115.com/lixian/?ac=task_lists
 
         :payload:
             - page: int | str = 1
         """
-        api = complete_lixian_api("?ct=lixian&ac=task_lists", base_url=base_url)
         if isinstance(payload, int):
             payload = {"page": payload}
-        return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
+        return self._offline_request(
+            payload, 
+            "task_lists", 
+            method=method, 
+            type=type, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
     @overload
     def offline_quota_info(
         self, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -18235,6 +18383,8 @@ class P115Client(P115OpenClient):
         self, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -18244,22 +18394,32 @@ class P115Client(P115OpenClient):
         self, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """获取当前离线配额信息（简略）
 
-        GET https://lixian.115.com/lixian/?ct=lixian&ac=get_quota_info
+        GET https://lixian.115.com/lixian/?ac=get_quota_info
         """
-        api = complete_lixian_api("?ct=lixian&ac=get_quota_info", base_url=base_url)
-        return self.request(url=api, async_=async_, **request_kwargs)
+        return self._offline_request(
+            ac="get_quota_info", 
+            method=method, 
+            type=type, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
     @overload
     def offline_quota_package_array(
         self, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -18270,6 +18430,8 @@ class P115Client(P115OpenClient):
         self, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -18279,22 +18441,32 @@ class P115Client(P115OpenClient):
         self, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """获取当前离线配额信息（详细）
 
-        GET https://lixian.115.com/lixian/?ct=lixian&ac=get_quota_package_array
+        GET https://lixian.115.com/lixian/?ac=get_quota_package_array
         """
-        api = complete_lixian_api("?ct=lixian&ac=get_quota_package_array", base_url=base_url)
-        return self.request(url=api, async_=async_, **request_kwargs)
+        return self._offline_request(
+            ac="get_quota_package_array", 
+            method=method, 
+            type=type, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
     @overload
     def offline_quota_package_info(
         self, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -18305,6 +18477,8 @@ class P115Client(P115OpenClient):
         self, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -18314,16 +18488,24 @@ class P115Client(P115OpenClient):
         self, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """获取当前离线配额信息（详细）
 
-        GET https://lixian.115.com/lixian/?ct=lixian&ac=get_quota_package_info
+        GET https://lixian.115.com/lixian/?ac=get_quota_package_info
         """
-        api = complete_lixian_api("?ct=lixian&ac=get_quota_package_info", base_url=base_url)
-        return self.request(url=api, async_=async_, **request_kwargs)
+        return self._offline_request(
+            ac="get_quota_package_info", 
+            method=method, 
+            type=type, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
     @overload
     def offline_remove(
@@ -18331,6 +18513,8 @@ class P115Client(P115OpenClient):
         payload: str | Iterable[str] | dict, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -18342,6 +18526,8 @@ class P115Client(P115OpenClient):
         payload: str | Iterable[str] | dict, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -18352,6 +18538,8 @@ class P115Client(P115OpenClient):
         payload: str | Iterable[str] | dict, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -18366,14 +18554,21 @@ class P115Client(P115OpenClient):
             - ...
             - flag: 0 | 1 = <default> 💡 是否删除源文件
         """
-        api = complete_lixian_api("?ct=lixian&ac=task_del", base_url=base_url)
         if isinstance(payload, str):
             payload = {"hash[0]": payload}
         elif not isinstance(payload, dict):
             payload = {f"hash[{i}]": hash for i, hash in enumerate(payload)}
             if not payload:
                 raise ValueError("no `hash` (info_hash) specified")
-        return self.request(api, method="POST", data=payload, async_=async_, **request_kwargs)
+        return self._offline_request(
+            payload, 
+            "task_del", 
+            method=method, 
+            type=type, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
     @overload
     def offline_restart(
@@ -18382,6 +18577,7 @@ class P115Client(P115OpenClient):
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
         method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -18394,6 +18590,7 @@ class P115Client(P115OpenClient):
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
         method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -18405,6 +18602,7 @@ class P115Client(P115OpenClient):
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
         method: str = "POST", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
@@ -18416,20 +18614,26 @@ class P115Client(P115OpenClient):
         :payload:
             - info_hash: str 💡 待重试任务的 info_hash
         """
-        api = complete_lixian_api("?ct=lixian&ac=restart", base_url=base_url)
         if isinstance(payload, str):
             payload = {"info_hash": payload}
-        if method.upper() == "POST":
-            request_kwargs["data"] = payload
-        else:
-            request_kwargs["params"] = payload
-        return self.request(api, method=method, async_=async_, **request_kwargs)
+        return self._offline_request(
+            payload, 
+            "restart", 
+            method=method, 
+            type=type, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
     @overload
     def offline_task_count(
         self, 
+        payload: dict | int = 0, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -18438,8 +18642,11 @@ class P115Client(P115OpenClient):
     @overload
     def offline_task_count(
         self, 
+        payload: dict | int = 0, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -18447,18 +18654,33 @@ class P115Client(P115OpenClient):
         ...
     def offline_task_count(
         self, 
+        payload: dict | int = 0, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """获取当前正在运行的离线任务数
 
-        GET https://lixian.115.com/lixian/?ct=lixian&ac=get_task_cnt&flag=0
+        GET https://lixian.115.com/lixian/?ac=get_task_cnt
+
+        :payload:
+            flag: int = 0
         """
-        api = complete_lixian_api("?ct=lixian&ac=get_task_cnt&flag=0", base_url=base_url)
-        return self.request(url=api, async_=async_, **request_kwargs)
+        if isinstance(payload, int):
+            payload = {"flag": 0}
+        return self._offline_request(
+            payload, 
+            "get_task_cnt", 
+            method=method, 
+            type=type, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
     @overload
     def offline_torrent_info(
@@ -18466,6 +18688,8 @@ class P115Client(P115OpenClient):
         payload: str | dict, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -18477,6 +18701,8 @@ class P115Client(P115OpenClient):
         payload: str | dict, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -18487,27 +18713,39 @@ class P115Client(P115OpenClient):
         payload: str | dict, 
         /, 
         base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """查看种子的文件列表等信息
 
-        POST https://lixian.115.com/lixian/?ct=lixian&ac=torrent
+        GET https://lixian.115.com/lixian/?ac=torrent
 
         :payload:
             - sha1: str
         """
-        api = complete_lixian_api("?ct=lixian&ac=torrent", base_url=base_url)
         if isinstance(payload, str):
             payload = {"sha1": payload}
-        return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
+        return self._offline_request(
+            payload, 
+            "torrent", 
+            method=method, 
+            type=type, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
     @overload
     def offline_upload_torrent_path(
         self, 
+        payload: dict | int = 1, 
         /, 
-        base_url: bool | str | Callable[[], str] = False, 
+        base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
@@ -18516,8 +18754,11 @@ class P115Client(P115OpenClient):
     @overload
     def offline_upload_torrent_path(
         self, 
+        payload: dict | int = 1, 
         /, 
-        base_url: bool | str | Callable[[], str] = False, 
+        base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
@@ -18525,18 +18766,33 @@ class P115Client(P115OpenClient):
         ...
     def offline_upload_torrent_path(
         self, 
+        payload: dict | int = 1, 
         /, 
-        base_url: bool | str | Callable[[], str] = False, 
+        base_url: None | bool | str | Callable[[], str] = None, 
+        method: str = "GET", 
+        type: Literal[None, "", "web", "ssp"] = None, 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
         """获取当前的种子上传到的目录，当你添加种子任务后，这个种子会在此目录中保存
 
-        GET https://115.com/?ct=lixian&ac=get_id&torrent=1
+        GET https://lixian.115.com/lixian/?ac=get_id
+
+        :payload:
+            - torrent: int = 1
         """
-        api = complete_api("/?ct=lixian&ac=get_id&torrent=1", base_url=base_url)
-        return self.request(url=api, async_=async_, **request_kwargs)
+        if isinstance(payload, int):
+            payload = {"torrent": payload}
+        return self._offline_request(
+            payload, 
+            "get_id", 
+            method=method, 
+            type=type, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
     ########## Recyclebin API ##########
 
@@ -21021,7 +21277,7 @@ class P115Client(P115OpenClient):
         request_kwargs.update(make_upload_payload(data))
         request_kwargs["headers"] = {
             **(request_kwargs.get("headers") or {}), 
-            "Content-Type": "application/x-www-form-urlencoded", 
+            "content-type": "application/x-www-form-urlencoded", 
             "user-agent": "Mozilla/5.0 115disk/99.99.99.99 115Browser/99.99.99.99 115wangpan_android/99.99.99.99", 
         }
         request_kwargs.setdefault("parse", parse_upload_init_response)

{p115client-0.0.5.11.10.2 → p115client-0.0.5.12}/p115client/tool/__init__.py

@@ -12,6 +12,7 @@ from .fs_files import *
 from .history import *
 from .iterdir import *
 from .life import *
+from .offline import *
 from .pool import *
 from .request import *
 from .upload import *

p115client-0.0.5.12/p115client/tool/offline.py

@@ -0,0 +1,164 @@
+#!/usr/bin/env python3
+# encoding: utf-8
+
+__author__ = "ChenyangGao <https://chenyanggao.github.io>"
+__all__ = ["offline_iter", "offline_restart_iter"]
+__doc__ = "这个模块提供了一些和离线下载有关的函数"
+
+from asyncio import sleep as async_sleep
+from collections.abc import AsyncIterator, Callable, Iterable, Iterator
+from itertools import count
+from time import sleep, time
+from typing import overload, Literal
+
+from iterutils import run_gen_step_iter, with_iter_next, Yield, YieldFrom
+from p115client import check_response, P115Client, P115OpenClient
+
+
+@overload
+def offline_iter(
+    client: str | P115Client | P115OpenClient, 
+    /, 
+    page_start: int = 1, 
+    page_stop: int = -1, 
+    cooldown: float = 0, 
+    use_open_api: bool = False, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> Iterator[dict]:
+    ...
+@overload
+def offline_iter(
+    client: str | P115Client | P115OpenClient, 
+    /, 
+    page_start: int = 1, 
+    page_stop: int = -1, 
+    cooldown: float = 0, 
+    use_open_api: bool = False, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> AsyncIterator[dict]:
+    ...
+def offline_iter(
+    client: str | P115Client | P115OpenClient, 
+    /, 
+    page_start: int = 1, 
+    page_stop: int = -1, 
+    cooldown: float = 0, 
+    use_open_api: bool = False, 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> Iterator[dict] | AsyncIterator[dict]:
+    """遍历任务列表，获取任务信息
+
+    :param client: 115 客户端或 cookies
+    :param page_start: 开始页数
+    :param page_stop: 结束页数（不含），如果 <= 0，则不限
+    :param cooldown: 接口调用冷却时间，单位：秒
+    :param use_open_api: 是否使用 open api
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 迭代器，返回任务信息
+    """
+    if isinstance(client, str):
+        client = P115Client(client, check_for_relogin=True)
+    if page_start < 1:
+        page_start = 1
+    if page_stop > 0:
+        pages: Iterable[int] = range(page_start, page_stop)
+    else:
+        pages = count(page_start)
+    if not isinstance(client, P115Client):
+        use_open_api = True
+    def gen_step():
+        if use_open_api:
+            offline_list = client.offline_list_open
+        else:
+            offline_list = client.offline_list
+        if cooldown > 0:
+            do_sleep = async_sleep if async_ else sleep
+        last_t: float = 0
+        for page in pages:
+            if last_t and (diff := last_t + cooldown - time()) > 0:
+                yield do_sleep(diff)
+            last_t = time()
+            resp = yield offline_list(page, async_=async_, **request_kwargs)
+            check_response(resp)
+            if use_open_api:
+                resp = resp["data"]
+            tasks = resp["tasks"]
+            if not tasks:
+                break
+            yield YieldFrom(resp["tasks"])
+            if len(tasks) < 30 or page >= resp["page_count"]:
+                break
+    return run_gen_step_iter(gen_step, async_=async_)
+
+
+@overload
+def offline_restart_iter(
+    client: str | P115Client, 
+    /, 
+    predicate: None | Callable[[dict], bool] = None, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> Iterator[dict]:
+    ...
+@overload
+def offline_restart_iter(
+    client: str | P115Client, 
+    /, 
+    predicate: None | Callable[[dict], bool] = None, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> AsyncIterator[dict]:
+    ...
+def offline_restart_iter(
+    client: str | P115Client, 
+    /, 
+    predicate: None | Callable[[dict], bool] = None, 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> Iterator[dict] | AsyncIterator[dict]:
+    """重试任务：重试那些因为空间不足而转存失败的任务
+
+    :param client: 115 客户端或 cookies
+    :param predicate: 断言，用于筛选
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 迭代器，逐个任务返回执行重试后的响应
+    """
+    if isinstance(client, str):
+        client = P115Client(client, check_for_relogin=True)
+    def gen_step():
+        left_no_space: list[dict] = []
+        add_task = left_no_space.append
+        with with_iter_next(offline_iter(
+            client, 
+            async_=async_, 
+            **request_kwargs, 
+        )) as do_next:
+            while True:
+                task = yield do_next()
+                if task["move"] == -1:
+                    add_task(task)
+                elif task["status"] == 2:
+                    break
+        for task in filter(predicate, left_no_space):
+            resp = yield client.offline_restart(
+                task["info_hash"], 
+                async_=async_, 
+                **request_kwargs, 
+            )
+            resp["task"] = task
+            yield Yield(resp)
+    return run_gen_step_iter(gen_step, async_=async_)
+

{p115client-0.0.5.11.10.2 → p115client-0.0.5.12}/pyproject.toml

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