nonebot-plugin-osubot 6.24.2__tar.gz → 6.25.0__tar.gz

{nonebot-plugin-osubot-6.24.2 → nonebot-plugin-osubot-6.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-osubot
-Version: 6.24.2
+Version: 6.25.0
 Summary: OSUbot in NoneBot2
 License: AGPL-3.0
 Author-email: yaowan233 <572473053@qq.com>

{nonebot-plugin-osubot-6.24.2 → nonebot-plugin-osubot-6.25.0}/nonebot_plugin_osubot/api.py

@@ -428,7 +428,7 @@ async def get_map_bg(mapid, sid, bg_name) -> BytesIO:
             f"https://dl.sayobot.cn/beatmaps/files/{sid}/{bg_name}",
         ]
     )
-    return BytesIO(res)
+    return BytesIO(res.content)
 
 
 async def get_seasonal_bg() -> Optional[dict]:

nonebot-plugin-osubot-6.25.0/nonebot_plugin_osubot/file.py

@@ -0,0 +1,297 @@
+import base64
+import hashlib
+import re
+import urllib
+import random
+import asyncio
+import uuid
+from pathlib import Path
+from typing import Union, Optional
+from io import BytesIO, TextIOWrapper
+
+from nonebot.adapters.onebot.v11 import Bot
+from nonebot.log import logger
+
+from .schema import Badge
+from .network import auto_retry
+from .api import bg_url, safe_async_get
+from .network.first_response import get_first_response
+
+osufile = Path(__file__).parent / "osufile"
+map_path = Path() / "data" / "osu" / "map"
+user_cache_path = Path() / "data" / "osu" / "user"
+badge_cache_path = Path() / "data" / "osu" / "badge"
+team_cache_path = Path() / "data" / "osu" / "team"
+api_ls = [
+    "https://osu.direct/api/d/",
+    "https://txy1.sayobot.cn/beatmaps/download/novideo/",
+    "https://catboy.best/d/",
+]
+semaphore = asyncio.Semaphore(5)
+
+if not map_path.exists():
+    map_path.mkdir(parents=True, exist_ok=True)
+if not user_cache_path.exists():
+    user_cache_path.mkdir(parents=True, exist_ok=True)
+if not badge_cache_path.exists():
+    badge_cache_path.mkdir(parents=True, exist_ok=True)
+if not team_cache_path.exists():
+    team_cache_path.mkdir(parents=True, exist_ok=True)
+
+
+def extract_filename_from_headers(headers: dict[str, str]) -> Optional[str]:
+    """
+    从 Content-Disposition 响应头中提取文件名，并处理 URL 编码。
+
+    Args:
+        headers: 响应头字典。
+
+    Returns:
+        提取到的文件名字符串，如果失败则返回 None。
+    """
+    disposition = headers.get("content-disposition", "")
+    if not disposition:
+        return None
+
+    match_utf8 = re.search(r"filename\*=(?:utf-8''|)(.+?)(?:;|$)", disposition, re.IGNORECASE)
+
+    if match_utf8:
+        # 提取匹配到的文件名部分
+        encoded_filename = match_utf8.group(1).strip('"').strip()
+
+        try:
+            return urllib.parse.unquote(encoded_filename)
+        except Exception as e:
+            # 如果解码失败，记录错误并尝试使用原始编码
+            print(f"警告: 解码 filename* 失败: {e}. 使用原始编码.")
+            return encoded_filename
+
+    match_normal = re.search(r"filename=\"?(.+?)\"?(\s|;|$)", disposition, re.IGNORECASE)
+    if match_normal:
+        # 普通 filename 字段也可能包含 URL 编码，进行解码
+        filename = match_normal.group(1).strip('"').strip()
+        try:
+            return urllib.parse.unquote(filename)
+        except Exception:
+            return filename
+
+    return None
+
+
+async def download_map(setid: int) -> Optional[Path]:
+    urls = [i + str(setid) for i in api_ls]
+    logger.info(f"开始下载地图: <{setid}>")
+    req = await get_first_response(urls)
+    filename = extract_filename_from_headers(req.headers)
+    filepath = map_path.parent / filename
+    with open(filepath.absolute(), "wb") as f:
+        f.write(req.content)
+    logger.info(f"地图: <{setid}> 下载完毕")
+    return filepath.absolute()
+
+
+@auto_retry
+async def download_osu(set_id, map_id):
+    url = [
+        f"https://osu.ppy.sh/osu/{map_id}",
+        f"https://osu.direct/api/osu/{map_id}",
+        f"https://catboy.best/osu/{map_id}",
+    ]
+    logger.info(f"开始下载谱面: <{map_id}>")
+    async with semaphore:
+        if req := await get_first_response(url):
+            filename = f"{map_id}.osu"
+            filepath = map_path / str(set_id) / filename
+            filepath.parent.mkdir(parents=True, exist_ok=True)
+            with open(filepath, "wb") as f:
+                f.write(req.content)
+            return filepath
+        else:
+            raise Exception("下载出错，请稍后再试")
+
+
+async def get_projectimg(url: str) -> BytesIO:
+    if "avatar-guest.png" in url:
+        url = "https://osu.ppy.sh/images/layout/avatar-guest.png"
+    req = await safe_async_get(url)
+    if not req or req.status_code >= 400:
+        # todo 加个自创的错误图片
+        req = await safe_async_get(random.choice(bg_url))
+        if not req or req.status_code >= 400:
+            raise Exception("图片下载失败")
+    data = req.read()
+    im = BytesIO(data)
+    return im
+
+
+async def get_pfm_img(url: str, cache_path: Path) -> BytesIO:
+    cache_dir = cache_path.parent
+    if not cache_dir.exists():
+        cache_dir.mkdir(parents=True, exist_ok=True)
+    if cache_path.exists():
+        with cache_path.open("rb") as f:
+            return BytesIO(f.read())
+    async with asyncio.Semaphore(5):
+        req = await safe_async_get(url)
+    if not req or req.status_code >= 400:
+        return BytesIO()
+    image_data = req.content
+    with cache_path.open("wb") as f:
+        f.write(image_data)
+    return BytesIO(image_data)
+
+
+def re_map(file: Union[bytes, Path]) -> str:
+    if isinstance(file, bytes):
+        text = TextIOWrapper(BytesIO(file), "utf-8").read()
+    else:
+        with open(file, encoding="utf-8") as f:
+            text = f.read()
+    res = re.search(r"\d,\d,\"(.+)\"", text)
+    bg = "mapbg.png" if not res else res.group(1).strip()
+    if "/" in bg:
+        bg = bg.split("/")[-1]
+    return bg
+
+
+async def make_badge_cache_file(badge: Badge):
+    path = badge_cache_path / f"{hash(badge.description)}.png"
+    badge_icon = await get_projectimg(badge.image_url)
+    with open(path, "wb") as f:
+        f.write(badge_icon.getvalue())
+
+
+# 保存个人信息界面背景
+async def save_info_pic(user: str, byt: bytes):
+    path = user_cache_path / user
+    if not path.exists():
+        path.mkdir()
+    with open(path / "info.png", "wb") as f:
+        f.write(BytesIO(byt).getvalue())
+
+
+def calculate_file_chunks(file_path: str, chunk_size: int = 1024 * 64) -> tuple[list[bytes], str, int]:
+    """
+    计算文件分片和 SHA256
+
+    Args:
+        file_path: 文件路径
+        chunk_size: 分片大小（默认64KB）
+
+    Returns:
+        (chunks, sha256_hash, total_size)
+    """
+    chunks = []
+    hasher = hashlib.sha256()
+    total_size = 0
+
+    with open(file_path, "rb") as f:
+        while True:
+            chunk = f.read(chunk_size)
+            if not chunk:
+                break
+            chunks.append(chunk)
+            hasher.update(chunk)
+            total_size += len(chunk)
+
+    sha256_hash = hasher.hexdigest()
+
+    return chunks, sha256_hash, total_size
+
+
+MAX_CONCURRENT_UPLOADS = 20
+
+
+async def _upload_chunk(
+    bot: "Bot",
+    stream_id: str,
+    chunk_data: bytes,
+    chunk_index: int,
+    total_chunks: int,
+    total_size: int,
+    sha256_hash: str,
+    filename: str,
+    semaphore: asyncio.Semaphore,
+) -> None:
+    """内部函数，用于异步上传单个文件分片"""
+    async with semaphore:
+        # 将分片数据编码为 base64
+        chunk_base64 = base64.b64encode(chunk_data).decode("utf-8")
+
+        # 构建参数
+        params = {
+            "stream_id": stream_id,
+            "chunk_data": chunk_base64,
+            "chunk_index": chunk_index,
+            "total_chunks": total_chunks,
+            "file_size": total_size,
+            "expected_sha256": sha256_hash,
+            "filename": filename,
+            "file_retention": 30 * 1000,
+        }
+
+        # 发送分片
+        response = await bot.call_api("upload_file_stream", **params)
+
+        logger.info(
+            f"分片 {chunk_index + 1}/{total_chunks} 上传成功 "
+            f"(接收: {response.get('received_chunks', 0)}/{response.get('total_chunks', 0)})"
+        )
+
+
+async def upload_file_stream_batch(bot: Bot, file_path: Path, chunk_size: int = 1024 * 64) -> str:
+    """
+    一次性批量上传文件流
+
+    Args:
+        bot: Bot 实例
+        file_path: 要上传的文件路径
+        chunk_size: 分片大小
+
+    Returns:
+        上传完成后的文件路径
+    """
+    if not file_path.exists():
+        raise FileNotFoundError(f"文件不存在: {file_path}")
+
+    # 分析文件
+    chunks, sha256_hash, total_size = calculate_file_chunks(str(file_path), chunk_size)
+    stream_id = str(uuid.uuid4())
+
+    logger.info(f"\n开始上传文件: {file_path.name}")
+    logger.info(f"流ID: {stream_id}")
+
+    # 一次性发送所有分片
+    total_chunks = len(chunks)
+    # 创建信号量，限制最大并发数
+    semaphore = asyncio.Semaphore(MAX_CONCURRENT_UPLOADS)
+
+    # 创建所有分片上传任务
+    upload_tasks = []
+    for chunk_index, chunk_data in enumerate(chunks):
+        task = _upload_chunk(
+            bot, stream_id, chunk_data, chunk_index, total_chunks, total_size, sha256_hash, file_path.name, semaphore
+        )
+        upload_tasks.append(task)
+
+    try:
+        await asyncio.gather(*upload_tasks)
+    except Exception as e:
+        logger.error(f"\n文件分片上传过程中发生错误: {e}")
+        # 这里可以选择执行清理逻辑，如通知服务器取消上传
+        raise e
+
+    # 发送完成信号
+    logger.info("\n所有分片发送完成，请求文件合并...")
+    complete_params = {"stream_id": stream_id, "is_complete": True}
+
+    response = await bot.call_api("upload_file_stream", **complete_params)
+
+    if response.get("status") == "file_complete":
+        logger.info("✅ 文件上传成功!")
+        logger.info(f"  - 文件路径: {response.get('file_path')}")
+        logger.info(f"  - 文件大小: {response.get('file_size')} 字节")
+        logger.info(f"  - SHA256: {response.get('sha256')}")
+        return response.get("file_path")
+    else:
+        raise Exception(f"文件状态异常: {response}")

{nonebot-plugin-osubot-6.24.2 → nonebot-plugin-osubot-6.25.0}/nonebot_plugin_osubot/matcher/__init__.py

@@ -5,6 +5,7 @@ from .getbg import getbg
 from .match import match
 from .medal import medal
 from .score import score
+from .osudl import osudl
 from .pr import pr, recent
 from .rating import rating
 from .history import history
@@ -57,4 +58,5 @@ __all__ = [
     "match",
     "rating",
     "group_pp_rank",
+    "osudl",
 ]

{nonebot-plugin-osubot-6.24.2 → nonebot-plugin-osubot-6.25.0}/nonebot_plugin_osubot/matcher/map_convert.py

@@ -1,5 +1,6 @@
 from pathlib import Path
 
+from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent
 from nonebot.rule import ArgumentParser
 from nonebot.internal.adapter import Message
 from nonebot_plugin_alconna import UniMessage
@@ -10,6 +11,7 @@ from nonebot.params import CommandArg, ShellCommandArgv
 from ..api import get_beatmapsets_info, osu_api
 from ..mania import Options, convert_mania_map
 from ..schema import Beatmap
+from ..file import upload_file_stream_batch
 
 parser = ArgumentParser("convert", description="变换mania谱面")
 parser.add_argument("--set", type=int, help="要转换的谱面的setid")
@@ -38,7 +40,7 @@ async def _(argv: list[str] = ShellCommandArgv()):
         return
     options = Options(**vars(args))
     if options.map:
-        map_data = await osu_api("map", options.map)
+        map_data = await osu_api("map", map_id=options.map)
         mapinfo = Beatmap(**map_data)
         beatmapsets_info = await get_beatmapsets_info(mapinfo.beatmapset_id)
         options.set = mapinfo.beatmapset_id
@@ -67,7 +69,7 @@ change = on_command("倍速", priority=11, block=True)
 
 
 @change.handle()
-async def _(msg: Message = CommandArg()):
+async def _(bot: Bot, event: GroupMessageEvent, msg: Message = CommandArg()):
     args = msg.extract_plain_text().strip().split()
     argv = ["--map"]
     if not args:
@@ -88,7 +90,7 @@ async def _(msg: Message = CommandArg()):
     args = parser.parse_args(argv)
     options = Options(**vars(args))
     if options.map:
-        map_data = await osu_api("map", options.map)
+        map_data = await osu_api("map", map_id=options.map)
         mapinfo = Beatmap(**map_data)
         beatmapsets_info = await get_beatmapsets_info(mapinfo.beatmapset_id)
         options.set = mapinfo.beatmapset_id
@@ -97,9 +99,10 @@ async def _(msg: Message = CommandArg()):
     if not osz_path:
         await UniMessage.text("未找到该地图，请检查是否搞混了mapID与setID").finish(reply_to=True)
     file_path = osz_path.absolute()
+    server_osz_path = await upload_file_stream_batch(bot, file_path)
+
     try:
-        with open(file_path, "rb") as f:
-            await UniMessage.file(raw=f.read()).send()
+        await bot.call_api("upload_group_file", group_id=event.group_id, file=server_osz_path, name=osz_path.name)
     except ActionFailed:
         await UniMessage.text("上传文件失败，可能是群空间满或没有权限导致的").send(reply_to=True)
     finally:
@@ -113,7 +116,7 @@ generate_full_ln = on_command("反键", priority=11, block=True)
 
 
 @generate_full_ln.handle()
-async def _(msg: Message = CommandArg()):
+async def _(bot: Bot, event: GroupMessageEvent, msg: Message = CommandArg()):
     args = msg.extract_plain_text().strip().split()
     if not args:
         await UniMessage.text("请输入需要转ln的地图setID").finish(reply_to=True)
@@ -133,9 +136,9 @@ async def _(msg: Message = CommandArg()):
     if not osz_path:
         await UniMessage.text("未找到该地图，请检查是否搞混了mapID与setID").finish(reply_to=True)
     file_path = osz_path.absolute()
+    server_osz_path = await upload_file_stream_batch(bot, file_path)
     try:
-        with open(file_path, "rb") as f:
-            await UniMessage.file(raw=f.read()).send()
+        await bot.call_api("upload_group_file", group_id=event.group_id, file=server_osz_path, name=osz_path.name)
     except ActionFailed:
         await UniMessage.text("上传文件失败，可能是群空间满或没有权限导致的").send(reply_to=True)
     finally:

{nonebot-plugin-osubot-6.24.2 → nonebot-plugin-osubot-6.25.0}/nonebot_plugin_osubot/matcher/osudl.py

@@ -1,22 +1,23 @@
 from nonebot import on_command
+from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent
 from nonebot.params import CommandArg
 from nonebot.internal.adapter import Message
 from nonebot_plugin_alconna import UniMessage
 
-from ..file import download_map
+from ..file import download_map, upload_file_stream_batch
 
 osudl = on_command("osudl", priority=11, block=True)
 
 
 @osudl.handle()
-async def _osudl(setid: Message = CommandArg()):
+async def _osudl(bot: Bot, event: GroupMessageEvent, setid: Message = CommandArg()):
     setid = setid.extract_plain_text().strip()
     if not setid or not setid.isdigit():
         await UniMessage.text("请输入正确的地图ID").send(reply_to=True)
     osz_path = await download_map(int(setid))
-    file_path = osz_path.absolute()
+    server_osz_path = await upload_file_stream_batch(bot, osz_path)
     try:
-        await UniMessage.file(path=file_path).send()
+        await bot.call_api("upload_group_file", group_id=event.group_id, file=server_osz_path, name=osz_path.name)
     except Exception:
         await UniMessage.text("上传文件失败，可能是群空间满或没有权限导致的").send(reply_to=True)
     finally:

{nonebot-plugin-osubot-6.24.2 → nonebot-plugin-osubot-6.25.0}/nonebot_plugin_osubot/matcher/recommend.py

@@ -43,7 +43,7 @@ async def handle_recommend(state: T_State, matcher: type[Matcher]):
         await matcher.finish("今天已经没有可以推荐的图啦，明天再来吧")
         return None
     bid = int(re.findall("https://osu.ppy.sh/beatmaps/(.*)", recommend_map.mapLink)[0])
-    map_data = await osu_api("map", bid)
+    map_data = await osu_api("map", map_id=bid)
     map_info = Beatmap(**map_data)
     sid = map_info.beatmapset_id
     s = (

{nonebot-plugin-osubot-6.24.2 → nonebot-plugin-osubot-6.25.0}/nonebot_plugin_osubot/network/first_response.py

@@ -25,6 +25,6 @@ async def get_first_response(urls: list[str]):
             for task in done:
                 response = task.result()
                 if response is not None and response.status_code == 200:
-                    return response.content
+                    return response
             tasks = [task for task in tasks if not task.done()]
         return None

{nonebot-plugin-osubot-6.24.2 → nonebot-plugin-osubot-6.25.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-osubot"
-version = "6.24.2"
+version = "6.25.0"
 description = "OSUbot in NoneBot2"
 authors = [
     { name = "yaowan233", email = "572473053@qq.com" },
@@ -22,6 +22,7 @@ dependencies = [
     "matplotlib>=3.7.1",
     "nonebot-plugin-htmlrender>=0.3.1",
     "nonebot-plugin-waiter>=0.6.1",
+    "nonebot-adapter-onebot>=2.4.6",
 ]
 requires-python = ">=3.9.8,<3.13"
 readme = "README.md"

nonebot-plugin-osubot-6.24.2/nonebot_plugin_osubot/file.py

@@ -1,127 +0,0 @@
-import re
-import random
-import asyncio
-from pathlib import Path
-from typing import Union, Optional
-from io import BytesIO, TextIOWrapper
-
-from nonebot.log import logger
-
-from .schema import Badge
-from .network import auto_retry
-from .api import bg_url, safe_async_get
-from .network.first_response import get_first_response
-
-osufile = Path(__file__).parent / "osufile"
-map_path = Path() / "data" / "osu" / "map"
-user_cache_path = Path() / "data" / "osu" / "user"
-badge_cache_path = Path() / "data" / "osu" / "badge"
-team_cache_path = Path() / "data" / "osu" / "team"
-api_ls = [
-    "https://api.chimu.moe/v1/download/",
-    "https://osu.direct/api/d/",
-    "https://txy1.sayobot.cn/beatmaps/download/novideo/",
-    "https://catboy.best/d/",
-]
-semaphore = asyncio.Semaphore(5)
-
-if not map_path.exists():
-    map_path.mkdir(parents=True, exist_ok=True)
-if not user_cache_path.exists():
-    user_cache_path.mkdir(parents=True, exist_ok=True)
-if not badge_cache_path.exists():
-    badge_cache_path.mkdir(parents=True, exist_ok=True)
-if not team_cache_path.exists():
-    team_cache_path.mkdir(parents=True, exist_ok=True)
-
-
-async def download_map(setid: int) -> Optional[Path]:
-    urls = [i + str(setid) for i in api_ls]
-    logger.info(f"开始下载地图: <{setid}>")
-    req = await get_first_response(urls)
-    filename = f"{setid}.osz"
-    filepath = map_path.parent / filename
-    with open(filepath, "wb") as f:
-        f.write(req.read())
-    logger.info(f"地图: <{setid}> 下载完毕")
-    return filepath
-
-
-@auto_retry
-async def download_osu(set_id, map_id):
-    url = [
-        f"https://osu.ppy.sh/osu/{map_id}",
-        f"https://osu.direct/api/osu/{map_id}",
-        f"https://catboy.best/osu/{map_id}",
-    ]
-    logger.info(f"开始下载谱面: <{map_id}>")
-    async with semaphore:
-        if req := await get_first_response(url):
-            filename = f"{map_id}.osu"
-            filepath = map_path / str(set_id) / filename
-            filepath.parent.mkdir(parents=True, exist_ok=True)
-            with open(filepath, "wb") as f:
-                f.write(req)
-            return filepath
-        else:
-            raise Exception("下载出错，请稍后再试")
-
-
-async def get_projectimg(url: str) -> BytesIO:
-    if "avatar-guest.png" in url:
-        url = "https://osu.ppy.sh/images/layout/avatar-guest.png"
-    req = await safe_async_get(url)
-    if not req or req.status_code >= 400:
-        # todo 加个自创的错误图片
-        req = await safe_async_get(random.choice(bg_url))
-        if not req or req.status_code >= 400:
-            raise Exception("图片下载失败")
-    data = req.read()
-    im = BytesIO(data)
-    return im
-
-
-async def get_pfm_img(url: str, cache_path: Path) -> BytesIO:
-    cache_dir = cache_path.parent
-    if not cache_dir.exists():
-        cache_dir.mkdir(parents=True, exist_ok=True)
-    if cache_path.exists():
-        with cache_path.open("rb") as f:
-            return BytesIO(f.read())
-    async with asyncio.Semaphore(5):
-        req = await safe_async_get(url)
-    if not req or req.status_code >= 400:
-        return BytesIO()
-    image_data = req.content
-    with cache_path.open("wb") as f:
-        f.write(image_data)
-    return BytesIO(image_data)
-
-
-def re_map(file: Union[bytes, Path]) -> str:
-    if isinstance(file, bytes):
-        text = TextIOWrapper(BytesIO(file), "utf-8").read()
-    else:
-        with open(file, encoding="utf-8") as f:
-            text = f.read()
-    res = re.search(r"\d,\d,\"(.+)\"", text)
-    bg = "mapbg.png" if not res else res.group(1).strip()
-    if "/" in bg:
-        bg = bg.split("/")[-1]
-    return bg
-
-
-async def make_badge_cache_file(badge: Badge):
-    path = badge_cache_path / f"{hash(badge.description)}.png"
-    badge_icon = await get_projectimg(badge.image_url)
-    with open(path, "wb") as f:
-        f.write(badge_icon.getvalue())
-
-
-# 保存个人信息界面背景
-async def save_info_pic(user: str, byt: bytes):
-    path = user_cache_path / user
-    if not path.exists():
-        path.mkdir()
-    with open(path / "info.png", "wb") as f:
-        f.write(BytesIO(byt).getvalue())