p115client 0.0.5.5.4__py3-none-any.whl → 0.0.5.5.5__py3-none-any.whl

p115client/client.py

@@ -6922,13 +6922,13 @@ class P115Client:
 
               - 全部: 0
               - ？？: 1
-              - ？？: 2
+              - 离线下载: 2
               - 播放视频: 3
               - 上传: 4
               - ？？: 5
               - ？？: 6
               - 接收: 7
-              - 移入: 8
+              - 移动: 8
 
             - with_file: 0 | 1 = 0
         """
@@ -7077,13 +7077,13 @@ class P115Client:
 
               - 全部: 0
               - ？？: 1
-              - ？？: 2
+              - 离线下载: 2
               - 播放视频: 3
               - 上传: 4
               - ？？: 5
               - ？？: 6
               - 接收: 7
-              - 移入: 8
+              - 移动: 8
 
             - with_file: 0 | 1 = 0
         """
@@ -7141,9 +7141,9 @@ class P115Client:
               - 播放视频: 3
               - 上传: 4
               - ？？: 5
-              - ？？: 6（似乎和离线下载有关）
+              - ？？: 6
               - 接收: 7
-              - 移入: 8
+              - 移动: 8
         """
         api = complete_webapi("/history/list", base_url=base_url)
         if isinstance(payload, (int, str)):
@@ -7202,9 +7202,9 @@ class P115Client:
               - 播放视频: 3
               - 上传: 4
               - ？？: 5
-              - ？？: 6（似乎和离线下载有关）
+              - ？？: 6
               - 接收: 7
-              - 移入: 8
+              - 移动: 8
         """
         api = complete_proapi("/history/list", base_url, app)
         if isinstance(payload, (int, str)):
@@ -8382,6 +8382,13 @@ class P115Client:
 
         POST https://webapi.115.com/files/move
 
+        .. caution::
+            你可以把文件或目录移动到其它目录 id 下，即使是不存在的 id
+
+            因此，我定义了一个概念，悬空节点，此节点的 aid=1，但它有一个祖先节点，要么不存在，要么 aid != 1
+
+            你可以用 `P115Client.tool_space` 方法，使用【校验空间】功能，把所有悬空节点找出来，放到根目录下的【修复文件】目录，此接口一天只能用一次
+
         :payload:
             - fid: int | str 💡 文件或目录 id，只接受单个 id
             - fid[]: int | str
@@ -8407,8 +8414,9 @@ class P115Client:
     @overload
     def fs_move_app(
         self, 
-        payload: dict, 
+        payload: int | str | dict | Iterable[int | str], 
         /, 
+        pid: int = 0, 
         app: str = "android", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
@@ -8419,8 +8427,9 @@ class P115Client:
     @overload
     def fs_move_app(
         self, 
-        payload: dict, 
+        payload: int | str | dict | Iterable[int | str], 
         /, 
+        pid: int = 0, 
         app: str = "android", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
@@ -8430,8 +8439,9 @@ class P115Client:
         ...
     def fs_move_app(
         self, 
-        payload: dict, 
+        payload: int | str | dict | Iterable[int | str], 
         /, 
+        pid: int = 0, 
         app: str = "android", 
         base_url: bool | str | Callable[[], str] = False, 
         *, 
@@ -8448,7 +8458,16 @@ class P115Client:
             - user_id: int | str = <default> 💡 不用管
         """
         api = complete_proapi("/files/move", base_url, app)
-        payload = dict(payload, user_id=self.user_id)
+        if isinstance(payload, (int, str)):
+            payload = {"ids": payload, "user_id": self.user_id}
+        elif isinstance(payload, dict):
+            payload = dict(payload, user_id=self.user_id)
+        else:
+            payload = {f"fid[{i}]": fid for i, fid in enumerate(payload)}
+            if not payload:
+                return {"state": False, "message": "no op"}
+            payload["user_id"] = self.user_id
+        payload.setdefault("pid", pid)
         return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
 
     @overload

p115client/tool/download.py

@@ -1089,7 +1089,7 @@ def make_strm(
 @overload
 def iter_download_nodes(
     client: str | P115Client, 
-    pickcode: str, 
+    pickcode: int | str, 
     files: bool = True, 
     max_workers: None | int = 1, 
     *, 
@@ -1100,7 +1100,7 @@ def iter_download_nodes(
 @overload
 def iter_download_nodes(
     client: str | P115Client, 
-    pickcode: str, 
+    pickcode: int | str, 
     files: bool = True, 
     max_workers: None | int = 1, 
     *, 
@@ -1110,7 +1110,7 @@ def iter_download_nodes(
     ...
 def iter_download_nodes(
     client: str | P115Client, 
-    pickcode: str, 
+    pickcode: int | str, 
     files: bool = True, 
     max_workers: None | int = 1, 
     *, 
@@ -1120,7 +1120,7 @@ def iter_download_nodes(
     """获取一个目录内所有的文件或者目录的信息（简略）
 
     :param client: 115 客户端或 cookies
-    :param pickcode: 目录的提取码
+    :param pickcode: 目录的 提取码 或者 id
     :param files: 如果为 True，则只获取文件，否则只获取目录
     :param max_workers: 最大并发数，如果为 None 或 <= 0，则默认为 20
     :param async_: 是否异步
@@ -1134,9 +1134,14 @@ def iter_download_nodes(
         method = client.download_files
     else:
         method = client.download_folders
-    request_kwargs.setdefault("base_url", cycle(("http://proapi.115.com", "https://proapi.115.com")).__next__)
     if max_workers == 1:
         def gen_step():
+            nonlocal pickcode
+            if isinstance(pickcode, int):
+                resp = yield client.fs_file_skim(pickcode, async_=async_, **request_kwargs)
+                check_response(resp)
+                pickcode = resp["data"][0]["pick_code"]
+            request_kwargs.setdefault("base_url", cycle(("http://proapi.115.com", "https://proapi.115.com")).__next__)
             for i in count(1):
                 payload = {"pickcode": pickcode, "page": i}
                 resp = yield method(payload, async_=async_, **request_kwargs)
@@ -1174,7 +1179,7 @@ def iter_download_nodes(
                 if not data["has_next_page"]:
                     max_page = page
         def gen_step():
-            nonlocal max_workers
+            nonlocal max_workers, pickcode
             if async_:
                 if max_workers is None or max_workers <= 0:
                     max_workers = 20
@@ -1191,6 +1196,15 @@ def iter_download_nodes(
                 n = executor._max_workers
                 submit = executor.submit
                 shutdown = lambda: executor.shutdown(False, cancel_futures=True)
+            if isinstance(pickcode, int):
+                resp = yield client.fs_file_skim(
+                    pickcode, 
+                    async_=async_, # type: ignore
+                    **request_kwargs, 
+                )
+                check_response(resp)
+                pickcode = resp["data"][0]["pick_code"]
+            request_kwargs.setdefault("base_url", cycle(("http://proapi.115.com", "https://proapi.115.com")).__next__)
             try:
                 sentinel = object()
                 countdown: Callable

p115client/tool/fs_files.py

@@ -47,6 +47,7 @@ def iter_fs_files(
     /, 
     first_page_size: int = 0, 
     page_size: int = 10_000, 
+    count: int = -1, 
     callback: None | Callable[[dict], Any] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
@@ -62,6 +63,7 @@ def iter_fs_files(
     /, 
     first_page_size: int = 0, 
     page_size: int = 10_000, 
+    count: int = -1, 
     callback: None | Callable[[dict], Any] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
@@ -76,6 +78,7 @@ def iter_fs_files(
     /, 
     first_page_size: int = 0, 
     page_size: int = 10_000, 
+    count: int = -1, 
     callback: None | Callable[[dict], Any] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
@@ -89,6 +92,7 @@ def iter_fs_files(
     :param payload: 目录的 id 或者详细的查询参数
     :param first_page_size: 首次拉取的分页大小，如果 <= 0，则自动确定
     :param page_size: 分页大小，如果 <= 0，则自动确定
+    :param count: 文件总数
     :param callback: 回调函数，调用后，会获得一个值，会添加到返回值中，key 为 "callback"
     :param app: 使用此设备的接口
     :param raise_for_changed_count: 分批拉取时，发现总数发生变化后，是否报错
@@ -116,7 +120,6 @@ def iter_fs_files(
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
         fs_files = partial(client.fs_files_app, app=app, async_=async_, **request_kwargs)
-    count = -1
     def get_files(payload: dict, /):
         nonlocal count
         while True:
@@ -167,6 +170,8 @@ def iter_fs_files_threaded(
     payload: int | str | dict = 0, 
     /, 
     page_size: int = 7_000, 
+    count: int = -1, 
+    wait_for_count: bool = False, 
     callback: None | Callable[[dict], Any] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
@@ -179,6 +184,8 @@ def iter_fs_files_threaded(
     :param client: 115 网盘客户端对象
     :param payload: 目录的 id 或者详细的查询参数
     :param page_size: 分页大小，如果 <= 0，则自动确定
+    :param count: 文件总数
+    :param wait_for_count: 如果为 True，则在确定 count 前，不进行并发
     :param callback: 回调函数，调用后，会获得一个值，会添加到返回值中，key 为 "callback"
     :param app: 使用此设备的接口
     :param raise_for_changed_count: 分批拉取时，发现总数发生变化后，是否报错
@@ -206,7 +213,6 @@ def iter_fs_files_threaded(
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
         fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
-    count = -1
     def get_files(payload: dict, /):
         nonlocal count
         resp = fs_files(payload)
@@ -245,7 +251,10 @@ def iter_fs_files_threaded(
         offset = payload["offset"]
         while True:
             try:
-                resp = future.result(max(0, ts + cooldown - time()))
+                if wait_for_count and count < 0:
+                    resp = future.result()
+                else:
+                    resp = future.result(max(0, ts + cooldown - time()))
             except TimeoutError:
                 payload["offset"] += page_size
                 if count < 0 or payload["offset"] < count:
@@ -275,6 +284,8 @@ async def iter_fs_files_asynchronized(
     payload: int | str | dict = 0, 
     /, 
     page_size: int = 7_000, 
+    count: int = -1, 
+    wait_for_count: bool = False, 
     callback: None | Callable[[dict], Any] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
@@ -286,6 +297,8 @@ async def iter_fs_files_asynchronized(
     :param client: 115 网盘客户端对象
     :param payload: 目录的 id 或者详细的查询参数
     :param page_size: 分页大小，如果 <= 0，则自动确定
+    :param count: 文件总数
+    :param wait_for_count: 如果为 True，则在确定 count 前，不进行并发
     :param callback: 回调函数，调用后，会获得一个值，会添加到返回值中，key 为 "callback"
     :param app: 使用此设备的接口
     :param raise_for_changed_count: 分批拉取时，发现总数发生变化后，是否报错
@@ -312,7 +325,6 @@ async def iter_fs_files_asynchronized(
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
         fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
-    count = -1
     async def get_files(payload: dict, /):
         nonlocal count
         resp = await fs_files(payload, async_=True) # type: ignore
@@ -355,7 +367,10 @@ async def iter_fs_files_asynchronized(
         offset = payload["offset"]
         while True:
             try:
-                resp = await wait_for(shield(task), max(0, ts + cooldown - time()))
+                if wait_for_count and count < 0:
+                    resp = await task
+                else:
+                    resp = await wait_for(shield(task), max(0, ts + cooldown - time()))
             except TimeoutError:
                 payload["offset"] += page_size
                 if count < 0 or payload["offset"] < count:

p115client/tool/iterdir.py

@@ -9,8 +9,8 @@ __all__ = [
     "iter_nodes_skim", "iter_stared_dirs_raw", "iter_stared_dirs", "ensure_attr_path", 
     "ensure_attr_path_by_category_get", "iterdir_raw", "iterdir", "iterdir_limited", 
     "iter_files_raw", "iter_files", "traverse_files", "iter_dupfiles", "iter_image_files", 
-    "iter_dangling_files", "share_extract_payload", "share_iterdir", "share_iter_files", 
-    "iter_selected_nodes", "iter_selected_nodes_by_pickcode", "iter_selected_nodes_using_category_get", 
+    "share_extract_payload", "share_iterdir", "share_iter_files", "iter_selected_nodes", 
+    "iter_selected_nodes_by_pickcode", "iter_selected_nodes_using_category_get", 
     "iter_selected_nodes_using_edit", "iter_selected_nodes_using_star_event", 
     "iter_selected_dirs_using_star", "iter_files_with_dirname", "iter_files_with_path", 
     "iter_files_with_path_by_export_dir", "iter_parents_3_level", "iter_dir_nodes", 
@@ -3040,123 +3040,6 @@ def iter_image_files(
     return run_gen_step_iter(gen_step, async_=async_)
 
 
-@overload
-def iter_dangling_files(
-    client: str | P115Client, 
-    cid: int = 0, 
-    page_size: int = 0, 
-    suffix: str = "", 
-    type: Literal[1, 2, 3, 4, 5, 6, 7, 99] = 99, 
-    normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    app: str = "web", 
-    *, 
-    async_: Literal[False] = False, 
-    **request_kwargs, 
-) -> Iterator[dict]:
-    ...
-@overload
-def iter_dangling_files(
-    client: str | P115Client, 
-    cid: int = 0, 
-    page_size: int = 0, 
-    suffix: str = "", 
-    type: Literal[1, 2, 3, 4, 5, 6, 7, 99] = 99, 
-    normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    app: str = "web", 
-    *, 
-    async_: Literal[True], 
-    **request_kwargs, 
-) -> AsyncIterator[dict]:
-    ...
-def iter_dangling_files(
-    client: str | P115Client, 
-    cid: int = 0, 
-    page_size: int = 0, 
-    suffix: str = "", 
-    type: Literal[1, 2, 3, 4, 5, 6, 7, 99] = 99, 
-    normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    app: str = "web", 
-    *, 
-    async_: Literal[False, True] = False, 
-    **request_kwargs, 
-) -> Iterator[dict] | AsyncIterator[dict]:
-    """找出所有悬空的文件，即所在的目录 id 不为 0 且不存在
-
-    .. todo::
-        实际上，广义的悬空，包括所有这样的文件或目录，它们的祖先节点中存在一个节点，这个节点的 id 目前不存在于网盘（可能被删除或移入回收站）
-
-    .. danger::
-        你可以用 `P115Client.fs_move` 方法，把文件或目录随意移动到任何目录 id 下，即使这个 id 不存在
-
-    .. note::
-        你可以用 `P115Client.tool_space` 方法，把所有悬空文件找出来，放到专门的目录中，但这个接口一天只能用一次
-
-    :param client: 115 客户端或 cookies
-    :param cid: 目录 id
-    :param page_size: 分页大小
-    :param suffix: 后缀名（优先级高于 type）
-    :param type: 文件类型
-
-        - 1: 文档
-        - 2: 图片
-        - 3: 音频
-        - 4: 视频
-        - 5: 压缩包
-        - 6: 应用
-        - 7: 书籍
-        - 99: 仅文件
-
-    :param normalize_attr: 把数据进行转换处理，使之便于阅读
-    :param app: 使用某个 app （设备）的接口
-    :param async_: 是否异步
-    :param request_kwargs: 其它请求参数
-
-    :return: 迭代器，返回此目录内的（仅文件）文件信息
-    """
-    if not isinstance(client, P115Client):
-        client = P115Client(client, check_for_relogin=True)
-    if page_size <= 0:
-        page_size = 10_000
-    elif page_size < 16:
-        page_size = 16
-    if app in ("", "web", "desktop", "harmony"):
-        fs_files: Callable = client.fs_files
-    else:
-        fs_files = partial(client.fs_files_app, app=app)
-    def gen_step():
-        na_cids: set[int] = set()
-        ok_cids: set[int] = set()
-        payload = {"cid": cid, "limit": page_size, "offset": 0, "suffix": suffix, "type": type}
-        while True:
-            resp = yield fs_files(payload, async_=async_, **request_kwargs)
-            if cid and int(resp["path"][-1]["cid"]) != cid:
-                break
-            if resp["offset"] != payload["offset"]:
-                break
-            t = tuple(map(_overview_attr, resp["data"]))
-            pids = {
-                pid for a in t
-                if (pid := a.parent_id) not in na_cids
-                    and pid not in ok_cids
-            }
-            if pids:
-                if async_:
-                    na_cids.update(iter_nodes_skim(client, pids, **request_kwargs))
-                else:
-                    yield async_foreach(
-                        na_cids.add, 
-                        iter_nodes_skim(client, pids, async_=True, **request_kwargs), 
-                    )
-                ok_cids |= pids - na_cids
-            for a, info in zip(t, resp["data"]):
-                if a.parent_id in na_cids:
-                    yield Yield(normalize_attr(info), identity=True)
-            payload["offset"] += len(resp["data"]) # type: ignore
-            if payload["offset"] >= resp["count"]:
-                break
-    return run_gen_step_iter(gen_step, async_=async_)
-
-
 def share_extract_payload(link: str, /) -> SharePayload:
     """从链接中提取 share_code 和 receive_code
 

p115client/tool/life.py

@@ -11,7 +11,7 @@ __doc__ = "这个模块提供了一些和 115 生活操作事件有关的函数"
 from asyncio import sleep as async_sleep
 from collections.abc import AsyncIterator, Container, Coroutine, Iterator
 from functools import partial
-from itertools import count
+from itertools import count, cycle
 from time import time, sleep
 from typing import overload, Any, Final, Literal
 
@@ -243,6 +243,7 @@ def iter_life_behavior_once(
     if app in ("", "web", "desktop", "harmony"):
         life_behavior_detail = partial(client.life_behavior_detail, **request_kwargs)
     else:
+        request_kwargs.setdefault("base_url", cycle(("http://proapi.115.com", "https://proapi.115.com")).__next__)
         life_behavior_detail = partial(client.life_behavior_detail_app, app=app, **request_kwargs)
     if first_batch_size <= 0:
         first_batch_size = 64 if from_time or from_id else 1000

{p115client-0.0.5.5.4.dist-info → p115client-0.0.5.5.5.dist-info}/METADATA

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

{p115client-0.0.5.5.4.dist-info → p115client-0.0.5.5.5.dist-info}/RECORD

@@ -1,23 +1,23 @@
 LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
 p115client/__init__.py,sha256=1mx7njuAlqcuEWONTjSiiGnXyyNyqOcJyNX1FMHqQ-4,214
 p115client/_upload.py,sha256=4Qt7bJOAgob3lcbX1yUZ0hilkAXABD2J9BSLYPIGybQ,29900
-p115client/client.py,sha256=XtCw_KpNgqvNZYaQzD-c5at7N9dg2OrPI9tp-2s24uU,615516
+p115client/client.py,sha256=FpB-gG4f3Vv5ZwSET4jBGVJg9FcNPaYEj_aGN8t4e8g,616516
 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
 p115client/tool/__init__.py,sha256=2YrKoAcFYOuqu2nUBoPVhxMOseAvcLE_LcnbZV11UKw,324
-p115client/tool/download.py,sha256=uKNKUJML2LWEI4JVoakMEafmbPvo-OV37Oi0d0qu3v4,55486
+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=tpW054WUYqa1J1A9TiSAvHh4RCJ53bc6rwTGlbUswhA,14973
-p115client/tool/iterdir.py,sha256=rvy1Rm5T7TX4-gazeuSzigDe7-D91ZgDCMaSx-Vltig,188125
-p115client/tool/life.py,sha256=kWUfHfWJxEMsX939Vu6DEaLI_Qcbfw2yGDHinZqjxas,17461
+p115client/tool/fs_files.py,sha256=aOU2Ea7_CLUfzq3_UJx2SBF8ubJYAkZ4J-e2H3OfqpA,15602
+p115client/tool/iterdir.py,sha256=hpzOCaYi0-8XA6yS3RVnMp9a1FT25qjpZwnPJYNOXYw,183974
+p115client/tool/life.py,sha256=8STXfjL8DPp0YTLFsE7Dt_6c2wj_0AvScq6WrjX9i9M,17583
 p115client/tool/pool.py,sha256=vFV3t4g8KuQ4Rlttd1bs7d0Lc8jFUufdmDQweMcLZZw,9779
 p115client/tool/request.py,sha256=SWsezW9EYZGS3R-TbZxMG-8bN3YWJ0-GzgvKlvRBSCM,7042
 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.5.4.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client-0.0.5.5.4.dist-info/METADATA,sha256=T_JVuV9ZA4ZQmawUE7xfeR2Gr7Z6cAWKjgJmZihcMIg,7143
-p115client-0.0.5.5.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p115client-0.0.5.5.4.dist-info/RECORD,,
+p115client-0.0.5.5.5.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.5.5.dist-info/METADATA,sha256=9Q9J8L5qSZGbLuKxSErtiIjKhwkcjhN_2O1aVdvyrFY,7143
+p115client-0.0.5.5.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.5.5.dist-info/RECORD,,