p115client 0.0.5.11.10.1__py3-none-any.whl → 0.0.5.11.11__py3-none-any.whl

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 异常
@@ -18043,6 +18046,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,7 +18056,7 @@ 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)
@@ -21014,14 +21018,14 @@ class P115Client(P115OpenClient):
             "sign_key": sign_key, 
             "sign_val": sign_val, 
             "target": target, 
-            "topupload": 1, 
+            "topupload": "true", 
             "userid": self.user_id, 
             "userkey": self.user_key, 
         }
         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/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/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.1.dist-info → p115client-0.0.5.11.11.dist-info}/METADATA

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

{p115client-0.0.5.11.10.1.dist-info → p115client-0.0.5.11.11.dist-info}/RECORD

@@ -1,11 +1,11 @@
 LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
 p115client/__init__.py,sha256=1mx7njuAlqcuEWONTjSiiGnXyyNyqOcJyNX1FMHqQ-4,214
 p115client/_upload.py,sha256=3uXwgFsXkZ4X5hjL1N2mx0y8tA8MjVxe49N0BoyYyno,31253
-p115client/client.py,sha256=RmP5hmMX-qmEKP1ZA6hXRZqa3iGmF1djRQGk1ZfPox8,783893
+p115client/client.py,sha256=sXqO2jxXtP58r4xyoYzcfJ3eu4zTvMy7EbUBLca8Cp4,784167
 p115client/const.py,sha256=KqDGr9KsOnSkNVM3RIdQGptCMHbidMmZ_ffyFPiniww,7654
 p115client/exception.py,sha256=4SZ8ubOLMRxtcqc0u1kNzXqH1a6wwXJFwGnRDURoEgQ,3708
 p115client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-p115client/tool/__init__.py,sha256=TdGjEH7SD_6BaBdNg9Wd2Zd91KCycDOVN9JbH21z5SA,406
+p115client/tool/__init__.py,sha256=IwwzbCQ7jpRoFGTQUCfGBx8zvjqjgSFs98yKpYyI46s,429
 p115client/tool/attr.py,sha256=RmNm5uar2PVv1Me7xOWyM0JtZr-JqoglIIpF0WHGues,2979
 p115client/tool/auth.py,sha256=jUkVaCACg_K38RzpHTMGvve1xvhAdBeyPGtlNIfA_9M,1679
 p115client/tool/download.py,sha256=CZJE5f1SHi26eCNTPcF5VjSoht8WTUYravEG219i4gk,61534
@@ -15,13 +15,14 @@ p115client/tool/fs_files.py,sha256=cRUa-GNjoOMoLtLJxG-Zp6C6QFoM1Au0B_Z19KhLzn8,1
 p115client/tool/history.py,sha256=qquCiiOIRpxOqmyXbmdwS_qpfPkduJilM6AGuOufrYU,7462
 p115client/tool/iterdir.py,sha256=dXBMPfxPzRcFhBpnBT3X1LYkhc3l31rYCLRKRFbggSk,200498
 p115client/tool/life.py,sha256=ceweN2uNKYxigSOaBQ4Abo5u05zqppRm_P7k-_rHjcA,17301
+p115client/tool/offline.py,sha256=5I7ooTaxB3bGncfNtTnBNGDmErjCJae6Q9jkLAS34Is,4978
 p115client/tool/pool.py,sha256=H65VhoNxQC6xWSL1THq_PximWnBOqB4EfU6kWBTAnlA,13946
 p115client/tool/request.py,sha256=rjXuQwRganE5Z-4rfgnyPFjE4jzdQSLdIs9s0cIDshU,7043
 p115client/tool/upload.py,sha256=D2TPJlS--bGX-oHgTm6ktoqnX1_gwOMwxwMkiOwGuIY,32695
 p115client/tool/util.py,sha256=pAa8gc4BcnVTpNcXbNZU4tBUMjSB04DGOpzDdzfbto8,3934
 p115client/tool/xys.py,sha256=vU28Px2yeQzIxxGkopJIpvV6TdOnWJ5xB6NPXpTgM0Y,10306
 p115client/type.py,sha256=7kOp98uLaYqcTTCgCrb3DRcl8ukMpn7ibsnVvtw2nG8,6250
-p115client-0.0.5.11.10.1.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client-0.0.5.11.10.1.dist-info/METADATA,sha256=iykoz-kKA3NrhI_I-ePJ5cfDFnTJp0eqsiriFa-Tus0,8195
-p115client-0.0.5.11.10.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p115client-0.0.5.11.10.1.dist-info/RECORD,,
+p115client-0.0.5.11.11.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.11.11.dist-info/METADATA,sha256=wOD1JB3jSbUZi0McSiXPL98BiBtZd019jevjlL0hdD8,8193
+p115client-0.0.5.11.11.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.11.11.dist-info/RECORD,,