p115client 0.0.5.9.3__py3-none-any.whl → 0.0.5.10.1__py3-none-any.whl

p115client/tool/xys.py

@@ -2,45 +2,156 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__all__ = ["wish_make", "wish_answer", "wish_list", "wish_aid_list", "wish_adopt"]
+__all__ = [
+    "wish_info", "wish_make", "wish_answer", "wish_adopt", 
+    "wish_del", "wish_iter", "wish_aid_iter", 
+]
 
-from collections.abc import Iterable
+from collections.abc import AsyncIterator, Coroutine, Iterable, Iterator
+from typing import overload, Any, Literal
 
+from iterutils import run_gen_step, run_gen_step_iter, YieldFrom
 from p115client import check_response, P115Client
+from p115client.type import P115StrID
 
 
+@overload
+def wish_info(
+    client: str | P115Client, 
+    wish_id: str, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> dict:
+    ...
+@overload
+def wish_info(
+    client: str | P115Client, 
+    wish_id: str, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> Coroutine[Any, Any, dict]:
+    ...
+def wish_info(
+    client: str | P115Client, 
+    wish_id: str, 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> dict | Coroutine[Any, Any, dict]:
+    """许愿树活动：许愿信息
+
+    :param client: 115 客户端或 cookies
+    :param wish_id: 许愿 id
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 许愿信息
+    """
+    if isinstance(client, str):
+        client = P115Client(client)
+    def gen_step():
+        resp = yield client.act_xys_get_desire_info(
+            wish_id, 
+            async_=async_, 
+            **request_kwargs, 
+        )
+        check_response(resp)
+        return resp["data"]
+    return run_gen_step(gen_step, async_=async_)
+
+
+@overload
+def wish_make(
+    client: str | P115Client, 
+    content: str = "随便许个愿", 
+    size: int = 5, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> P115StrID:
+    ...
+@overload
+def wish_make(
+    client: str | P115Client, 
+    content: str = "随便许个愿", 
+    size: int = 5, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> Coroutine[Any, Any, P115StrID]:
+    ...
 def wish_make(
     client: str | P115Client, 
     content: str = "随便许个愿", 
     size: int = 5, 
-) -> str:
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> P115StrID | Coroutine[Any, Any, P115StrID]:
     """许愿树活动：创建许愿（许愿创建后需要等审核）
 
     :param client: 115 客户端或 cookies
     :param content: 许愿内容
     :param size: 答谢空间大小，单位是 GB
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
 
     :return: 许愿 id
     """
     if isinstance(client, str):
         client = P115Client(client)
-    return check_response(client.act_xys_wish(
-        {"rewardSpace": size, "content": content}
-    ))["data"]["xys_id"]
+    def gen_step():
+        resp = yield client.act_xys_wish(
+            {"rewardSpace": size, "content": content}, 
+            async_=async_, 
+            **request_kwargs, 
+        )
+        check_response(resp)
+        return P115StrID(resp["data"]["xys_id"], resp["data"])
+    return run_gen_step(gen_step, async_=async_)
 
 
+@overload
 def wish_answer(
     client: str | P115Client, 
     wish_id: str, 
     content: str = "帮你助个愿", 
     file_ids: int | str | Iterable[int | str] = "", 
-) -> str:
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> P115StrID:
+    ...
+@overload
+def wish_answer(
+    client: str | P115Client, 
+    wish_id: str, 
+    content: str = "帮你助个愿", 
+    file_ids: int | str | Iterable[int | str] = "", 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> Coroutine[Any, Any, P115StrID]:
+    ...
+def wish_answer(
+    client: str | P115Client, 
+    wish_id: str, 
+    content: str = "帮你助个愿", 
+    file_ids: int | str | Iterable[int | str] = "", 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> P115StrID | Coroutine[Any, Any, P115StrID]:
     """许愿树活动：创建助愿（助愿创建后需要等审核）
 
     :param client: 115 客户端或 cookies
     :param wish_id: 许愿 id
     :param content: 助愿内容
     :param file_ids: 文件在你的网盘的 id，多个用逗号 "," 隔开
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
 
     :return: 助愿 id
     """
@@ -48,78 +159,234 @@ def wish_answer(
         client = P115Client(client)
     if not isinstance(file_ids, (int, str)):
         file_ids = ",".join(map(str, file_ids))
-    check_response(client.act_xys_get_desire_info(wish_id))
-    return check_response(
-        client.act_xys_aid_desire({"id": wish_id, "content": content, "file_ids": file_ids}
-    ))["data"]["aid_id"]
+    def gen_step():
+        resp = yield client.act_xys_aid_desire(
+            {"id": wish_id, "content": content, "file_ids": file_ids}, 
+            async_=async_, 
+            **request_kwargs, 
+        )
+        check_response(resp)
+        return P115StrID(resp["data"]["aid_id"], resp["data"])
+    return run_gen_step(gen_step, async_=async_)
 
 
-def wish_list(
+@overload
+def wish_adopt(
     client: str | P115Client, 
-    type: int = 0, 
-) -> list[dict]:
-    """许愿树活动：我的许愿列表
+    wish_id: str, 
+    aid_id: int | str, 
+    to_cid: int = 0, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> dict:
+    ...
+@overload
+def wish_adopt(
+    client: str | P115Client, 
+    wish_id: str, 
+    aid_id: int | str, 
+    to_cid: int = 0, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> Coroutine[Any, Any, dict]:
+    ...
+def wish_adopt(
+    client: str | P115Client, 
+    wish_id: str, 
+    aid_id: int | str, 
+    to_cid: int = 0, 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> dict | Coroutine[Any, Any, dict]:
+    """许愿树活动：采纳助愿
 
     :param client: 115 客户端或 cookies
-    :param type: 类型
-        - 0: 全部
-        - 1: 进行中
-        - 2: 已实现
+    :param wish_id: 许愿 id
+    :param aid_id: 助愿 id
+    :param to_cid: 助愿的分享文件保存到你的网盘中目录的 id
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
 
-    :return: 许愿列表
+    :return: 接口的返回信息
     """
     if isinstance(client, str):
         client = P115Client(client)
-    payload: dict = {"type": type, "limit": 1000, "page": 1}
-    ls = adds = check_response(client.act_xys_my_desire(payload))["data"]["list"]
-    while len(adds) == 1000:
-        payload["page"] += 1
-        adds = check_response(client.act_xys_my_desire(payload))["data"]["list"]
-        ls.extend(adds)
-    return ls
+    return check_response(client.act_xys_adopt(
+        {"did": wish_id, "aid": aid_id, "to_cid": to_cid}, 
+        async_=async_, 
+        **request_kwargs, 
+    ))
 
 
-def wish_aid_list(
+@overload
+def wish_del(
     client: str | P115Client, 
-    wish_id: str, 
-) -> list[dict]:
-    """许愿树活动：许愿的助愿列表
+    wish_id: str | Iterable[str], 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> dict:
+    ...
+@overload
+def wish_del(
+    client: str | P115Client, 
+    wish_id: str | Iterable[str], 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> Coroutine[Any, Any, dict]:
+    ...
+def wish_del(
+    client: str | P115Client, 
+    wish_id: str | Iterable[str], 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> dict | Coroutine[Any, Any, dict]:
+    """许愿树活动：删除许愿
 
     :param client: 115 客户端或 cookies
     :param wish_id: 许愿 id
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
 
-    :return: 助愿列表
+    :return: 接口的返回信息
     """
     if isinstance(client, str):
         client = P115Client(client)
-    payload: dict = {"id": wish_id, "limit": 1000, "page": 1}
-    ls = adds = check_response(client.act_xys_desire_aid_list(payload))["data"]["list"]
-    while len(adds) == 1000:
-        payload["page"] += 1
-        adds = check_response(client.act_xys_desire_aid_list(payload))["data"]["list"]
-        ls.extend(adds)
-    return ls
+    if not isinstance(wish_id, str):
+        wish_id = ",".join(wish_id)
+    return check_response(client.act_xys_wish_del(
+        wish_id, 
+        async_=async_, 
+        **request_kwargs, 
+    ))
 
 
-def wish_adopt(
+@overload
+def wish_iter(
+    client: str | P115Client, 
+    type: int = 0, 
+    page_size: int = 1_000, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> Iterator[dict]:
+    ...
+@overload
+def wish_iter(
+    client: str | P115Client, 
+    type: int = 0, 
+    page_size: int = 1_000, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> AsyncIterator[dict]:
+    ...
+def wish_iter(
+    client: str | P115Client, 
+    type: int = 0, 
+    page_size: int = 1_000, 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> Iterator[dict] | AsyncIterator[dict]:
+    """许愿树活动：罗列我的许愿列表
+
+    :param client: 115 客户端或 cookies
+    :param type: 类型
+
+        - 0: 全部
+        - 1: 进行中
+        - 2: 已实现
+
+    :param page_size: 分页大小
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 迭代器，逐个返回许愿许愿信息
+    """
+    if isinstance(client, str):
+        client = P115Client(client)
+    if page_size <= 0:
+        page_size = 1_000
+    def gen_step():
+        payload: dict = {"type": type, "limit": page_size, "page": 1}
+        while True:
+            resp = yield client.act_xys_my_desire(
+                payload, 
+                async_=async_, 
+                **request_kwargs, 
+            )
+            check_response(resp)
+            ls = resp["data"]["list"]
+            yield YieldFrom(ls, identity=True)
+            if not ls:
+                break
+            payload["page"] += 1
+    return run_gen_step_iter(gen_step, async_=async_)
+
+
+@overload
+def wish_aid_iter(
     client: str | P115Client, 
     wish_id: str, 
-    aid_id: int | str, 
-    to_cid: int = 0, 
-) -> dict:
-    """许愿树活动：采纳助愿
+    page_size: int = 1_000, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> Iterator[dict]:
+    ...
+@overload
+def wish_aid_iter(
+    client: str | P115Client, 
+    wish_id: str, 
+    page_size: int = 1_000, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> AsyncIterator[dict]:
+    ...
+def wish_aid_iter(
+    client: str | P115Client, 
+    wish_id: str, 
+    page_size: int = 1_000, 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> Iterator[dict] | AsyncIterator[dict]:
+    """许愿树活动：许愿的助愿列表
 
     :param client: 115 客户端或 cookies
     :param wish_id: 许愿 id
-    :param aid_id: 助愿 id
-    :param to_cid: 助愿的分享文件保存到你的网盘中目录的 id
+    :param page_size: 分页大小
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
 
-    :return: 返回信息
+    :return: 迭代器，逐个返回助愿信息
     """
     if isinstance(client, str):
         client = P115Client(client)
-    return check_response(client.act_xys_adopt({"did": wish_id, "aid": aid_id, "to_cid": to_cid}))
+    if page_size <= 0:
+        page_size = 1_000
+    def gen_step():
+        payload: dict = {"id": wish_id, "limit": page_size, "page": 1}
+        while True:
+            resp = yield client.act_xys_desire_aid_list(
+                payload, 
+                async_=async_, 
+                **request_kwargs, 
+            )
+            check_response(resp)
+            ls = resp["data"]["list"]
+            yield YieldFrom(ls, identity=True)
+            if not ls:
+                break
+            payload["page"] += 1
+    return run_gen_step_iter(gen_step, async_=async_)
 
-# TODO: 再实现一个漂流瓶
-# TODO: 支持异步
 
+# TODO: 再实现一个漂流瓶

p115client/type.py

@@ -2,7 +2,10 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__all__ = ["MultipartResumeData", "P115Cookies", "P115DictAttrLikeMixin", "P115DictAttrLike", "P115URL"]
+__all__ = [
+    "MultipartResumeData", "P115Cookies", "P115DictAttrLikeMixin", "P115DictAttrLike", 
+    "P115ID", "P115StrID", "P115URL", 
+]
 
 from collections.abc import Callable
 from functools import cached_property
@@ -199,6 +202,18 @@ class P115DictAttrLike(P115DictAttrLikeMixin):
         return type(name, (base, cls), ns)
 
 
+class P115ID(P115DictAttrLike, int):
+    """整数 id 的封装
+    """
+    def __str__(self, /) -> str:
+        return int.__repr__(self)
+
+
+class P115StrID(P115DictAttrLike, str):
+    """字符串 id 的封装
+    """
+
+
 class P115URL(P115DictAttrLike, str):
     """下载链接的封装
     """

{p115client-0.0.5.9.3.dist-info → p115client-0.0.5.10.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.9.3
+Version: 0.0.5.10.1
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT
@@ -40,7 +40,7 @@ Requires-Dist: python-filewrap (>=0.2.8)
 Requires-Dist: python-hashtools (>=0.0.3.3)
 Requires-Dist: python-http_request (>=0.0.6)
 Requires-Dist: python-httpfile (>=0.0.5.2)
-Requires-Dist: python-iterutils (>=0.1.10)
+Requires-Dist: python-iterutils (>=0.1.11)
 Requires-Dist: python-property (>=0.0.3)
 Requires-Dist: python-startfile (>=0.0.2)
 Requires-Dist: python-undefined (>=0.0.3)
@@ -108,7 +108,7 @@ client = P115Client(Path("~/115-cookies.txt").expanduser(), check_for_relogin=Tr
 
 如果你有一个申请通过的开放接口的应用，则可以创建开放接口的客户端实例
 
-你可以直接从一个 `P115Client` 实例拿到授权（自动扫码登录并授权）
+你可以直接从一个 `P115Client` 实例拿到授权（自动扫码登录并授权），如果不提供 `app_id`，则使用默认值
 
 ```python
 app_id = <开放接口应用的 AppID>
@@ -143,7 +143,7 @@ from p115client import P115Client, P115OpenClient
 from pathlib import Path
 
 client = P115Client(Path("~/115-cookies.txt").expanduser(), check_for_relogin=True)
-client_open = client.login_another_open(app_id)
+client_open = client.login_another_open()
 ```
 
 ### 2. 接口调用

p115client-0.0.5.10.1.dist-info/RECORD

@@ -0,0 +1,26 @@
+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=kw18Y5REHdl8XR4idZXL7NjFr39nKVjzMr_jpC61qTs,727452
+p115client/const.py,sha256=AMyL3QZ172f_RaEkfh27DQxwbkXvPhqfeBWHWTrvSLY,7754
+p115client/exception.py,sha256=kQMI7lwkFIC_tRuj1HT8zqi5HGzz6fTxgK7B1aKrNTI,3447
+p115client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+p115client/tool/__init__.py,sha256=NjT9rroMhLwKI7UlpSCksSsnB3GexXzxvhfunNWzjY0,386
+p115client/tool/attr.py,sha256=u_5JM2LlWFT4IHF2zlz-DY4llgmw4mwouEKMae8BZdQ,2841
+p115client/tool/download.py,sha256=3zoxkLPf4Jya-wYowZJmZR65sR3GWNWNmnevKrrgvQY,60509
+p115client/tool/edit.py,sha256=eRlR1UZMpfGnoetpqSAAx5bPBOEiSlx7HPkpOSs5agk,17739
+p115client/tool/export_dir.py,sha256=iMnKtnESi8HKvW9WhIvOdEoMXSBpAnhFlGeyKXHpQbE,24545
+p115client/tool/fs_files.py,sha256=jY57L4nhB9t-2kT_1j3mdiwOdPZKsimN3eN5mUJAqMI,15745
+p115client/tool/history.py,sha256=2S26BH7uBNfVHlbYFNy-aNOLMcM-HrlR7TLHAZacUJI,7458
+p115client/tool/iterdir.py,sha256=6-ke9yNY3mqHmzEapXk3lYwl3XRkWLH2D_nqJ1nq8Tk,186120
+p115client/tool/life.py,sha256=X6Bp0GYKwnZeWlttE2DIVw5iOCXM5QzIkM6Zuj24c5Y,17323
+p115client/tool/pool.py,sha256=zftRR74IR_5zHigJtaImxGYt81rqCAn_V5Nm7HBMj68,13943
+p115client/tool/request.py,sha256=rjXuQwRganE5Z-4rfgnyPFjE4jzdQSLdIs9s0cIDshU,7043
+p115client/tool/upload.py,sha256=qK1OQYxP-Faq2eMDhc5sBXJiSr8m8EZ_gb0O_iA2TrI,15915
+p115client/tool/util.py,sha256=QrB4CIvIBEhl_MGSPSAenkY76WjEUHdcUjpccdc8x_A,3347
+p115client/tool/xys.py,sha256=WMTisCyN4eYyv4A14yYOpjud2mBhQvBcUHOp6pJUQeA,10140
+p115client/type.py,sha256=7kOp98uLaYqcTTCgCrb3DRcl8ukMpn7ibsnVvtw2nG8,6250
+p115client-0.0.5.10.1.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.10.1.dist-info/METADATA,sha256=I2AM4pRRwvKwP2s3nM2rozmBbJUAOpyJqsECe9mzmVk,8276
+p115client-0.0.5.10.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.10.1.dist-info/RECORD,,

p115client-0.0.5.9.3.dist-info/RECORD

@@ -1,24 +0,0 @@
-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=SMKSwnUdsiW1ARZQkvJm-echoCiRhf365UmmOaa4cog,721347
-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=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=9ncoB2dNibhgOjPb9mHr873fCZmb65ZeteVLH4Tsujc,17330
-p115client/tool/pool.py,sha256=eT_feALidGdvSFppivxC1f_ipR42fWav-X1sutdpkco,14608
-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.9.3.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client-0.0.5.9.3.dist-info/METADATA,sha256=RbAiZhKxVWP0ZGX2gkMQgjYvuJsqzFy-Po66W_Wwd6Q,8233
-p115client-0.0.5.9.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p115client-0.0.5.9.3.dist-info/RECORD,,