p115client 0.0.5.11.6__tar.gz → 0.0.5.11.7.1__tar.gz

{p115client-0.0.5.11.6 → p115client-0.0.5.11.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.11.6
+Version: 0.0.5.11.7.1
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT
@@ -108,7 +108,7 @@ client = P115Client(Path("~/115-cookies.txt").expanduser(), check_for_relogin=Tr
 
 如果你有一个申请通过的开放接口的应用，则可以创建开放接口的客户端实例
 
-你可以直接从一个 `P115Client` 实例拿到授权（自动扫码登录并授权），如果不提供 `app_id`，则使用默认值
+你可以直接从一个 `P115Client` 实例拿到授权（自动扫码登录并授权）
 
 ```python
 app_id = <开放接口应用的 AppID>

{p115client-0.0.5.11.6 → p115client-0.0.5.11.7.1}/p115client/client.py

@@ -766,7 +766,7 @@ def normalize_attr_app[D: dict[str, Any]](
     simple: bool = False, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: None | type[D] = None, 
+    dict_cls: type[D], 
 ) -> D:
     ...
 def normalize_attr_app[D: dict[str, Any]](
@@ -896,7 +896,7 @@ def normalize_attr_app2[D: dict[str, Any]](
     simple: bool = False, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: None | type[D] = None, 
+    dict_cls: type[D], 
 ) -> D:
     ...
 def normalize_attr_app2[D: dict[str, Any]](
@@ -1082,7 +1082,7 @@ def normalize_attr_simple(
     /, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: None = None, 
+    dict_cls: None, 
 ) -> dict[str, Any]:
     ...
 @overload
@@ -1091,7 +1091,7 @@ def normalize_attr_simple[D: dict[str, Any]](
     /, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: type[D], 
+    dict_cls: type[D] = AttrDict, # type: ignore
 ) -> D:
     ...
 def normalize_attr_simple[D: dict[str, Any]](
@@ -1099,7 +1099,7 @@ def normalize_attr_simple[D: dict[str, Any]](
     /, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: None | type[D] = None, 
+    dict_cls: None | type[D] = AttrDict, # type: ignore
 ) -> dict[str, Any] | D:
     return normalize_attr(
         info, 
@@ -1138,7 +1138,7 @@ class IgnoreCaseDict[V](dict[str, V]):
         return cls(zip(map(str.lower, iterable), repeat(value)))
 
     @overload
-    def get(self, key: str) -> None | V:
+    def get(self, key: str, default: None = None) -> None | V:
         ...
     @overload
     def get[T](self, key: str, default: T) -> V | T:
@@ -2329,7 +2329,7 @@ class ClientRequestMixin:
     def login_with_app_id(
         cls, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         console_qrcode: bool = True, 
         base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
@@ -2342,7 +2342,7 @@ class ClientRequestMixin:
     def login_with_app_id(
         cls, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         console_qrcode: bool = True, 
         base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
@@ -2354,7 +2354,7 @@ class ClientRequestMixin:
     def login_with_app_id(
         cls, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         console_qrcode: bool = True, 
         base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
@@ -4994,7 +4994,7 @@ class P115OpenClient(ClientRequestMixin):
                         else:
                             filesize, filesha1_obj = file_digest(file, "sha1")
                     finally:
-                        yield seek(curpos)
+                        yield cast(Callable, seek)(curpos)
                     filesha1 = filesha1_obj.hexdigest()
                 if filesize < 0:
                     try:
@@ -5006,9 +5006,9 @@ class P115OpenClient(ClientRequestMixin):
                         except TypeError:
                             if seekable:
                                 try:
-                                    filesize = (yield seek(0, 2)) - curpos
+                                    filesize = (yield cast(Callable, seek)(0, 2)) - curpos
                                 finally:
-                                    yield seek(curpos)
+                                    yield cast(Callable, seek)(curpos)
                 if filesize == 0:
                     filesha1 = "DA39A3EE5E6B4B0D3255BFEF95601890AFD80709"
                 elif multipart_resume_data is None and filesize >= 1 << 20:
@@ -5018,13 +5018,13 @@ class P115OpenClient(ClientRequestMixin):
                             async_read = ensure_async(file.read, threaded=True)
                             async def read_range_bytes_or_hash(sign_check: str, /):
                                 start, end = map(int, sign_check.split("-"))
-                                await seek(curpos + start)
+                                await cast(Callable, seek)(curpos + start)
                                 return await async_read(end - start + 1)
                         else:
                             read = cast(Callable[[int], Buffer], file.read)
                             def read_range_bytes_or_hash(sign_check: str, /):
                                 start, end = map(int, sign_check.split("-"))
-                                seek(curpos + start)
+                                cast(Callable, seek)(curpos + start)
                                 return read(end - start + 1)
             elif isinstance(file, (URL, SupportsGeturl)):
                 if isinstance(file, URL):
@@ -5194,6 +5194,60 @@ class P115OpenClient(ClientRequestMixin):
         api = complete_proapi("/open/user/info", base_url)
         return self.request(url=api, async_=async_, **request_kwargs)
 
+    @overload
+    def vip_qr_url(
+        self, 
+        payload: int | dict, 
+        /, 
+        base_url: bool | str | Callable[[], str] = False, 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def vip_qr_url(
+        self, 
+        payload: int | dict, 
+        /, 
+        base_url: bool | str | Callable[[], str] = False, 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def vip_qr_url(
+        self, 
+        payload: int | dict, 
+        /, 
+        base_url: bool | str | Callable[[], str] = False, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """获取产品列表地址（即引导用户扫码购买 115 的 VIP 服务，以获取提成）
+
+        GET https://proapi.115.com/open/open/vip/qr_url
+
+        .. admonition:: Reference
+
+            https://www.yuque.com/115yun/open/cguk6qshgapwg4qn#oByvI
+
+        :payload:
+            - open_device: int
+            - default_product_id: int = <default> 💡 打开产品列表默认选中的产品对应的产品id，如果没有则使用默认的产品顺序。
+
+                - 月费: 5
+                - 年费: 1
+                - 尝鲜1天: 101
+                - 长期VIP(长期): 24072401
+                - 超级VIP: 24072402
+        """
+        api = complete_proapi("/open/vip/qr_url", base_url)
+        if not isinstance(payload, dict):
+            payload = {"open_device": payload}
+        return self.request(url=api, params=payload, async_=async_, **request_kwargs)
+
     download_url_open = download_url
     download_url_info_open = download_url_info
     fs_copy_open = fs_copy
@@ -5226,6 +5280,7 @@ class P115OpenClient(ClientRequestMixin):
     user_info_open = user_info
     upload_file_init_open = upload_file_init
     upload_file_open = upload_file
+    vip_qr_url_open = vip_qr_url
 
 
 class P115Client(P115OpenClient):
@@ -5902,7 +5957,7 @@ class P115Client(P115OpenClient):
     def login_with_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         show_warning: bool = False, 
         async_: Literal[False] = False, 
@@ -5913,7 +5968,7 @@ class P115Client(P115OpenClient):
     def login_with_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         show_warning: bool = False, 
         async_: Literal[True], 
@@ -5923,7 +5978,7 @@ class P115Client(P115OpenClient):
     def login_with_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         show_warning: bool = False, 
         async_: Literal[False, True] = False, 
@@ -6098,7 +6153,7 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         replace: Literal[True] | Self, 
         show_warning: bool = False, 
@@ -6110,7 +6165,7 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         replace: Literal[True] | Self, 
         show_warning: bool = False, 
@@ -6122,7 +6177,7 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         replace: Literal[False] = False, 
         show_warning: bool = False, 
@@ -6134,7 +6189,7 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         replace: Literal[False] = False, 
         show_warning: bool = False, 
@@ -6145,7 +6200,7 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         replace: bool | Self = False, 
         show_warning: bool = False, 
@@ -6540,7 +6595,7 @@ class P115Client(P115OpenClient):
                                 continue
                             if i or is_auth_error:
                                 raise
-                            app_id = getattr(self, "app_id", 100195993)
+                            app_id = getattr(self, "app_id")
                             yield self.login_another_open(
                                 app_id, 
                                 replace=True, 
@@ -21125,7 +21180,7 @@ class P115Client(P115OpenClient):
                         else:
                             filesize, filesha1_obj = file_digest(file, "sha1")
                     finally:
-                        yield seek(curpos)
+                        yield cast(Callable, seek)(curpos)
                     filesha1 = filesha1_obj.hexdigest()
                 if filesize < 0:
                     try:
@@ -21137,9 +21192,9 @@ class P115Client(P115OpenClient):
                         except TypeError:
                             if seekable:
                                 try:
-                                    filesize = (yield seek(0, 2)) - curpos
+                                    filesize = (yield cast(Callable, seek)(0, 2)) - curpos
                                 finally:
-                                    yield seek(curpos)
+                                    yield cast(Callable, seek)(curpos)
                 if filesize == 0:
                     filesha1 = "DA39A3EE5E6B4B0D3255BFEF95601890AFD80709"
                 elif not upload_directly and multipart_resume_data is None and filesize >= 1 << 20:
@@ -21149,13 +21204,13 @@ class P115Client(P115OpenClient):
                             async_read = ensure_async(file.read, threaded=True)
                             async def read_range_bytes_or_hash(sign_check: str, /):
                                 start, end = map(int, sign_check.split("-"))
-                                await seek(curpos + start)
+                                await cast(Callable, seek)(curpos + start)
                                 return await async_read(end - start + 1)
                         else:
                             read = cast(Callable[[int], Buffer], file.read)
                             def read_range_bytes_or_hash(sign_check: str, /):
                                 start, end = map(int, sign_check.split("-"))
-                                seek(curpos + start)
+                                cast(Callable, seek)(curpos + start)
                                 return read(end - start + 1)
             elif isinstance(file, (URL, SupportsGeturl)):
                 if isinstance(file, URL):

{p115client-0.0.5.11.6 → p115client-0.0.5.11.7.1}/p115client/const.py

@@ -5,18 +5,14 @@ from __future__ import annotations
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
 __all__ = [
-    "AVAILABLE_APP_IDS", "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_API_MAP", 
+    "CLASS_TO_TYPE", "SUFFIX_TO_TYPE", "errno", 
 ]
 
 from enum import IntEnum
 from typing import Final
 
 
-#: 可用的 AppID 列表
-AVAILABLE_APP_IDS = range(100195123, 100196845, 2)
-
-
 #: 目前可用的登录设备
 AVAILABLE_APPS: Final[tuple[str, ...]] = (
     "web", "ios", "115ios", "android", "115android", "115ipad", "tv", "qandroid", 

{p115client-0.0.5.11.6 → p115client-0.0.5.11.7.1}/p115client/tool/attr.py

@@ -55,8 +55,8 @@ def get_attr(
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def gen_step():
+        from dictattr import AttrDict
         if skim:
-            from dictattr import AttrDict
             resp = yield client.fs_file_skim(id, async_=async_, **request_kwargs)
             check_response(resp)
             info = resp["data"][0]
@@ -71,7 +71,7 @@ def get_attr(
         else:
             resp = yield client.fs_file(id, async_=async_, **request_kwargs)
             check_response(resp)
-            return normalize_attr_web(resp["data"][0])
+            return normalize_attr_web(resp["data"][0], dict_cls=AttrDict)
     return run_gen_step(gen_step, may_call=False, async_=async_)
 
 

{p115client-0.0.5.11.6 → p115client-0.0.5.11.7.1}/p115client/tool/download.py

@@ -10,7 +10,7 @@ __all__ = [
 __doc__ = "这个模块提供了一些和下载有关的函数"
 
 from asyncio import create_task, to_thread, Queue as AsyncQueue, TaskGroup
-from collections.abc import AsyncIterator, Callable, Coroutine, Iterable, Iterator
+from collections.abc import AsyncIterator, Callable, Coroutine, Iterable, Iterator, MutableMapping
 from concurrent.futures import ThreadPoolExecutor
 from errno import ENOTDIR
 from functools import partial
@@ -243,7 +243,7 @@ def iter_files_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
     user_agent: str = "", 
@@ -264,7 +264,7 @@ def iter_files_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
     user_agent: str = "", 
@@ -284,7 +284,7 @@ def iter_files_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
     user_agent: str = "", 
@@ -417,7 +417,7 @@ def iter_images_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
     *, 
@@ -436,7 +436,7 @@ def iter_images_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
     *, 
@@ -454,7 +454,7 @@ def iter_images_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
     *, 
@@ -575,7 +575,7 @@ def iter_subtitles_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
     *, 
@@ -594,7 +594,7 @@ def iter_subtitles_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
     *, 
@@ -612,7 +612,7 @@ def iter_subtitles_with_url(
     use_star: None | bool = False, 
     escape: None | bool | Callable[[str], str] = True, 
     normalize_attr: Callable[[dict], dict] = normalize_attr, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     app: str = "web", 
     raise_for_changed_count: bool = False, 
     *, 
@@ -855,7 +855,7 @@ def make_strm(
     suffix: str = "", 
     type: Literal[1, 2, 3, 4, 5, 6, 7, 99] = 4, 
     max_workers: None | int = None, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     path_already: bool = False, 
     app: str = "android", 
     fs_files_cooldown: int | float = 0.5, 
@@ -881,7 +881,7 @@ def make_strm(
     suffix: str = "", 
     type: Literal[1, 2, 3, 4, 5, 6, 7, 99] = 4, 
     max_workers: None | int = None, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     path_already: bool = False, 
     app: str = "android", 
     fs_files_cooldown: int | float = 0.5, 
@@ -906,7 +906,7 @@ def make_strm(
     suffix: str = "", 
     type: Literal[1, 2, 3, 4, 5, 6, 7, 99] = 4, 
     max_workers: None | int = None, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     path_already: bool = False, 
     app: str = "android", 
     fs_files_cooldown: int | float = 0.5, 
@@ -1295,7 +1295,7 @@ def iter_download_nodes(
 def iter_download_files(
     client: str | P115Client, 
     cid: int = 0, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     escape: None | bool | Callable[[str], str] = True, 
     with_ancestors: bool = True, 
     max_workers: None | int = None, 
@@ -1309,7 +1309,7 @@ def iter_download_files(
 def iter_download_files(
     client: str | P115Client, 
     cid: int = 0, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     escape: None | bool | Callable[[str], str] = True, 
     with_ancestors: bool = True, 
     max_workers: None | int = None, 
@@ -1322,7 +1322,7 @@ def iter_download_files(
 def iter_download_files(
     client: str | P115Client, 
     cid: int = 0, 
-    id_to_dirnode: None | EllipsisType | dict[int, tuple[str, int] | DirNode] = None, 
+    id_to_dirnode: None | EllipsisType | MutableMapping[int, tuple[str, int] | DirNode] = None, 
     escape: None | bool | Callable[[str], str] = True, 
     with_ancestors: bool = True, 
     max_workers: None | int = None,