p115client 0.0.5.8.6__py3-none-any.whl → 0.0.5.9__py3-none-any.whl

p115client/client.py

@@ -375,8 +375,9 @@ def check_response(resp: dict | Awaitable[dict], /) -> dict | Coroutine[Any, Any
                     raise FileNotFoundError(ENOENT, resp)
                 # {"state": false, "errno": 20018, "error": "文件不存在或已删除。"}
                 # {"state": false, "errno": 50015, "error": "文件不存在或已删除。"}
+                # {"state": false, "errno": 90008, "error": "文件（夹）不存在或已经删除。"}
                 # {"state": false, "errno": 430004, "error": "文件（夹）不存在或已删除。"}
-                case 20018 | 50015 | 430004:
+                case 20018 | 50015 | 90008 | 430004:
                     raise FileNotFoundError(ENOENT, resp)
                 # {"state": false, "errno": 20020, "error": "后缀名不正确，请重新输入"}
                 case 20020:
@@ -393,9 +394,6 @@ def check_response(resp: dict | Awaitable[dict], /) -> dict | Coroutine[Any, Any
                 # {"state": false, "errno": 50003, "error": "很抱歉，该文件提取码不存在。"}
                 case 50003:
                     raise FileNotFoundError(ENOENT, resp)
-                # {"state": false, "errno": 90008, "error": "文件（夹）不存在或已经删除。"}
-                case 90008:
-                    raise FileNotFoundError(ENOENT, resp)
                 # {"state": false, "errno": 91002, "error": "不能将文件复制到自身或其子目录下。"}
                 case 91002:
                     raise NotSupportedError(ENOTSUP, resp)
@@ -462,6 +460,12 @@ def check_response(resp: dict | Awaitable[dict], /) -> dict | Coroutine[Any, Any
                     raise IsADirectoryError(EISDIR, resp)
                 case 70005 | 70008:
                     raise FileNotFoundError(ENOENT, resp)
+        elif "error" in resp:
+            match resp["error"]:
+                case "目录不存在或已转移":
+                    raise FileNotFoundError(ENOENT, resp)
+                case "更新的数据为空":
+                    raise OperationalError(EINVAL, resp)
         raise P115OSError(EIO, resp)
     if isinstance(resp, dict):
         return check(resp)
@@ -1022,6 +1026,12 @@ class ClientRequestMixin:
             for cookie in cookies:
                 set_cookie(create_cookie("", cookie))
 
+    @cookies.deleter
+    def cookies(self, /):
+        """请求所用的 Cookies 对象（同步和异步共用）
+        """
+        self.cookies = None
+
     @property
     def cookiejar(self, /) -> CookieJar:
         """请求所用的 CookieJar 对象（同步和异步共用）
@@ -1765,7 +1775,7 @@ class ClientRequestMixin:
     def login_with_open(
         cls, 
         /, 
-        app_id: int | str, 
+        app_id: int | str = 100195993, 
         console_qrcode: bool = True, 
         *, 
         async_: Literal[False] = False, 
@@ -1777,7 +1787,7 @@ class ClientRequestMixin:
     def login_with_open(
         cls, 
         /, 
-        app_id: int | str, 
+        app_id: int | str = 100195993, 
         console_qrcode: bool = True, 
         *, 
         async_: Literal[True], 
@@ -1788,7 +1798,7 @@ class ClientRequestMixin:
     def login_with_open(
         cls, 
         /, 
-        app_id: int | str, 
+        app_id: int | str = 100195993, 
         console_qrcode: bool = True, 
         *, 
         async_: Literal[False, True] = False, 
@@ -2458,7 +2468,7 @@ class P115OpenClient(ClientRequestMixin):
 
     @access_token.setter
     def access_token(self, token, /):
-        self.headers["Authorization"] = "Bearer " + token
+        self.headers["authorization"] = "Bearer " + token
         self.__dict__["access_token"] = token
 
     @property
@@ -2470,6 +2480,11 @@ class P115OpenClient(ClientRequestMixin):
             token = self.__dict__["upload_token"] = resp["data"]
         return token
 
+    @locked_cacheproperty
+    def user_id(self, /) -> int:
+        resp = check_response(self.user_info_open())
+        return int(resp["data"]["user_id"])
+
     @overload
     def refresh_access_token(
         self, 
@@ -4220,11 +4235,20 @@ class P115Client(P115OpenClient):
         if not cookies_equal(cookies_old, cookies_new):
             self._write_cookies(cookies_new)
 
+    @cookies.deleter
+    def cookies(self, /):
+        """请求所用的 Cookies 对象（同步和异步共用）
+        """
+        self.cookies = None
+
     @locked_cacheproperty
     def user_id(self, /) -> int:
         cookie_uid = self.cookies.get("UID")
         if cookie_uid:
             return int(cookie_uid.split("_")[0])
+        elif "authorization" in self.headers:
+            resp = check_response(self.user_info_open())
+            return int(resp["data"]["user_id"])
         else:
             return 0
 
@@ -4914,9 +4938,9 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str, 
-        replace: Literal[True] | Self, 
+        app_id: int | str = 100195993, 
         *, 
+        replace: Literal[True] | Self, 
         async_: Literal[False] = False, 
         **request_kwargs, 
     ) -> Self:
@@ -4925,9 +4949,9 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str, 
-        replace: Literal[True] | Self, 
+        app_id: int | str = 100195993, 
         *, 
+        replace: Literal[True] | Self, 
         async_: Literal[True], 
         **request_kwargs, 
     ) -> Coroutine[Any, Any, Self]:
@@ -4936,9 +4960,9 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str, 
-        replace: Literal[False] = False, 
+        app_id: int | str = 100195993, 
         *, 
+        replace: Literal[False] = False, 
         async_: Literal[False] = False, 
         **request_kwargs, 
     ) -> P115OpenClient:
@@ -4947,9 +4971,9 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str, 
-        replace: Literal[False] = False, 
+        app_id: int | str = 100195993, 
         *, 
+        replace: Literal[False] = False, 
         async_: Literal[True], 
         **request_kwargs, 
     ) -> Coroutine[Any, Any, P115OpenClient]:
@@ -4957,9 +4981,9 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str, 
-        replace: bool | Self = False, 
+        app_id: int | str = 100195993, 
         *, 
+        replace: bool | Self = False, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> P115OpenClient | Coroutine[Any, Any, P115OpenClient] | Self | Coroutine[Any, Any, Self]:
@@ -14159,7 +14183,7 @@ class P115Client(P115OpenClient):
             - type: str = "" 💡 操作类型，若不指定则是全部
 
               - "upload_image_file": 1 💡 上传图片
-              - "upload_file":       2 💡 上传文件或目录
+              - "upload_file":       2 💡 上传文件或目录（不包括图片）
               - "star_image":        3 💡 给图片设置星标
               - "star_file":         4 💡 给文件或目录设置星标（不包括图片）
               - "move_image_file":   5 💡 移动图片
@@ -14230,7 +14254,7 @@ class P115Client(P115OpenClient):
             - type: str = "" 💡 操作类型
 
               - "upload_image_file": 1 💡 上传图片
-              - "upload_file":       2 💡 上传文件或目录
+              - "upload_file":       2 💡 上传文件或目录（不包括图片）
               - "star_image":        3 💡 给图片设置星标
               - "star_file":         4 💡 给文件或目录设置星标（不包括图片）
               - "move_image_file":   5 💡 移动图片

p115client/tool/__init__.py

@@ -7,10 +7,10 @@ from .download import *
 from .edit import *
 from .export_dir import *
 from .fs_files import *
+from .history import *
 from .iterdir import *
 from .life import *
 from .pool import *
 from .request import *
 from .upload import *
 from .xys import *
-

p115client/tool/history.py

@@ -0,0 +1,224 @@
+#!/usr/bin/env python3
+# encoding: utf-8
+
+__author__ = "ChenyangGao <https://chenyanggao.github.io>"
+__all__ = ["iter_history_list_once", "iter_history_list"]
+__doc__ = "这个模块提供了一些和 115 的历史记录有关的函数"
+
+from asyncio import sleep as async_sleep
+from collections.abc import AsyncIterator, Iterator
+from functools import partial
+from itertools import cycle
+from time import time, sleep
+from typing import overload, Literal
+
+from iterutils import run_gen_step_iter, with_iter_next, Yield
+from p115client import check_response, P115Client
+
+
+@overload
+def iter_history_list_once(
+    client: str | P115Client, 
+    from_time: int | float = 0, 
+    from_id: int = 0, 
+    type: int | str = 0, 
+    first_batch_size = 0, 
+    app: str = "web", 
+    cooldown: int | float = 0, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> Iterator[dict]:
+    ...
+@overload
+def iter_history_list_once(
+    client: str | P115Client, 
+    from_time: int | float = 0, 
+    from_id: int = 0, 
+    type: int | str = 0, 
+    first_batch_size = 0, 
+    app: str = "web", 
+    cooldown: int | float = 0, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> AsyncIterator[dict]:
+    ...
+def iter_history_list_once(
+    client: str | P115Client, 
+    from_time: int | float = 0, 
+    from_id: int = 0, 
+    type: int | str = 0, 
+    first_batch_size = 0, 
+    app: str = "web", 
+    cooldown: int | float = 0, 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> AsyncIterator[dict] | Iterator[dict]:
+    """拉取一组 115 的历史记录
+
+    :param client: 115 客户端或 cookies
+    :param from_time: 开始时间（含），若为 0 则从当前时间开始，若小于 0 则从最早开始
+    :param from_id: 开始的事件 id （不含）
+    :param type: 拉取指定类型的历史记录（？？表示还未搞清楚），多个用逗号 "," 隔开
+
+        - 全部: 0
+        - ？？: 1
+        - 离线下载: 2
+        - 播放视频: 3
+        - 上传: 4
+        - ？？: 5
+        - ？？: 6
+        - 接收: 7
+        - 移动: 8
+
+    :param first_batch_size: 首批的拉取数目
+    :param app: 使用某个 app （设备）的接口
+    :param cooldown: 冷却时间，大于 0 时，两次接口调用之间至少间隔这么多秒
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 迭代器，产生 115 的历史记录数据字典
+    """
+    if isinstance(client, str):
+        client = P115Client(client, check_for_relogin=True)
+    if app in ("", "web", "desktop", "harmony"):
+        history_list = partial(client.fs_history_list, **request_kwargs)
+    else:
+        request_kwargs.setdefault("base_url", cycle(("http://proapi.115.com", "https://proapi.115.com")).__next__)
+        history_list = partial(client.fs_history_list_app, app=app, **request_kwargs)
+    if first_batch_size <= 0:
+        first_batch_size = 64 if from_time or from_id else 1150
+    def gen_step():
+        payload = {"type": type, "limit": first_batch_size, "offset": 0}
+        seen: set[int] = set()
+        seen_add = seen.add
+        ts_last_call = time()
+        resp = yield history_list(payload, async_=async_)
+        events = check_response(resp)["data"]["list"]
+        payload["limit"] = 1150
+        offset = 0
+        while events:
+            for event in events:
+                event_id = int(event["id"])
+                if from_id and event_id <= from_id or from_time and int(event["update_time"]) < from_time:
+                    return
+                if event_id not in seen:
+                    yield Yield(event, identity=True)
+                    seen_add(event_id)
+            offset += len(events)
+            if offset >= int(resp["data"]["total"]):
+                return
+            payload["offset"] = offset
+            if cooldown > 0 and (delta := ts_last_call + cooldown - time()) > 0:
+                if async_:
+                    yield async_sleep(delta)
+                else:
+                    sleep(delta)
+            ts_last_call = time()
+            resp = yield history_list(payload, async_=async_)
+            events = check_response(resp)["data"]["list"]
+    return run_gen_step_iter(gen_step, async_=async_)
+
+
+@overload
+def iter_history_list(
+    client: str | P115Client, 
+    from_time: int | float = 0, 
+    from_id: int = 0, 
+    type: int | str = 0, 
+    app: str = "web", 
+    cooldown: int | float = 0, 
+    interval: int | float = 0, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> Iterator[dict]:
+    ...
+@overload
+def iter_history_list(
+    client: str | P115Client, 
+    from_time: int | float = 0, 
+    from_id: int = 0, 
+    type: int | str = 0, 
+    app: str = "web", 
+    cooldown: int | float = 0, 
+    interval: int | float = 0, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> AsyncIterator[dict]:
+    ...
+def iter_history_list(
+    client: str | P115Client, 
+    from_time: int | float = 0, 
+    from_id: int = 0, 
+    type: int | str = 0, 
+    app: str = "web", 
+    cooldown: int | float = 0, 
+    interval: int | float = 0, 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> AsyncIterator[dict] | Iterator[dict]:
+    """持续拉取 115 的历史记录
+
+    :param client: 115 客户端或 cookies
+    :param from_time: 开始时间（含），若为 0 则从当前时间开始，若小于 0 则从最早开始
+    :param from_id: 开始的事件 id （不含）
+    :param type: 拉取指定类型的历史记录（？？表示还未搞清楚），多个用逗号 "," 隔开
+
+        - 全部: 0
+        - ？？: 1
+        - 离线下载: 2
+        - 播放视频: 3
+        - 上传: 4
+        - ？？: 5
+        - ？？: 6
+        - 接收: 7
+        - 移动: 8
+
+    :param cooldown: 冷却时间，大于 0 时，两次接口调用之间至少间隔这么多秒
+    :param interval: 两个批量拉取之间的睡眠时间间隔，如果小于等于 0，则不睡眠
+    :param app: 使用某个 app （设备）的接口
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 迭代器，产生 115 的历史记录数据字典
+    """
+    if isinstance(client, str):
+        client = P115Client(client, check_for_relogin=True)
+    def gen_step():
+        nonlocal from_time, from_id
+        if from_time == 0:
+            from_time = time()
+        first_loop = True
+        while True:
+            if first_loop:
+                first_loop = False
+            elif interval > 0:
+                if async_:
+                    yield async_sleep(interval)
+                else:
+                    sleep(interval)
+            with with_iter_next(iter_history_list_once(
+                client, 
+                from_time, 
+                from_id, 
+                type=type, 
+                app=app, 
+                cooldown=cooldown, 
+                async_=async_, 
+                **request_kwargs, 
+            )) as get_next:
+                sub_first_loop = True
+                while True:
+                    event = yield get_next
+                    if sub_first_loop:
+                        from_id = int(event["id"])
+                        from_time = int(event["update_time"])
+                        sub_first_loop = False
+                    yield Yield(event, identity=True)
+    return run_gen_step_iter(gen_step, async_=async_)
+

p115client/tool/life.py

@@ -15,7 +15,7 @@ from itertools import count, cycle
 from time import time, sleep
 from typing import overload, Any, Final, Literal
 
-from iterutils import run_gen_step_iter, Yield
+from iterutils import run_gen_step_iter, with_iter_next, Yield
 from p115client import check_response, P115Client
 
 
@@ -357,7 +357,7 @@ def iter_life_behavior(
                     yield async_sleep(interval)
                 else:
                     sleep(interval)
-            it = iter_life_behavior_once(
+            with with_iter_next(iter_life_behavior_once(
                 client, 
                 from_time, 
                 from_id, 
@@ -366,11 +366,10 @@ def iter_life_behavior(
                 cooldown=cooldown, 
                 async_=async_, 
                 **request_kwargs, 
-            )
-            try:
+            )) as get_next:
                 sub_first_loop = True
                 while True:
-                    event = (yield anext(it)) if async_ else next(it) # type: ignore
+                    event = yield get_next
                     if sub_first_loop:
                         from_id = int(event["id"])
                         from_time = int(event["update_time"])
@@ -378,8 +377,6 @@ def iter_life_behavior(
                     if not type and ignore_types and event["type"] in ignore_types:
                         continue
                     yield Yield(event, identity=True)
-            except (StopIteration, StopAsyncIteration):
-                pass
     return run_gen_step_iter(gen_step, async_=async_)
 
 
@@ -451,7 +448,7 @@ def iter_life_behavior_list(
         while True:
             ls: list[dict] = []
             push = ls.append
-            it = iter_life_behavior_once(
+            with with_iter_next(iter_life_behavior_once(
                 client, 
                 from_time, 
                 from_id, 
@@ -460,11 +457,10 @@ def iter_life_behavior_list(
                 cooldown=cooldown, 
                 async_=async_, 
                 **request_kwargs, 
-            )
-            try:
+            )) as get_next:
                 first_loop = True
                 while True:
-                    event = (yield anext(it)) if async_ else next(it) # type: ignore
+                    event = yield get_next
                     if first_loop:
                         from_id = int(event["id"])
                         from_time = int(event["update_time"])
@@ -472,8 +468,6 @@ def iter_life_behavior_list(
                     if not type and ignore_types and event["type"] in ignore_types:
                         continue
                     push(event)
-            except (StopIteration, StopAsyncIteration):
-                pass
             yield Yield(ls, identity=True)
     return run_gen_step_iter(gen_step, async_=async_)
 

{p115client-0.0.5.8.6.dist-info → p115client-0.0.5.9.dist-info}/METADATA

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

{p115client-0.0.5.8.6.dist-info → p115client-0.0.5.9.dist-info}/RECORD

@@ -1,23 +1,24 @@
 LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
 p115client/__init__.py,sha256=1mx7njuAlqcuEWONTjSiiGnXyyNyqOcJyNX1FMHqQ-4,214
 p115client/_upload.py,sha256=DOckFLU_P7Fl0BNu_0-2od6pPsCnzroYY6zZE5_EMnM,30735
-p115client/client.py,sha256=PvlnygUvcLrLrZF9fYWt3NIg2ayMWee6Iw4f-v78S8Y,717352
+p115client/client.py,sha256=u_DqD-BKA0CkkQJ8hD-5CF4itke9TZBiuH4lcv1HW9g,718310
 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/__init__.py,sha256=x1x4yt3Ylim5CbFO4M-Fu62Gd99pUFpb3-5ssL6l-_Y,346
 p115client/tool/download.py,sha256=DneVsbryn4d47RkS62ghF5Xz8vkDq6U0n2hj1W5g4iY,61176
 p115client/tool/edit.py,sha256=3hQ5J3hHQx4yNsGcWSechBYAvZRSQUxfXLXuqXiDKmk,17789
 p115client/tool/export_dir.py,sha256=iMnKtnESi8HKvW9WhIvOdEoMXSBpAnhFlGeyKXHpQbE,24545
 p115client/tool/fs_files.py,sha256=hkezLKrtTAGPDkPxwq6jMrm8s2-unHZQBR7cDvh41qs,16027
+p115client/tool/history.py,sha256=2S26BH7uBNfVHlbYFNy-aNOLMcM-HrlR7TLHAZacUJI,7458
 p115client/tool/iterdir.py,sha256=T6bsD8A896nHgVxKYu2dkIo-5Az2svL4iLm2uHQWyHg,187517
-p115client/tool/life.py,sha256=SJ1dAvRYCWTUz1gPrCWv-_G1Rq5yPfxDgY7KT-2UP4A,17528
+p115client/tool/life.py,sha256=9ncoB2dNibhgOjPb9mHr873fCZmb65ZeteVLH4Tsujc,17330
 p115client/tool/pool.py,sha256=vM5ItMxELtT7_bvbmdhwWj81rQ0zyaj3uPMny4KDw_E,9757
 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=n89n9OLBXx6t20L61wJgfrP6V4jW3sHgyaQNBLdUwUQ,3578
 p115client/type.py,sha256=e4g9URQBE23XN2dGomldj8wC6NlDWBBSVC5Bmd8giBc,5993
-p115client-0.0.5.8.6.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client-0.0.5.8.6.dist-info/METADATA,sha256=iYXxUpy5PpP618SQZ4utGQSwXWPw2wZ3WVGqJM_wZBc,8233
-p115client-0.0.5.8.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p115client-0.0.5.8.6.dist-info/RECORD,,
+p115client-0.0.5.9.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.9.dist-info/METADATA,sha256=LV4l0DZSTHATMpfLGnhETKs6RYrYXEfnSHB02Nqodj8,8231
+p115client-0.0.5.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.9.dist-info/RECORD,,