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

p115client/const.py

@@ -5,8 +5,8 @@ from __future__ import annotations
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
 __all__ = [
-    "AVAILABLE_APPS", "APP_TO_SSOENT", "SSOENT_TO_APP", "CLIENT_API_MAP", 
-    "CLASS_TO_TYPE", "SUFFIX_TO_TYPE", "errno", 
+    "AVAILABLE_APPS", "APP_TO_SSOENT", "SSOENT_TO_APP", "CLIENT_METHOD_API_MAP", 
+    "CLIENT_API_METHODS_MAP", "CLASS_TO_TYPE", "SUFFIX_TO_TYPE", "errno", 
 ]
 
 from enum import IntEnum
@@ -69,8 +69,11 @@ SSOENT_TO_APP: Final[dict[str, str]] = {
     "S1": "harmony", 
 }
 
-#: 所有已封装的 115 接口以及对应的方法名
-CLIENT_API_MAP: Final[dict[str, str]] = {}
+#: 所有已封装的方法名和对应的 115 接口
+CLIENT_METHOD_API_MAP: Final[dict[str, str]] = {}
+
+#: 所有已封装的 115 接口和对应的方法名
+CLIENT_API_METHODS_MAP: Final[dict[str, list[str]]] = {}
 
 #: 文件的 class 属性对应的所属类型的整数代码
 CLASS_TO_TYPE: Final[dict[str, int]] = {

p115client/tool/offline.py

@@ -7,12 +7,14 @@ __doc__ = "这个模块提供了一些和离线下载有关的函数"
 
 from asyncio import sleep as async_sleep
 from collections.abc import AsyncIterator, Callable, Iterable, Iterator
+from errno import EBUSY
 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
+from p115client.exception import BusyOSError
 
 
 @overload
@@ -22,7 +24,8 @@ def offline_iter(
     page_start: int = 1, 
     page_stop: int = -1, 
     cooldown: float = 0, 
-    use_open_api: bool = False, 
+    raise_for_update: bool = False, 
+    use_open_api: bool = False,  
     *, 
     async_: Literal[False] = False, 
     **request_kwargs, 
@@ -35,6 +38,7 @@ def offline_iter(
     page_start: int = 1, 
     page_stop: int = -1, 
     cooldown: float = 0, 
+    raise_for_update: bool = False, 
     use_open_api: bool = False, 
     *, 
     async_: Literal[True], 
@@ -47,6 +51,7 @@ def offline_iter(
     page_start: int = 1, 
     page_stop: int = -1, 
     cooldown: float = 0, 
+    raise_for_update: bool = False, 
     use_open_api: bool = False, 
     *, 
     async_: Literal[False, True] = False, 
@@ -54,10 +59,18 @@ def offline_iter(
 ) -> Iterator[dict] | AsyncIterator[dict]:
     """遍历任务列表，获取任务信息
 
+    .. tip::
+        在逐页拉取的间隔期间，任务列表可能发生变化，可能导致重复和遗漏：
+
+        1. 新增任务，特别是状态为进行中
+        2. 删除任务
+        3. 曾经取得的进行中的任务，变为完成
+
     :param client: 115 客户端或 cookies
     :param page_start: 开始页数
     :param page_stop: 结束页数（不含），如果 <= 0，则不限
     :param cooldown: 接口调用冷却时间，单位：秒
+    :param raise_for_update: 当列表发生更新时，是否报错退出
     :param use_open_api: 是否使用 open api
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
@@ -79,21 +92,40 @@ def offline_iter(
             offline_list = client.offline_list_open
         else:
             offline_list = client.offline_list
-        if cooldown > 0:
+        may_sleep = cooldown > 0
+        if may_sleep:
             do_sleep = async_sleep if async_ else sleep
-        last_t: float = 0
+            last_t: float = 0
+        if raise_for_update:
+            count = -1
+            seen: set[str] = set()
+            add_info_hash = seen.add
         for page in pages:
-            if last_t and (diff := last_t + cooldown - time()) > 0:
-                yield do_sleep(diff)
-            last_t = time()
+            if may_sleep:
+                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"]
+            if raise_for_update:
+                if count < 0:
+                    count = resp["count"]
+                elif count != resp["count"]:
+                    raise BusyOSError(EBUSY, f"detected count changes: {count} != {resp['count']}")
             tasks = resp["tasks"]
             if not tasks:
                 break
-            yield YieldFrom(resp["tasks"])
+            if raise_for_update:
+                for task in tasks:
+                    info_hash = task["info_hash"]
+                    if info_hash in seen:
+                        raise BusyOSError(EBUSY, f"detected duplicate task: info_hash={info_hash!r}")
+                    add_info_hash(info_hash)
+                    yield Yield(task)
+            else:
+                yield YieldFrom(resp["tasks"])
             if len(tasks) < 30 or page >= resp["page_count"]:
                 break
     return run_gen_step_iter(gen_step, async_=async_)

{p115client-0.0.5.11.11.dist-info → p115client-0.0.5.12.1.dist-info}/METADATA

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

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

@@ -1,8 +1,8 @@
 LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
 p115client/__init__.py,sha256=1mx7njuAlqcuEWONTjSiiGnXyyNyqOcJyNX1FMHqQ-4,214
 p115client/_upload.py,sha256=3uXwgFsXkZ4X5hjL1N2mx0y8tA8MjVxe49N0BoyYyno,31253
-p115client/client.py,sha256=sXqO2jxXtP58r4xyoYzcfJ3eu4zTvMy7EbUBLca8Cp4,784167
-p115client/const.py,sha256=KqDGr9KsOnSkNVM3RIdQGptCMHbidMmZ_ffyFPiniww,7654
+p115client/client.py,sha256=h62_xx1z-F5TeqQn55ugUUcJuAbVRV1mIfXsI1_rO6s,794996
+p115client/const.py,sha256=ZYtBtTFB0eljIR0tze21_52Gl0pQxvyqMmDwgB1bqNU,7803
 p115client/exception.py,sha256=4SZ8ubOLMRxtcqc0u1kNzXqH1a6wwXJFwGnRDURoEgQ,3708
 p115client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 p115client/tool/__init__.py,sha256=IwwzbCQ7jpRoFGTQUCfGBx8zvjqjgSFs98yKpYyI46s,429
@@ -15,14 +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/offline.py,sha256=iEpC4e71Pmz1j7NTlXUgJLKUSf_wcPxVZ9ciqURoXcA,6305
 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.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,,
+p115client-0.0.5.12.1.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.12.1.dist-info/METADATA,sha256=wDdhSFRIxbvM_XKquuiBNf2rVWkLPHtCUiEn1U88Ro0,8192
+p115client-0.0.5.12.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.12.1.dist-info/RECORD,,