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

p115client/const.py

@@ -2,15 +2,25 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__all = ["AVAILABLE_APPS", "APP_TO_SSOENT", "SSOENT_TO_APP", "CLIENT_API_MAP"]
+__all__ = [
+    "AVAILABLE_APP_IDS", "AVAILABLE_APPS", "APP_TO_SSOENT", 
+    "SSOENT_TO_APP", "CLIENT_API_MAP", "errno", 
+]
 
+from enum import IntEnum
 from typing import Final
 
+
+#: 可用的 AppID 列表
+AVAILABLE_APP_IDS = range(100195123, 100196837, 2)
+
+
 #: 目前可用的登录设备
 AVAILABLE_APPS: Final[tuple[str, ...]] = (
     "web", "ios", "115ios", "android", "115android", "115ipad", "tv", "qandroid", 
     "windows", "mac", "linux", "wechatmini", "alipaymini", "harmony", 
 )
+
 #: 目前已知的登录设备和对应的 ssoent
 APP_TO_SSOENT: Final[dict[str, str]] = {
     "web": "A1", 
@@ -33,6 +43,7 @@ APP_TO_SSOENT: Final[dict[str, str]] = {
     "alipaymini": "R2", 
     "harmony": "S1", 
 }
+
 #: 目前已知的 ssoent 和对应的登录设备，一部分因为不知道具体的设备名，所以使用目前可用的设备名，作为临时代替
 SSOENT_TO_APP: Final[dict[str, str]] = {
     "A1": "web", 
@@ -59,8 +70,10 @@ SSOENT_TO_APP: Final[dict[str, str]] = {
     "R2": "alipaymini", 
     "S1": "harmony", 
 }
+
 #: 所有已封装的 115 接口以及对应的方法名
 CLIENT_API_MAP: Final[dict[str, str]] = {}
+
 #: 文件的 class 属性对应的所属类型的整数代码
 CLASS_TO_TYPE: Final[dict[str, int]] = {
     "JG_DOC": 1, 
@@ -79,6 +92,7 @@ CLASS_TO_TYPE: Final[dict[str, int]] = {
     "JG_BOOK": 7, 
     "BOOK": 7
 }
+
 #: 文件后缀对应的所属类型的整数代码（尚需补充）
 SUFFIX_TO_TYPE: Final[dict[str, int]] = {
     ".ass": 1, 
@@ -203,3 +217,171 @@ SUFFIX_TO_TYPE: Final[dict[str, int]] = {
     ".mobi": 7, 
     ".prc": 7, 
 }
+
+#: OSError 的错误码的枚举，参考：https://docs.python.org/3/library/errno.html
+class errno(IntEnum):
+    EPERM = 1
+    ENOENT = 2
+    ESRCH = 3
+    EINTR = 4
+    EIO = 5
+    ENXIO = 6
+    E2BIG = 7
+    ENOEXEC = 8
+    EBADF = 9
+    ECHILD = 10
+    EAGAIN = 11
+    ENOMEM = 12
+    EACCES = 13
+    EFAULT = 14
+    ENOTBLK = 15
+    EBUSY = 16
+    EEXIST = 17
+    EXDEV = 18
+    ENODEV = 19
+    ENOTDIR = 20
+    EISDIR = 21
+    EINVAL = 22
+    ENFILE = 23
+    EMFILE = 24
+    ENOTTY = 25
+    ETXTBSY = 26
+    EFBIG = 27
+    ENOSPC = 28
+    ESPIPE = 29
+    EROFS = 30
+    EMLINK = 31
+    EPIPE = 32
+    EDOM = 33
+    ERANGE = 34
+    EDEADLK = 35
+    ENAMETOOLONG = 36
+    ENOLCK = 37
+    ENOSYS = 38
+    ENOTEMPTY = 39
+    ELOOP = 40
+    EWOULDBLOCK = 41
+    ENOMSG = 42
+    EIDRM = 43
+    ECHRNG = 44
+    EL2NSYNC = 45
+    EL3HLT = 46
+    EL3RST = 47
+    ELNRNG = 48
+    EUNATCH = 49
+    ENOCSI = 50
+    EL2HLT = 51
+    EBADE = 52
+    EBADR = 53
+    EXFULL = 54
+    ENOANO = 55
+    EBADRQC = 56
+    EBADSLT = 57
+    EDEADLOCK = 58
+    EBFONT = 59
+    ENOSTR = 60
+    ENODATA = 61
+    ETIME = 62
+    ENOSR = 63
+    ENONET = 64
+    ENOPKG = 65
+    EREMOTE = 66
+    ENOLINK = 67
+    EADV = 68
+    ESRMNT = 69
+    ECOMM = 70
+    EPROTO = 71
+    EMULTIHOP = 72
+    EDOTDOT = 73
+    EBADMSG = 74
+    EOVERFLOW = 75
+    ENOTUNIQ = 76
+    EBADFD = 77
+    EREMCHG = 78
+    ELIBACC = 79
+    ELIBBAD = 80
+    ELIBSCN = 81
+    ELIBMAX = 82
+    ELIBEXEC = 83
+    EILSEQ = 84
+    ERESTART = 85
+    ESTRPIPE = 86
+    EUSERS = 87
+    ENOTSOCK = 88
+    EDESTADDRREQ = 89
+    EMSGSIZE = 90
+    EPROTOTYPE = 91
+    ENOPROTOOPT = 92
+    EPROTONOSUPPORT = 93
+    ESOCKTNOSUPPORT = 94
+    EOPNOTSUPP = 95
+    ENOTSUP = 96
+    EPFNOSUPPORT = 97
+    EAFNOSUPPORT = 98
+    EADDRINUSE = 99
+    EADDRNOTAVAIL = 100
+    ENETDOWN = 101
+    ENETUNREACH = 102
+    ENETRESET = 103
+    ECONNABORTED = 104
+    ECONNRESET = 105
+    ENOBUFS = 106
+    EISCONN = 107
+    ENOTCONN = 108
+    ESHUTDOWN = 109
+    ETOOMANYREFS = 110
+    ETIMEDOUT = 111
+    ECONNREFUSED = 112
+    EHOSTDOWN = 113
+    EHOSTUNREACH = 114
+    EALREADY = 115
+    EINPROGRESS = 116
+    ESTALE = 117
+    EUCLEAN = 118
+    ENOTNAM = 119
+    ENAVAIL = 120
+    EISNAM = 121
+    EREMOTEIO = 122
+    EDQUOT = 123
+    EQFULL = 124
+    ENOMEDIUM = 125
+    EMEDIUMTYPE = 126
+    ENOKEY = 127
+    EKEYEXPIRED = 128
+    EKEYREVOKED = 129
+    EKEYREJECTED = 130
+    ERFKILL = 131
+    ELOCKUNMAPPED = 132
+    ENOTACTIVE = 133
+    EAUTH = 134
+    EBADARCH = 135
+    EBADEXEC = 136
+    EBADMACHO = 137
+    EDEVERR = 138
+    EFTYPE = 139
+    ENEEDAUTH = 140
+    ENOATTR = 141
+    ENOPOLICY = 142
+    EPROCLIM = 143
+    EPROCUNAVAIL = 144
+    EPROGMISMATCH = 145
+    EPROGUNAVAIL = 146
+    EPWROFF = 147
+    EBADRPC = 148
+    ERPCMISMATCH = 149
+    ESHLIBVERS = 150
+    ENOTCAPABLE = 151
+    ECANCELED = 152
+    EOWNERDEAD = 153
+    ENOTRECOVERABLE = 154
+
+    def of(key, /):
+        if isinstance(key, errno):
+            return key
+        if isinstance(key, int):
+            return errno(key)
+        try:
+            return errno[key]
+        except KeyError as e:
+            raise ValueError(key) from e
+

p115client/exception.py

@@ -4,6 +4,8 @@
 __all__ = [
     "P115Warning", "P115OSError", "AuthenticationError", "BusyOSError", "DataError", 
     "LoginError", "MultipartUploadAbort", "NotSupportedError", "OperationalError", 
+    "P115FileExistsError", "P115FileNotFoundError", "P115IsADirectoryError", 
+    "P115NotADirectoryError", "P115PermissionError", "P115TimeoutError", 
 ]
 
 import warnings
@@ -15,44 +17,36 @@ from functools import cached_property
 from .type import MultipartResumeData
 
 
+warnings.filterwarnings("always", category=UserWarning)
+setattr(warnings, "formatwarning", lambda message, category, filename, lineno, line=None, _getid=count(1).__next__:
+    f"\r\x1b[K\x1b[1;31;43m{category.__qualname__}\x1b[0m(\x1b[32m{_getid()}\x1b[0m) @ \x1b[3;4;34m{filename}\x1b[0m:\x1b[36m{lineno}\x1b[0m \x1b[5;31m➜\x1b[0m \x1b[1m{message}\x1b[0m\n"
+)
+
 class P115Warning(UserWarning):
     """本模块的最基础警示类
     """
 
 
-_count = count(1).__next__
-warnings.filterwarnings("always", category=UserWarning)
-warnings.formatwarning = lambda message, category, filename, lineno, line=None: f"\r\x1b[K\x1b[1;31;43m{category.__qualname__}\x1b[0m(\x1b[32m{_count()}\x1b[0m) @ \x1b[3;4;34m{filename}\x1b[0m:\x1b[36m{lineno}\x1b[0m \x1b[5;31m➜\x1b[0m \x1b[1m{message}\x1b[0m\n"
-
-
 class P115OSError(OSError):
     """本模块的最基础异常类
     """
-    def __init__(self, /, *args):
-        super().__init__(*args)
-
     def __getattr__(self, attr, /):
-        message = self.message
         try:
-            if isinstance(message, Mapping):
-                return message[attr]
+            return self[attr]
         except KeyError as e:
             raise AttributeError(attr) from e
-        raise AttributeError(attr)
 
     def __getitem__(self, key, /):
         message = self.message
         if isinstance(message, Mapping):
             return message[key]
-        return message
+        raise KeyError(key)
 
     @cached_property
     def message(self, /):
-        args = self.args
-        if len(args) >= 2:
-            if not isinstance(args[0], int):
+        if args := self.args:
+            if len(args) >= 2 and isinstance(args[0], int):
                 return args[1]
-        if args:
             return args[0]
 
 
@@ -88,7 +82,7 @@ class MultipartUploadAbort(P115OSError):
 
 
 class NotSupportedError(P115OSError):
-    """当调用不存在的接口时抛出
+    """当调用不存在的接口或者接口不支持此操作时抛出
     """
 
 
@@ -96,3 +90,33 @@ class OperationalError(P115OSError):
     """当接口使用方法错误时抛出，例如参数错误、空间不足、超出允许数量范围等
     """
 
+
+class P115FileExistsError(P115OSError, FileExistsError):
+    """扩展 FileExistsError，同时是 P115OSError 的子类
+    """
+
+
+class P115FileNotFoundError(P115OSError, FileNotFoundError):
+    """扩展 FileNotFoundError，同时是 P115OSError 的子类
+    """
+
+
+class P115IsADirectoryError(P115OSError, IsADirectoryError):
+    """扩展 IsADirectoryError，同时是 P115OSError 的子类
+    """
+
+
+class P115NotADirectoryError(P115OSError, NotADirectoryError):
+    """扩展 NotADirectoryError，同时是 P115OSError 的子类
+    """
+
+
+class P115PermissionError(P115OSError, PermissionError):
+    """扩展 PermissionError，同时是 P115OSError 的子类
+    """
+
+
+class P115TimeoutError(P115OSError, TimeoutError):
+    """扩展 TimeoutError，同时是 P115OSError 的子类
+    """
+

p115client/tool/__init__.py

@@ -3,6 +3,7 @@
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
 
+from .attr import *
 from .download import *
 from .edit import *
 from .export_dir import *
@@ -13,4 +14,5 @@ from .life import *
 from .pool import *
 from .request import *
 from .upload import *
+from .util import *
 from .xys import *

p115client/tool/attr.py

@@ -0,0 +1,104 @@
+#!/usr/bin/env python3
+# encoding: utf-8
+
+__author__ = "ChenyangGao <https://chenyanggao.github.io>"
+__all__ = ["get_attr", "type_of_attr"]
+__doc__ = "这个模块提供了一些和文件或目录信息有关的函数"
+
+from collections.abc import Mapping
+from typing import overload, Literal
+
+from iterutils import run_gen_step
+from p115client import check_response, normalize_attr_web, P115Client
+from p115client.const import CLASS_TO_TYPE, SUFFIX_TO_TYPE
+from posixpatht import splitext
+
+
+@overload
+def get_attr(
+    client: str | P115Client, 
+    id: int, 
+    skim: bool = False, 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> dict:
+    ...
+@overload
+def get_attr(
+    client: str | P115Client, 
+    id: int, 
+    skim: bool = False, 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> dict:
+    ...
+def get_attr(
+    client: str | P115Client, 
+    id: int, 
+    skim: bool = False, 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> dict:
+    """获取文件或目录的信息
+
+    :param client: 115 客户端或 cookies
+    :param id: 文件或目录的 id
+    :param skim: 是否获取简要信息（可避免风控）
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 文件或目录的信息
+    """
+    if isinstance(client, str):
+        client = P115Client(client, check_for_relogin=True)
+    def gen_step():
+        if skim:
+            from dictattr import AttrDict
+            resp = yield client.fs_file_skim(id, async_=async_, **request_kwargs)
+            check_response(resp)
+            info = resp["data"][0]
+            return AttrDict(
+                id=int(info["file_id"]), 
+                name=info["file_name"], 
+                pickcode=info["pick_code"], 
+                sha1=info["sha1"], 
+                size=int(info["file_size"]), 
+            )
+        else:
+            resp = yield client.fs_file(id, async_=async_, **request_kwargs)
+            check_response(resp)
+            return normalize_attr_web(resp["data"][0])
+    return run_gen_step(gen_step, async_=async_)
+
+
+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
+

p115client/tool/download.py

@@ -3,58 +3,43 @@
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
 __all__ = [
-    "reduce_image_url_layers", "batch_get_url", "iter_url_batches", "iter_files_with_url", 
+    "batch_get_url", "iter_url_batches", "iter_files_with_url", 
     "iter_images_with_url", "iter_subtitles_with_url", "iter_subtitle_batches", "make_strm", 
     "iter_download_nodes", "iter_download_files", "get_remaining_open_count", 
 ]
 __doc__ = "这个模块提供了一些和下载有关的函数"
 
-from asyncio import create_task, to_thread, Queue as AsyncQueue, Semaphore, TaskGroup
-from collections.abc import AsyncIterator, Callable, Coroutine, Iterable, Iterator, Sequence
+from asyncio import create_task, to_thread, Queue as AsyncQueue, TaskGroup
+from collections.abc import AsyncIterator, Callable, Coroutine, Iterable, Iterator
 from concurrent.futures import ThreadPoolExecutor
-from errno import ENOENT, ENOTDIR
+from errno import ENOTDIR
 from functools import partial
 from glob import iglob
-from inspect import isawaitable
 from itertools import chain, count, cycle, islice
-from mimetypes import guess_type
 from os import fsdecode, makedirs, remove, PathLike
 from os.path import abspath, dirname, join as joinpath, normpath, splitext
 from queue import SimpleQueue
 from shutil import rmtree
 from threading import Lock
 from time import time
-from typing import cast, overload, Any, Final, Literal, TypedDict
+from typing import cast, overload, Any, Literal
 from types import EllipsisType
-from urllib.parse import quote, urlsplit
 from urllib.request import urlopen, Request
 from uuid import uuid4
 from warnings import warn
 
 from asynctools import async_chain_from_iterable
-from concurrenttools import run_as_async, run_as_thread, thread_batch, async_batch
+from concurrenttools import run_as_thread, thread_batch, async_batch
 from encode_uri import encode_uri_component_loose
 from iterutils import chunked, run_gen_step, run_gen_step_iter, with_iter_next, Yield, YieldFrom
 from p115client import check_response, normalize_attr, normalize_attr_simple, P115Client, P115URL
 from p115client.exception import P115Warning
 
-from .export_dir import export_dir_parse_iter
 from .iterdir import (
     get_path_to_cid, iterdir, iter_files, iter_files_raw, iter_files_with_path, 
     unescape_115_charref, posix_escape_name, DirNode, ID_TO_DIRNODE_CACHE, 
 )
-
-
-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}"
+from .util import reduce_image_url_layers
 
 
 @overload

p115client/tool/edit.py

@@ -8,9 +8,8 @@ __all__ = [
 ]
 __doc__ = "这个模块提供了一些和修改文件或目录信息有关的函数"
 
-from collections.abc import AsyncIterable, AsyncIterator, Coroutine, Iterable, Iterator, Sequence
+from collections.abc import AsyncIterable, AsyncIterator, Coroutine, Iterable, Iterator
 from functools import partial
-from itertools import batched, pairwise
 from typing import cast, overload, Any, Literal
 
 from asynctools import to_list

p115client/tool/fs_files.py

@@ -15,7 +15,7 @@ from functools import partial
 from inspect import isawaitable
 from itertools import cycle
 from time import time
-from typing import cast, overload, Any, Final, Literal
+from typing import overload, Any, Final, Literal
 from warnings import warn
 
 from iterutils import run_gen_step, run_gen_step_iter, Yield
@@ -23,23 +23,13 @@ from p115client import check_response, P115Client, P115OpenClient
 from p115client.client import get_status_code
 from p115client.exception import BusyOSError, DataError, P115Warning
 
+from .util import is_timeouterror
+
 
 get_webapi_origin: Final = cycle(("http://webapi.115.com", "https://webapi.115.com")).__next__
 get_proapi_origin: Final = cycle(("http://proapi.115.com", "https://proapi.115.com")).__next__
 
 
-def is_timeouterror(exc: BaseException, /) -> bool:
-    """通过名字来判断一个异常是不是 Timeout
-    """
-    exctype = type(exc)
-    for exctype in exctype.mro():
-        if exctype is Exception:
-            break
-        if "Timeout" in exctype.__name__:
-            return True
-    return False
-
-
 @overload
 def iter_fs_files(
     client: str | P115Client | P115OpenClient, 
@@ -403,4 +393,5 @@ async def iter_fs_files_asynchronized(
             t.cancel()
         await tg.__aexit__(None, None, None)
 
+
 # TODO: 以上的数据获取方式某种程度上应该是通用的，只要是涉及到 offset 和 count，因此可以总结出一个更抽象的函数