p115client 0.0.5.12__py3-none-any.whl → 0.0.5.12.2__py3-none-any.whl

p115client/client.py

@@ -15,6 +15,7 @@ from collections.abc import (
     AsyncGenerator, AsyncIterable, Awaitable, Buffer, Callable, Coroutine, Generator, 
     ItemsView, Iterable, Iterator, Mapping, MutableMapping, Sequence, 
 )
+from contextlib import contextmanager
 from datetime import date, datetime, timedelta
 from functools import partial
 from hashlib import md5, sha1
@@ -30,11 +31,12 @@ from platform import system
 from posixpath import splitext
 from re import compile as re_compile, MULTILINE
 from string import digits
+from sys import _getframe
 from tempfile import TemporaryFile
 from threading import Lock
 from time import time
 from typing import cast, overload, Any, Final, Literal, Self, Unpack
-from urllib.parse import quote, unquote, urlencode, urlsplit, urlunsplit
+from urllib.parse import parse_qsl, quote, unquote, urlencode, urlsplit, urlunsplit
 from uuid import uuid4
 from warnings import warn
 
@@ -63,7 +65,10 @@ from startfile import startfile, startfile_async # type: ignore
 from undefined import undefined
 from yarl import URL
 
-from .const import CLASS_TO_TYPE, CLIENT_API_MAP, SSOENT_TO_APP, SUFFIX_TO_TYPE, errno
+from .const import (
+    CLASS_TO_TYPE, CLIENT_API_METHODS_MAP, CLIENT_METHOD_API_MAP, 
+    SSOENT_TO_APP, SUFFIX_TO_TYPE, errno, 
+)
 from .exception import (
     AccessTokenError, AuthenticationError, BusyOSError, DataError, LoginError, 
     OpenAppAuthLimitExceeded, NotSupportedError, P115OSError, OperationalError, 
@@ -74,7 +79,6 @@ from ._upload import buffer_length, make_dataiter, oss_upload, oss_multipart_upl
 
 
 CRE_SET_COOKIE: Final = re_compile(r"[0-9a-f]{32}=[0-9a-f]{32}.*")
-CRE_CLIENT_API_search: Final = re_compile(r"^ +((?:GET|POST) .*)", MULTILINE).search
 CRE_COOKIES_UID_search: Final = re_compile(r"(?<=\bUID=)[^\s;]+").search
 CRE_API_match: Final = re_compile(r"http://(web|pro)api.115.com(?=/|\?|#|$)").match
 ED2K_NAME_TRANSTAB: Final = dict(zip(b"/|", ("%2F", "%7C")))
@@ -229,6 +233,20 @@ def try_parse_int(
     return int(s)
 
 
+@contextmanager
+def temp_globals(f_globals: None | dict = None, /, **ns):
+    if f_globals is None:
+        f_globals = _getframe(2).f_globals
+    old_globals = f_globals.copy()
+    if ns:
+        f_globals.update(ns)
+    try:
+        yield f_globals
+    finally:
+        f_globals.clear()
+        f_globals.update(old_globals)
+
+
 def json_loads(content: Buffer, /):
     try:
         if isinstance(content, (bytes, bytearray, memoryview)):
@@ -1058,8 +1076,8 @@ def normalize_attr(
     simple: bool = False, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: None, 
-) -> dict[str, Any]:
+    dict_cls: None = None, 
+) -> AttrDict[str, Any]:
     ...
 @overload
 def normalize_attr[D: dict[str, Any]](
@@ -1068,7 +1086,7 @@ def normalize_attr[D: dict[str, Any]](
     simple: bool = False, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: type[D] = AttrDict, # type: ignore
+    dict_cls: type[D], 
 ) -> D:
     ...
 def normalize_attr[D: dict[str, Any]](
@@ -1077,8 +1095,8 @@ def normalize_attr[D: dict[str, Any]](
     simple: bool = False, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: None | type[D] = AttrDict, # type: ignore
-) -> dict[str, Any] | D:
+    dict_cls: None | type[D] = None, 
+) -> AttrDict[str, Any] | D:
     """翻译获取自罗列目录、搜索、获取文件信息等接口的数据，使之便于阅读
 
     :param info: 原始数据
@@ -1088,12 +1106,20 @@ def normalize_attr[D: dict[str, Any]](
 
     :return: 翻译后的 dict 类型数据
     """
-    if "fn" in info:
-        return normalize_attr_app(info, simple=simple, keep_raw=keep_raw, dict_cls=dict_cls)
-    elif "file_id" in info or "category_id" in info:
-        return normalize_attr_app2(info, simple=simple, keep_raw=keep_raw, dict_cls=dict_cls)
+    if dict_cls is None:
+        if "fn" in info:
+            return normalize_attr_app(info, simple=simple, keep_raw=keep_raw, dict_cls=AttrDict)
+        elif "file_id" in info or "category_id" in info:
+            return normalize_attr_app2(info, simple=simple, keep_raw=keep_raw, dict_cls=AttrDict)
+        else:
+            return normalize_attr_web(info, simple=simple, keep_raw=keep_raw, dict_cls=AttrDict)
     else:
-        return normalize_attr_web(info, simple=simple, keep_raw=keep_raw, dict_cls=dict_cls)
+        if "fn" in info:
+            return normalize_attr_app(info, simple=simple, keep_raw=keep_raw, dict_cls=dict_cls)
+        elif "file_id" in info or "category_id" in info:
+            return normalize_attr_app2(info, simple=simple, keep_raw=keep_raw, dict_cls=dict_cls)
+        else:
+            return normalize_attr_web(info, simple=simple, keep_raw=keep_raw, dict_cls=dict_cls)
 
 
 @overload
@@ -1559,6 +1585,9 @@ class ClientRequestMixin:
     ) -> dict | Coroutine[Any, Any, dict]:
         """授权码方式请求开放接口应用授权
 
+        .. note::
+            最多同时有 2 个授权登录，如果有新的授权加入，会先踢掉时间较早的那一个
+
         GET https://qrcodeapi.115.com/open/authorize
 
         .. admonition:: Reference
@@ -1573,6 +1602,19 @@ class ClientRequestMixin:
         """
         api = complete_api("/open/authorize", base_url=base_url)
         payload = {"response_type": "code", **payload}
+        def parse(resp, content, /):
+            if resp.status_code == 302:
+                return {
+                    "state": True, 
+                    "url": resp.headers["location"], 
+                    "data": dict(parse_qsl(urlsplit(resp.headers["location"]).query)), 
+                    "headers": dict(resp.headers), 
+                }
+            else:
+                return json_loads(content)
+        request_kwargs["parse"] = parse
+        for key in ("allow_redirects", "follow_redirects", "redirect"):
+            request_kwargs[key] = False
         return self.request(url=api, params=payload, async_=async_, **request_kwargs)
 
     @overload
@@ -2068,6 +2110,9 @@ class ClientRequestMixin:
 
             https://www.yuque.com/115yun/open/shtpzfhewv5nag11#WzRhM
 
+        .. note::
+            最多同时有 2 个授权登录，如果有新的授权加入，会先踢掉时间较早的那一个
+
         .. note::
             code_challenge 默认用的字符串为 64 个 0，hash 算法为 md5
 
@@ -2370,7 +2415,7 @@ class ClientRequestMixin:
                 )
             else:
                 return qrcode_token
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     @classmethod
@@ -2470,7 +2515,7 @@ class ClientRequestMixin:
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     ########## Upload API ##########
 
@@ -2615,7 +2660,6 @@ class ClientRequestMixin:
 
         :return: 文件的 ed2k 链接
         """
-        trantab = dict(zip(b"/|", ("%2F", "%7C")))
         if async_:
             async def request():
                 async with self.open(url, headers=headers, async_=True) as file:
@@ -2853,7 +2897,7 @@ class ClientRequestMixin:
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def read_bytes_range(
@@ -2968,7 +3012,7 @@ class ClientRequestMixin:
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
 
 class P115OpenClient(ClientRequestMixin):
@@ -3064,7 +3108,7 @@ class P115OpenClient(ClientRequestMixin):
             self.refresh_token = data["refresh_token"]
             self.access_token = data["access_token"]
             return self
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @classmethod
     def from_token(cls, /, access_token: str, refresh_token: str) -> P115OpenClient:
@@ -3140,7 +3184,7 @@ class P115OpenClient(ClientRequestMixin):
             self.refresh_token = data["refresh_token"]
             self.access_token = data["access_token"]
             return data
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def download_url(
@@ -3481,6 +3525,7 @@ class P115OpenClient(ClientRequestMixin):
               - "user_ptime": 创建时间（无效，效果相当于 "user_utime"）
               - "user_otime": 上一次打开时间（无效，效果相当于 "user_utime"）
 
+            - qid: int = <default>
             - r_all: 0 | 1 = <default>
             - record_open_time: 0 | 1 = 1 💡 是否要记录目录的打开时间
             - scid: int | str = <default>
@@ -3861,7 +3906,7 @@ class P115OpenClient(ClientRequestMixin):
         return self.fs_update(payload, async_=async_, **request_kwargs)
 
     @overload
-    def fs_video_history(
+    def fs_video(
         self, 
         payload: str | dict, 
         /, 
@@ -3872,7 +3917,7 @@ class P115OpenClient(ClientRequestMixin):
     ) -> dict:
         ...
     @overload
-    def fs_video_history(
+    def fs_video(
         self, 
         payload: str | dict, 
         /, 
@@ -3882,7 +3927,7 @@ class P115OpenClient(ClientRequestMixin):
         **request_kwargs, 
     ) -> Coroutine[Any, Any, dict]:
         ...
-    def fs_video_history(
+    def fs_video(
         self, 
         payload: str | dict, 
         /, 
@@ -3891,24 +3936,28 @@ class P115OpenClient(ClientRequestMixin):
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
-        """获取视频播放进度
+        """获取视频在线播放地址（和视频文件相关数据）
 
-        GET https://proapi.115.com/open/video/history
+        GET https://proapi.115.com/open/video/play
 
         .. admonition:: Reference
 
-            https://www.yuque.com/115yun/open/gssqdrsq6vfqigag
+            https://www.yuque.com/115yun/open/hqglxv3cedi3p9dz
+
+        .. hint::
+            需切换音轨时，在请求返回的播放地址中增加请求参数 `&audio_track=${index}`，值就是接口响应中 `multitrack_list` 中某个成员的索引，从 0 开始计数
 
         :payload:
             - pick_code: str 💡 文件提取码
+            - share_id: int | str = <default> 💡 共享 id，获取共享文件播放地址所需
         """
-        api = complete_proapi("/open/video/history", base_url)
+        api = complete_proapi("/open/video/play", base_url)
         if isinstance(payload, str):
             payload = {"pick_code": payload}
         return self.request(url=api, params=payload, async_=async_, **request_kwargs)
 
     @overload
-    def fs_video_history_set(
+    def fs_video_history(
         self, 
         payload: str | dict, 
         /, 
@@ -3919,7 +3968,7 @@ class P115OpenClient(ClientRequestMixin):
     ) -> dict:
         ...
     @overload
-    def fs_video_history_set(
+    def fs_video_history(
         self, 
         payload: str | dict, 
         /, 
@@ -3929,7 +3978,7 @@ class P115OpenClient(ClientRequestMixin):
         **request_kwargs, 
     ) -> Coroutine[Any, Any, dict]:
         ...
-    def fs_video_history_set(
+    def fs_video_history(
         self, 
         payload: str | dict, 
         /, 
@@ -3938,26 +3987,24 @@ class P115OpenClient(ClientRequestMixin):
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
-        """记忆视频播放进度
+        """获取视频播放进度
 
-        POST https://proapi.115.com/open/video/history
+        GET https://proapi.115.com/open/video/history
 
         .. admonition:: Reference
 
-            https://www.yuque.com/115yun/open/bshagbxv1gzqglg4
+            https://www.yuque.com/115yun/open/gssqdrsq6vfqigag
 
         :payload:
             - pick_code: str 💡 文件提取码
-            - time: int = <default> 💡 视频播放进度时长 (单位秒)
-            - watch_end: int = <default> 💡 视频是否播放播放完毕 0:未完毕 1:完毕
         """
         api = complete_proapi("/open/video/history", base_url)
         if isinstance(payload, str):
             payload = {"pick_code": payload}
-        return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
+        return self.request(url=api, params=payload, async_=async_, **request_kwargs)
 
     @overload
-    def fs_video_play(
+    def fs_video_history_set(
         self, 
         payload: str | dict, 
         /, 
@@ -3968,7 +4015,7 @@ class P115OpenClient(ClientRequestMixin):
     ) -> dict:
         ...
     @overload
-    def fs_video_play(
+    def fs_video_history_set(
         self, 
         payload: str | dict, 
         /, 
@@ -3978,7 +4025,7 @@ class P115OpenClient(ClientRequestMixin):
         **request_kwargs, 
     ) -> Coroutine[Any, Any, dict]:
         ...
-    def fs_video_play(
+    def fs_video_history_set(
         self, 
         payload: str | dict, 
         /, 
@@ -3987,25 +4034,23 @@ class P115OpenClient(ClientRequestMixin):
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
-        """获取视频在线播放地址（和视频文件相关数据）
+        """记忆视频播放进度
 
-        GET https://proapi.115.com/open/video/play
-        
-        .. admonition:: Reference
+        POST https://proapi.115.com/open/video/history
 
-            https://www.yuque.com/115yun/open/hqglxv3cedi3p9dz
+        .. admonition:: Reference
 
-        .. hint::
-            需切换音轨时，在请求返回的播放地址中增加请求参数 `&audio_track=${index}`，值就是接口响应中 `multitrack_list` 中某个成员的索引，从 0 开始计数
+            https://www.yuque.com/115yun/open/bshagbxv1gzqglg4
 
         :payload:
             - pick_code: str 💡 文件提取码
-            - share_id: int | str = <default> 💡 共享 id，获取共享文件播放地址所需
+            - time: int = <default> 💡 视频播放进度时长 (单位秒)
+            - watch_end: int = <default> 💡 视频是否播放播放完毕 0:未完毕 1:完毕
         """
-        api = complete_proapi("/open/video/play", base_url)
+        api = complete_proapi("/open/video/history", base_url)
         if isinstance(payload, str):
             payload = {"pick_code": payload}
-        return self.request(url=api, params=payload, async_=async_, **request_kwargs)
+        return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
 
     @overload
     def fs_video_push(
@@ -4048,13 +4093,15 @@ class P115OpenClient(ClientRequestMixin):
 
         :payload:
             - pick_code: str 💡 文件提取码
-            - op: str = "vip_push" 💡 提交视频加速转码方式：vip_push:根据；vip 等级加速 pay_push:枫叶加速
+            - op: str = "vip_push" 💡 提交视频加速转码方式
+
+                - "vip_push": 根据；vip 等级加速
+                - "pay_push": 枫叶加速
         """
         api = complete_proapi("/open/video/video_push", base_url)
         if isinstance(payload, str):
-            payload = {"pick_code": payload, "op": "vip_push"}
-        else:
-            payload.setdefault("op", "vip_push")
+            payload = {"pick_code": payload}
+        payload.setdefault("op", "vip_push")
         return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
 
     @overload
@@ -4886,7 +4933,7 @@ class P115OpenClient(ClientRequestMixin):
                 check_response(resp)
             resp["data"] = {**payload, **resp["data"], "sha1": filesha1, "cid": pid}
             return resp
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def upload_file(
@@ -5231,7 +5278,7 @@ class P115OpenClient(ClientRequestMixin):
                     async_=async_, # type: ignore
                     **request_kwargs, 
                 )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def user_info(
@@ -5305,7 +5352,7 @@ class P115OpenClient(ClientRequestMixin):
     ) -> dict | Coroutine[Any, Any, dict]:
         """获取产品列表地址（即引导用户扫码购买 115 的 VIP 服务，以获取提成）
 
-        GET https://proapi.115.com/open/open/vip/qr_url
+        GET https://proapi.115.com/open/vip/qr_url
 
         .. admonition:: Reference
 
@@ -5336,9 +5383,9 @@ class P115OpenClient(ClientRequestMixin):
     fs_move_open = fs_move
     fs_search_open = fs_search
     fs_star_set_open = fs_star_set
+    fs_video_open = fs_video
     fs_video_history_open = fs_video_history
     fs_video_history_set_open = fs_video_history_set
-    fs_video_play_open = fs_video_play
     fs_video_push_open = fs_video_push
     fs_video_subtitle_open = fs_video_subtitle
     fs_update_open = fs_update
@@ -5365,7 +5412,9 @@ class P115Client(P115OpenClient):
     """115 的客户端对象
 
     .. note::
-        目前允许 1 个用户同时登录多个开放平台应用（用 AppID 区别），也允许多次登录同 1 个应用
+        目前允许 1 个用户同时登录多个开放平台应用（用 AppID 区别），也允许多次授权登录同 1 个应用
+
+        目前最多同时有 2 个授权登录登录，如果有新的授权加入，会先踢掉时间较早的那一个
 
         目前不允许短时间内再次用 `refresh_token` 刷新 `access_token`，但你可以用登录的方式再次授权登录以获取 `access_token`，即可不受频率限制
 
@@ -5667,7 +5716,7 @@ class P115Client(P115OpenClient):
                     )
             setattr(self, "check_for_relogin", check_for_relogin)
             return self
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @locked_cacheproperty
     def request_lock(self, /) -> Lock:
@@ -5839,7 +5888,7 @@ class P115Client(P115OpenClient):
                 check_response(resp)
             setattr(self, "cookies", resp["data"]["cookie"])
             return self
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def login_with_app(
@@ -5971,7 +6020,7 @@ class P115Client(P115OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def login_without_app(
@@ -6029,7 +6078,7 @@ class P115Client(P115OpenClient):
             )
             check_response(resp)
             return uid
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def login_info_open(
@@ -6078,7 +6127,7 @@ class P115Client(P115OpenClient):
                 "name": tip_txt[:-10].removeprefix("\ufeff"), 
                 "icon": resp["data"]["icon"], 
             }
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def login_with_open(
@@ -6113,6 +6162,9 @@ class P115Client(P115OpenClient):
     ) -> dict | Coroutine[Any, Any, dict]:
         """登录某个开放接口应用
 
+        .. note::
+            同一个开放应用 id，最多同时有 2 个登入，如果有新的登录，则自动踢掉较早的那一个
+
         :param app_id: AppID
         :param show_warning: 是否显示提示信息
         :param async_: 是否异步
@@ -6130,7 +6182,7 @@ class P115Client(P115OpenClient):
             resp = yield self.login_qrcode_scan_confirm(login_uid, async_=async_, **request_kwargs)
             check_response(resp)
             return self.login_qrcode_access_token_open(login_uid, async_=async_, **request_kwargs)
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def login_another_app(
@@ -6276,7 +6328,7 @@ class P115Client(P115OpenClient):
             if self is not inst and ssoent == inst.login_ssoent:
                 warn(f"login with the same ssoent {ssoent!r}, {self!r} will expire within 60 seconds", category=P115Warning)
             return inst
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def login_another_open(
@@ -6370,7 +6422,7 @@ class P115Client(P115OpenClient):
                 inst.access_token = data["access_token"]
             inst.app_id = app_id
             return inst
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     @classmethod
@@ -6489,7 +6541,7 @@ class P115Client(P115OpenClient):
             resp = yield cls.login_qrcode_scan_result(uid, app, async_=async_, **request_kwargs)
             cookies = check_response(resp)["data"]["cookie"]
             return cls(cookies, check_for_relogin=check_for_relogin)
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def logout(
@@ -6772,7 +6824,7 @@ class P115Client(P115OpenClient):
                     if check and isinstance(resp, dict):
                         check_response(resp)
                     return resp
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     def request(
         self, 
@@ -7664,7 +7716,7 @@ class P115Client(P115OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     ########## Download API ##########
 
@@ -9913,7 +9965,7 @@ class P115Client(P115OpenClient):
         :payload:
             - file_id: int | str
             - file_id[]: int | str
-            ...
+            - ...
             - file_id[0]: int | str
             - file_id[1]: int | str
             - ...
@@ -10520,7 +10572,7 @@ class P115Client(P115OpenClient):
 
         .. caution::
             这个接口有些问题，当 custom_order=1 时：
-            
+
                 1. 如果设定 limit=1 可能会报错
                 2. fc_mix 无论怎么设置，都和 fc_mix=0 的效果相同（即目录总是置顶），但设置为 custom_order=2 就好了
 
@@ -10960,6 +11012,8 @@ class P115Client(P115OpenClient):
             payload = {"fetch": "one", **payload}
         return self.request(url=api, params=payload, async_=async_, **request_kwargs)
 
+    fs_video_history = fs_files_history
+
     @overload
     def fs_files_history_set(
         self, 
@@ -11002,6 +11056,7 @@ class P115Client(P115OpenClient):
             - definition: int = <default> 💡 视频清晰度
             - share_id: int | str = <default>
             - time: int = <default> 💡 播放时间点（用来向服务器同步播放进度）
+            - watch_end: int = <default> 💡 视频是否播放播放完毕 0:未完毕 1:完毕
             - ...（其它未找全的参数）
         """
         api = complete_webapi("/files/history", base_url=base_url)
@@ -11011,6 +11066,8 @@ class P115Client(P115OpenClient):
             payload = {"op": "update", **payload}
         return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
 
+    fs_video_history_set = fs_files_history_set
+
     @overload
     def fs_files_second_type(
         self, 
@@ -12114,7 +12171,7 @@ class P115Client(P115OpenClient):
             - offset: int = 0    💡 索引偏移，索引从 0 开始计算
             - is_asc: 0 | 1 = <default> 💡 是否升序排列
             - next: 0 | 1 = <default>
-            - order: str = <default> 💡 用某字段排序            
+            - order: str = <default> 💡 用某字段排序
 
               - 文件名："file_name"
               - 文件大小："file_size"
@@ -12667,6 +12724,7 @@ class P115Client(P115OpenClient):
             为单个文件或目录，设置一个不存在的标签 id，比如 1，会清空标签，但可产生事件（批量设置时无事件，可能是 bug）
 
             .. code:: python
+
                 client.fs_label_set(id, 1)
         """
         return self._fs_edit_set(payload, "file_label", label, async_=async_, **request_kwargs)
@@ -12967,9 +13025,10 @@ class P115Client(P115OpenClient):
         """新建目录
 
         .. todo::
-            - name: str 💡 目录名
             待破解
 
+            - name: str 💡 目录名
+
         POST https://proapi.115.com/android/1.0/folder/update
         """
         api = complete_proapi("/folder/update", base_url, app)
@@ -13232,7 +13291,7 @@ class P115Client(P115OpenClient):
         GET https://proapi.115.com/android/music/musicplay
 
         .. note::
-            即使文件格式不正确或者过大（超过 200MB），也可返回一些信息（包括 parent_id），但如果是目录则信息匮乏（但由此也可判定一个目录）
+            即使文件格式不正确或者过大（超过 200 MB），也可返回一些信息（包括 parent_id），但如果是目录则信息匮乏（但由此也可判定一个目录）
 
         :payload:
             - pickcode: str 💡 提取码
@@ -15374,11 +15433,21 @@ class P115Client(P115OpenClient):
 
         GET https://webapi.115.com/files/video
 
+        .. caution::
+            `local` 在有些视频上不起作用，无论如何，都相当于 `local=0`，可能是因为文件超过 200 MB
+
+            但如果 `local=1` 有效，则返回仅可得到下载链接，key 为 "download_url"
+
         .. important::
             仅这几种设备可用：`harmony`, `web`, `desktop`, **wechatmini**, **alipaymini**, **tv**
 
             但是如果要获取 m3u8 文件，则要提供 web 设备的 cookies，否则返回空数据
 
+        .. note::
+            如果返回信息中有 "queue_url"，则可用于查询转码状态
+
+            如果视频从未被转码过，则会自动推送转码
+
         :payload:
             - pickcode: str 💡 提取码
             - share_id: int | str = <default> 💡 分享 id
@@ -15650,6 +15719,57 @@ class P115Client(P115OpenClient):
             payload = {"pickcode": payload}
         return self.request(url=api, params=payload, async_=async_, **request_kwargs)
 
+    @overload
+    def fs_video_transcode(
+        self, 
+        payload: dict | str, 
+        /, 
+        app: str = "web", 
+        base_url: bool | str | Callable[[], str] = False, 
+        method: str = "GET", 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def fs_video_transcode(
+        self, 
+        payload: dict | str, 
+        /, 
+        app: str = "web", 
+        base_url: bool | str | Callable[[], str] = False, 
+        method: str = "GET", 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def fs_video_transcode(
+        self, 
+        payload: dict | str, 
+        /, 
+        app: str = "web", 
+        base_url: bool | str | Callable[[], str] = False, 
+        method: str = "GET", 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """获取视频的转码进度
+
+        GET http://transcode.115.com/api/1.0/android/1.0/trans_code/check_transcode_job
+
+        :payload:
+            - sha1: str
+            - priority: int = 100 💡 优先级
+        """
+        api = complete_api(f"/api/1.0/{app}/1.0/trans_code/check_transcode_job", "transcode", base_url=base_url)
+        if isinstance(payload, str):
+            payload = {"sha1": payload}
+        payload.setdefault("priority", 100)
+        return self.request(url=api, method=method, params=payload, async_=async_, **request_kwargs)
+
     ########## Life API ##########
 
     @overload
@@ -16299,7 +16419,7 @@ class P115Client(P115OpenClient):
             if device is None:
                 return None
             return device["icon"]
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def login_open_auth_detail(
@@ -16823,7 +16943,7 @@ class P115Client(P115OpenClient):
                 return get_default_request()(url=api, async_=async_, **request_kwargs)
             else:
                 return request(url=api, **request_kwargs)
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def logout_by_ssoent(
@@ -21020,7 +21140,7 @@ class P115Client(P115OpenClient):
             if resp["state"]:
                 self.user_key = resp["data"]["userkey"]
             return resp
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def upload_resume(
@@ -21387,7 +21507,7 @@ class P115Client(P115OpenClient):
                 "pickcode": resp["pickcode"], 
             }
             return resp
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def upload_file_sample(
@@ -21523,7 +21643,7 @@ class P115Client(P115OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     # TODO: 分块上传时，允许一定次数的重试
     # TODO: 不妨单独为分块上传做一个封装
@@ -21885,7 +22005,7 @@ class P115Client(P115OpenClient):
                     async_=async_, # type: ignore
                     **request_kwargs, 
                 )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     ########## User API ##########
 
@@ -22921,13 +23041,22 @@ class P115Client(P115OpenClient):
         return self.request(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
 
 
-for name, method in P115Client.__dict__.items():
-    if not (callable(method) and method.__doc__):
-        continue
-    match = CRE_CLIENT_API_search(method.__doc__)
-    if match is not None:
-        CLIENT_API_MAP[match[1]] = "P115Client." + name
+with temp_globals():
+    CRE_CLIENT_API_search: Final = re_compile(r"^ +((?:GET|POST|PUT|DELETE|PATCH) .*)", MULTILINE).search
+    for name in dir(P115Client):
+        method = getattr(P115Client, name)
+        if not (callable(method) and method.__doc__):
+            continue
+        match = CRE_CLIENT_API_search(method.__doc__)
+        if match is not None:
+            api = match[1]
+            name = "P115Client." + name
+            CLIENT_METHOD_API_MAP[name] = api
+            try:
+                CLIENT_API_METHODS_MAP[api].append(name)
+            except KeyError:
+                CLIENT_API_METHODS_MAP[api] = [name]
+
 
 # TODO: 提供一个可随时终止和暂停的上传功能，并且可以输出进度条和获取进度
 # TODO: 更新一下，p115client._upload，做更多的封装，至少让断点续传更易于使用
-