p115client 0.0.5.9.2__py3-none-any.whl → 0.0.5.10__py3-none-any.whl

p115client/tool/iterdir.py

@@ -3,14 +3,13 @@
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
 __all__ = [
-    "ID_TO_DIRNODE_CACHE", "P115ID", "unescape_115_charref", "posix_escape_name", 
-    "type_of_attr", "get_path_to_cid", "get_file_count", "get_ancestors", 
+    "ID_TO_DIRNODE_CACHE", "DirNode", "get_path_to_cid", "get_file_count", "get_ancestors", 
     "get_ancestors_to_cid", "get_id_to_path", "get_id_to_sha1", "get_id_to_pickcode", 
     "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_dirs", "iter_dupfiles", 
-    "iter_image_files", "share_extract_payload", "share_iterdir", "share_iter_files", 
-    "iter_selected_nodes", "iter_selected_nodes_by_pickcode", "iter_selected_nodes_using_category_get", 
+    "iter_image_files", "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", 
@@ -26,22 +25,21 @@ from collections.abc import (
 from dataclasses import dataclass
 from errno import EIO, ENOENT, ENOTDIR
 from functools import partial
-from itertools import chain, count, cycle, islice, takewhile
+from itertools import chain, cycle, islice
 from math import inf
 from operator import itemgetter
-from re import compile as re_compile
 from string import digits, hexdigits
 from threading import Lock
 from time import sleep, time
 from types import EllipsisType
-from typing import cast, overload, Any, Final, Literal, NamedTuple, TypedDict
+from typing import cast, overload, Any, Final, Literal, NamedTuple
 from warnings import warn
 from weakref import WeakValueDictionary
 
 from asynctools import async_chain, async_filter, async_map, to_list
 from concurrenttools import run_as_thread, taskgroup_map, threadpool_map
 from iterutils import (
-    as_gen_step, bfs_gen, chunked, async_foreach, ensure_aiter, foreach, 
+    as_gen_step, bfs_gen, chunked, ensure_aiter, foreach, 
     flatten, iter_unique, run_gen_step, run_gen_step_iter, through, 
     async_through, with_iter_next, Yield, YieldFrom, 
 )
@@ -51,18 +49,16 @@ from p115client import (
     check_response, normalize_attr, normalize_attr_simple, 
     P115Client, P115OSError, P115Warning, 
 )
-from p115client.const import CLASS_TO_TYPE, SUFFIX_TO_TYPE
-from p115client.type import P115DictAttrLike
+from p115client.type import P115ID
 from posixpatht import joins, path_is_dir_form, splitext, splits
 
+from .attr import type_of_attr
 from .edit import update_desc, update_star
 from .fs_files import is_timeouterror, iter_fs_files, iter_fs_files_threaded, iter_fs_files_asynchronized
 from .life import iter_life_behavior_once, life_show
+from .util import posix_escape_name, share_extract_payload, unescape_115_charref
 
 
-CRE_SHARE_LINK_search1 = re_compile(r"(?:/s/|share\.115\.com/)(?P<share_code>[a-z0-9]+)\?password=(?:(?P<receive_code>[a-z0-9]{4}))?").search
-CRE_SHARE_LINK_search2 = re_compile(r"(?P<share_code>[a-z0-9]+)(?:-(?P<receive_code>[a-z0-9]{4}))?").search
-CRE_115_CHARREF_sub = re_compile("\\[\x02([0-9]+)\\]").sub
 WEBAPI_BASE_URLS = (
     "http://webapi.115.com", 
     "https://webapi.115.com", 
@@ -111,11 +107,6 @@ class OverviewAttr:
 ID_TO_DIRNODE_CACHE: Final[defaultdict[int, dict[int, tuple[str, int] | DirNode]]] = defaultdict(dict)
 
 
-class SharePayload(TypedDict):
-    share_code: str
-    receive_code: None | str
-
-
 def _overview_attr(info: Mapping, /) -> OverviewAttr:
     if "n" in info:
         is_dir = "fid" not in info
@@ -154,58 +145,6 @@ def _overview_attr(info: Mapping, /) -> OverviewAttr:
     return OverviewAttr(is_dir, id, pid, name, ctime, mtime)
 
 
-def posix_escape_name(name: str, /, repl: str = "|") -> str:
-    """把文件名中的 "/" 转换为另一个字符（默认为 "|"）
-
-    :param name: 文件名
-    :param repl: 替换为的目标字符
-
-    :return: 替换后的名字
-    """
-    return name.replace("/", repl)
-
-
-def unescape_115_charref(s: str, /) -> str:
-    """对 115 的字符引用进行解码
-
-    :example:
-
-        .. code:: python
-
-            unescape_115_charref("[\x02128074]0号：优质资源") == "👊0号：优质资源"
-    """
-    return CRE_115_CHARREF_sub(lambda a: chr(int(a[1])), s)
-
-
-def type_of_attr(attr: Mapping, /) -> int:
-    """推断文件信息所属类型（试验版，未必准确）
-
-    :param attr: 文件信息
-
-    :return: 返回类型代码
-
-        - 0: 目录
-        - 1: 文档
-        - 2: 图片
-        - 3: 音频
-        - 4: 视频
-        - 5: 压缩包
-        - 6: 应用
-        - 7: 书籍
-        - 99: 其它文件
-"""
-    if attr.get("is_dir") or attr.get("is_directory"):
-        return 0
-    type: None | int
-    if type := CLASS_TO_TYPE.get(attr.get("class", "")):
-        return type
-    if type := SUFFIX_TO_TYPE.get(splitext(attr["name"])[1].lower()):
-        return type
-    if attr.get("is_video") or "defination" in attr:
-        return 4
-    return 99
-
-
 @overload
 def get_path_to_cid(
     client: str | P115Client, 
@@ -657,10 +596,6 @@ def get_ancestors_to_cid(
     return run_gen_step(gen_step, async_=async_)
 
 
-class P115ID(P115DictAttrLike, int):
-
-    def __str__(self, /) -> str:
-        return int.__repr__(self)
 
 
 # TODO: 使用 search 接口以在特定目录之下搜索某个名字，以便减少风控
@@ -908,6 +843,7 @@ def get_id_to_path(
 def get_id_to_pickcode(
     client: str | P115Client, 
     pickcode: str, 
+    app: str = "web", 
     *, 
     async_: Literal[False] = False, 
     **request_kwargs, 
@@ -917,6 +853,7 @@ def get_id_to_pickcode(
 def get_id_to_pickcode(
     client: str | P115Client, 
     pickcode: str, 
+    app: str = "web", 
     *, 
     async_: Literal[True], 
     **request_kwargs, 
@@ -925,21 +862,34 @@ def get_id_to_pickcode(
 def get_id_to_pickcode(
     client: str | P115Client, 
     pickcode: str, 
+    app: str = "web", 
     *, 
     async_: Literal[False, True] = False, 
     **request_kwargs, 
 ) -> P115ID | Coroutine[Any, Any, P115ID]:
+    """获取 pickcode 对应的 id
+
+    :param client: 115 客户端或 cookies
+    :param pickcode: 提取码
+    :param app: 使用某个 app （设备）的接口
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 文件或目录的 id
+    """
     if not 17 <= len(pickcode) <= 18 or not pickcode.isalnum():
         raise ValueError(f"bad pickcode: {pickcode!r}")
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def gen_step():
-        resp = yield client.download_url_web(pickcode, base_url=True, async_=async_, **request_kwargs)
-        if file_id := resp.get("file_id"):
-            msg_code = resp.get("msg_code", False)
-            resp["is_dir"] = msg_code and msg_code != 50028
-            return P115ID(file_id, resp, about="pickcode")
+        if app in ("", "web", "desktop", "harmony"):
+            fs_supervision: Callable = client.fs_supervision
+        else:
+            fs_supervision = partial(client.fs_supervision_app, app=app)
+        resp = yield fs_supervision(pickcode, async_=async_, **request_kwargs)
         check_response(resp)
+        data = resp["data"]
+        return P115ID(data["file_id"], data, about="pickcode")
     return run_gen_step(gen_step, async_=async_)
 
 
@@ -947,6 +897,7 @@ def get_id_to_pickcode(
 def get_id_to_sha1(
     client: str | P115Client, 
     sha1: str, 
+    app: str = "web", 
     *, 
     async_: Literal[False] = False, 
     **request_kwargs, 
@@ -956,6 +907,7 @@ def get_id_to_sha1(
 def get_id_to_sha1(
     client: str | P115Client, 
     sha1: str, 
+    app: str = "web", 
     *, 
     async_: Literal[True], 
     **request_kwargs, 
@@ -964,19 +916,40 @@ def get_id_to_sha1(
 def get_id_to_sha1(
     client: str | P115Client, 
     sha1: str, 
+    app: str = "web", 
     *, 
     async_: Literal[False, True] = False, 
     **request_kwargs, 
 ) -> P115ID | Coroutine[Any, Any, P115ID]:
+    """获取 sha1 对应的文件的 id
+
+    :param client: 115 客户端或 cookies
+    :param sha1: sha1 摘要值
+    :param app: 使用某个 app （设备）的接口
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 文件或目录的 id
+    """
     if len(sha1) != 40 or sha1.strip(hexdigits):
         raise ValueError(f"bad sha1: {sha1!r}")
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def gen_step():
-        resp = yield client.fs_shasearch(sha1, base_url=True, async_=async_, **request_kwargs)
-        check_response(resp)
-        resp["data"]["file_sha1"] = sha1.upper()
-        return P115ID(resp["data"]["file_id"], resp["data"], about="sha1")
+        file_sha1 = sha1.upper()
+        if app in ("", "web", "desktop", "harmony"):
+            resp = yield client.fs_shasearch(sha1, async_=async_, **request_kwargs)
+            check_response(resp)
+            data = resp["data"]
+        else:
+            resp = yield client.fs_search_app(sha1, async_=async_, **request_kwargs)
+            check_response(resp)
+            for data in resp["data"]:
+                if data["sha1"] == file_sha1:
+                    break
+            else:
+                raise FileNotFoundError(ENOENT, file_sha1)
+        return P115ID(data["file_id"], data, about="sha1", file_sha1=file_sha1)
     return run_gen_step(gen_step, async_=async_)
 
 
@@ -3135,24 +3108,6 @@ def iter_image_files(
     return run_gen_step_iter(gen_step, async_=async_)
 
 
-def share_extract_payload(link: str, /) -> SharePayload:
-    """从链接中提取 share_code 和 receive_code
-
-    .. hint::
-        `link` 支持 3 种形式（圆括号中的字符表示可有可无）：
-
-        1. http(s)://115.com/s/{share_code}?password={receive_code}(#) 或 http(s)://share.115.com/{share_code}?password={receive_code}(#)
-        2. (/){share_code}-{receive_code}(/)
-        3. {share_code}
-    """
-    m = CRE_SHARE_LINK_search1(link)
-    if m is None:
-        m = CRE_SHARE_LINK_search2(link)
-    if m is None:
-        raise ValueError("not a valid 115 share link")
-    return cast(SharePayload, m.groupdict())
-
-
 @overload
 def share_iterdir(
     client: str | P115Client, 

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, cycle
+from itertools import cycle
 from time import time, sleep
 from typing import overload, Any, Final, Literal
 

p115client/tool/pool.py

@@ -18,12 +18,14 @@ from itertools import cycle, repeat
 from math import inf, isinf
 from threading import Lock
 from time import time
-from typing import cast, Any
 
 from iterutils import run_gen_step
 from p115client import check_response, P115Client
+from p115client.const import AVAILABLE_APP_IDS
 from p115client.exception import P115OSError, AuthenticationError, LoginError
 
+from .util import get_status, is_timeouterror
+
 
 @total_ordering
 class ComparedWithID[T]:
@@ -51,35 +53,9 @@ class ComparedWithID[T]:
         return f"{type(self).__qualname__}({self.value!r})"
 
 
-def get_status(e: BaseException, /) -> None | int:
-    status = (
-        getattr(e, "status", None) or 
-        getattr(e, "code", None) or 
-        getattr(e, "status_code", None)
-    )
-    if status is None and hasattr(e, "response"):
-        response = e.response
-        status = (
-            getattr(response, "status", None) or 
-            getattr(response, "code", None) or 
-            getattr(response, "status_code", None)
-        )
-    return status
-
-
-def is_timeouterror(exc: Exception) -> bool:
-    exctype = type(exc)
-    for exctype in exctype.mro():
-        if exctype is Exception:
-            break
-        if "Timeout" in exctype.__name__:
-            return True
-    return False
-
-
 def generate_auth_factory(
     client: str | P115Client, 
-    app_ids: Iterable[int] = range(100195123, 100196659, 2), 
+    app_ids: Iterable[int] = AVAILABLE_APP_IDS, 
     **request_kwargs, 
 ) -> Callable:
     """利用一个已登录设备的 cookies，产生若干开放应用的 access_token
@@ -262,7 +238,7 @@ def make_pool[T](
 
 def auth_pool(
     client: str | P115Client, 
-    app_ids: Iterable[int] = range(100195123, 100196659, 2), 
+    app_ids: Iterable[int] = AVAILABLE_APP_IDS, 
     heap: None | list[tuple[float, dict | ComparedWithID[dict]]] = None, 
     cooldown_time: int | float = 1, 
     live_time: int | float = 7000, 
@@ -404,6 +380,7 @@ def call_wrap_with_pool(get_cert_headers: Callable, /, func: Callable) -> Callab
         return run_gen_step(gen_step, async_=async_)
     return update_wrapper(wrapper, func)
 
+
 # TODO: 需要完整的类型签名
 # TODO: 池子可以被导出，下次继续使用
 # TODO: 支持多个不同设备的 cookies 组成池，以及刷新（自己刷新自己，或者由另一个 cookies 辅助刷新）

p115client/tool/request.py

@@ -126,6 +126,7 @@ def make_request(
         case _:
             raise ValueError(f"can't make request for {module!r}")
 
+
 # TODO: 基于 http.client 实现一个 request，并且支持连接池
 # TODO: 基于 https://asks.readthedocs.io/en/latest/ 实现一个 request
 # TODO: 基于 https://pypi.org/project/pycurl/ 实现一个 request

p115client/tool/util.py

@@ -0,0 +1,107 @@
+#!/usr/bin/env python3
+# encoding: utf-8
+
+__author__ = "ChenyangGao <https://chenyanggao.github.io>"
+__all__ = [
+    "get_status", "is_timeouterror", "posix_escape_name", "reduce_image_url_layers", 
+    "share_extract_payload", "unescape_115_charref", 
+]
+__doc__ = "这个模块提供了一些工具函数"
+
+from re import compile as re_compile
+from typing import cast, Final, TypedDict
+from urllib.parse import urlsplit
+
+
+CRE_115_CHARREF_sub: Final = re_compile("\\[\x02([0-9]+)\\]").sub
+CRE_SHARE_LINK_search1 = re_compile(r"(?:/s/|share\.115\.com/)(?P<share_code>[a-z0-9]+)\?password=(?:(?P<receive_code>[a-z0-9]{4}))?").search
+CRE_SHARE_LINK_search2 = re_compile(r"(?P<share_code>[a-z0-9]+)(?:-(?P<receive_code>[a-z0-9]{4}))?").search
+
+
+class SharePayload(TypedDict):
+    share_code: str
+    receive_code: None | str
+
+
+def get_status(e: BaseException, /) -> None | int:
+    """获取 HTTP 请求异常的状态码（如果有的话）
+    """
+    status = (
+        getattr(e, "status", None) or 
+        getattr(e, "code", None) or 
+        getattr(e, "status_code", None)
+    )
+    if status is None and hasattr(e, "response"):
+        response = e.response
+        status = (
+            getattr(response, "status", None) or 
+            getattr(response, "code", None) or 
+            getattr(response, "status_code", None)
+        )
+    return status
+
+
+def is_timeouterror(exc: BaseException) -> bool:
+    """判断是不是超时异常
+    """
+    exctype = type(exc)
+    if issubclass(exctype, TimeoutError):
+        return True
+    for exctype in exctype.mro():
+        if "Timeout" in exctype.__name__:
+            return True
+    return False
+
+
+def posix_escape_name(name: str, /, repl: str = "|") -> str:
+    """把文件名中的 "/" 转换为另一个字符（默认为 "|"）
+
+    :param name: 文件名
+    :param repl: 替换为的目标字符
+
+    :return: 替换后的名字
+    """
+    return name.replace("/", repl)
+
+
+def reduce_image_url_layers(url: str, /, size: str | int = "") -> str:
+    """从图片的缩略图链接中提取信息，以减少一次 302 访问
+    """
+    if not url.startswith(("http://thumb.115.com/", "https://thumb.115.com/")):
+        return url
+    urlp = urlsplit(url)
+    sha1, _, size0 = urlp.path.rsplit("/")[-1].partition("_")
+    if size == "":
+        size = size0 or "0"
+    return f"https://imgjump.115.com/?sha1={sha1}&{urlp.query}&size={size}"
+
+
+def share_extract_payload(link: str, /) -> SharePayload:
+    """从链接中提取 share_code 和 receive_code
+
+    .. hint::
+        `link` 支持 3 种形式（圆括号中的字符表示可有可无）：
+
+        1. http(s)://115.com/s/{share_code}?password={receive_code}(#) 或 http(s)://share.115.com/{share_code}?password={receive_code}(#)
+        2. (/){share_code}-{receive_code}(/)
+        3. {share_code}
+    """
+    m = CRE_SHARE_LINK_search1(link)
+    if m is None:
+        m = CRE_SHARE_LINK_search2(link)
+    if m is None:
+        raise ValueError("not a valid 115 share link")
+    return cast(SharePayload, m.groupdict())
+
+
+def unescape_115_charref(s: str, /) -> str:
+    """对 115 的字符引用进行解码
+
+    :example:
+
+        .. code:: python
+
+            unescape_115_charref("[\x02128074]0号：优质资源") == "👊0号：优质资源"
+    """
+    return CRE_115_CHARREF_sub(lambda a: chr(int(a[1])), s)
+