nonebot-plugin-osubot 6.18.1__tar.gz → 6.20.0__tar.gz

{nonebot-plugin-osubot-6.18.1 → nonebot-plugin-osubot-6.20.0}/PKG-INFO

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

{nonebot-plugin-osubot-6.18.1 → nonebot-plugin-osubot-6.20.0}/nonebot_plugin_osubot/api.py

@@ -1,3 +1,4 @@
+import asyncio
 import random
 from io import BytesIO
 from urllib.parse import urlencode
@@ -73,6 +74,58 @@ async def get_headers() -> dict[str, str]:
     return {"Authorization": f"Bearer {token}", "x-api-version": "20220705"}
 
 
+async def fetch_score_batch(
+    uid: Union[int, str],
+    mode: str,
+    scope: str,
+    batch_size: int,
+    offset: int,
+    legacy_only: bool,
+    include_failed: bool,
+) -> list[UnifiedScore]:
+    """并发获取单次批次数据"""
+    url = (
+        f"{api}/users/{uid}/scores/{scope}?mode={mode}&limit={batch_size}"
+        f"&offset={offset}&legacy_only={int(legacy_only)}"
+        f"&include_fails={int(include_failed)}"
+    )
+    data = await make_request(url, await get_headers(), "未找到该玩家BP")
+    if not data:
+        return []
+    scores = [NewScore(**i) for i in data]
+    return [
+        UnifiedScore(
+            mods=i.mods,
+            ruleset_id=i.ruleset_id,
+            rank=i.rank,
+            accuracy=i.accuracy * 100,
+            total_score=i.total_score,
+            ended_at=datetime.strptime(i.ended_at.replace("Z", ""), "%Y-%m-%dT%H:%M:%S") + timedelta(hours=8),
+            max_combo=i.max_combo,
+            statistics=i.statistics,
+            legacy_total_score=i.legacy_total_score,
+            passed=i.passed,
+            beatmap=UnifiedBeatmap(
+                id=i.beatmap_id,
+                set_id=i.beatmapset.id,
+                artist=i.beatmapset.artist,
+                title=i.beatmapset.title,
+                version=i.beatmap.version,
+                creator=i.beatmapset.creator,
+                total_length=i.beatmap.total_length,
+                mode=i.beatmap.mode_int,
+                bpm=i.beatmap.bpm,
+                cs=i.beatmap.cs,
+                ar=i.beatmap.ar,
+                hp=i.beatmap.drain,
+                od=i.beatmap.accuracy,
+                stars=i.beatmap.difficulty_rating,
+            ),
+        )
+        for i in scores
+    ]
+
+
 async def get_user_scores(
     uid: Union[int, str],
     mode: str,
@@ -81,47 +134,40 @@ async def get_user_scores(
     legacy_only: bool = 0,
     include_failed: bool = True,
     offset: int = 0,
-    limit: int = 100,
+    limit: int = 200,
 ) -> list[UnifiedScore]:
     if source == "osu":
-        url = (
-            f"{api}/users/{uid}/scores/{scope}?mode={mode}&limit={limit}&legacy_only={int(legacy_only)}"
-            f"&offset={offset}&include_fails={int(include_failed)}"
-        )
-        data = await make_request(url, await get_headers(), "未找到该玩家BP")
-        scores = [NewScore(**i) for i in data]
-        unified_scores = [
-            UnifiedScore(
-                mods=i.mods,
-                ruleset_id=i.ruleset_id,
-                rank=i.rank,
-                accuracy=i.accuracy * 100,
-                total_score=i.total_score,
-                ended_at=datetime.strptime(i.ended_at.replace("Z", ""), "%Y-%m-%dT%H:%M:%S") + timedelta(hours=8),
-                max_combo=i.max_combo,
-                statistics=i.statistics,
-                legacy_total_score=i.legacy_total_score,
-                passed=i.passed,
-                beatmap=UnifiedBeatmap(
-                    id=i.beatmap_id,
-                    set_id=i.beatmapset.id,
-                    artist=i.beatmapset.artist,
-                    title=i.beatmapset.title,
-                    version=i.beatmap.version,
-                    creator=i.beatmapset.creator,
-                    total_length=i.beatmap.total_length,
-                    mode=i.beatmap.mode_int,
-                    bpm=i.beatmap.bpm,
-                    cs=i.beatmap.cs,
-                    ar=i.beatmap.ar,
-                    hp=i.beatmap.drain,
-                    od=i.beatmap.accuracy,
-                    stars=i.beatmap.difficulty_rating,
-                ),
-            )
-            for i in scores
-        ]
-        return unified_scores
+        if limit <= 0:
+            return []
+
+        # 计算需要多少次请求
+        # 计算需要多少批次
+        batch_size = 100
+        total_batches = (limit + batch_size - 1) // batch_size  # ceiling(limit/batch_size)
+        all_scores = []
+        # 分批并发请求
+        for batch_idx in range(0, total_batches, 2):
+            current_batches = range(batch_idx, min(batch_idx + 2, total_batches))
+
+            # 生成 tasks（并发执行）
+            tasks = []
+            for batch_n in current_batches:
+                offset = batch_n * batch_size
+                actual_batch_size = min(batch_size, limit - len(all_scores) - offset)
+
+                if actual_batch_size <= 0:
+                    continue  # 已获取足够数据
+
+                task = fetch_score_batch(uid, mode, scope, actual_batch_size, offset, legacy_only, include_failed)
+                tasks.append(task)
+            # 并发请求当前批次
+            batch_results = await asyncio.gather(*tasks)
+
+            for batch_scores in batch_results:
+                all_scores.extend(batch_scores)
+                if len(all_scores) >= limit:
+                    return all_scores[:limit]  # 提前终止
+        return all_scores[:limit]
 
     elif source == "ppysb":
         url = f"https://api.ppy.sb/v1/get_player_scores?scope={scope}&id={uid}&mode={FGM[mode]}&limit={limit}&include_failed={int(include_failed)}"

{nonebot-plugin-osubot-6.18.1 → nonebot-plugin-osubot-6.20.0}/nonebot_plugin_osubot/draw/score.py

@@ -27,6 +27,7 @@ from .utils import (
     get_modeimage,
     open_user_icon,
     filter_scores_with_regex,
+    trim_text_with_ellipsis,
 )
 from .static import (
     Image,
@@ -398,9 +399,18 @@ async def draw_score_pic(score_info: UnifiedScore, info: UnifiedUser, map_json,
         anchor="lm",
     )
     # 谱面版本，mapper
+    if mapinfo.owners:
+        owner_names = [owner.username for owner in mapinfo.owners]
+        owners_str = ", ".join(owner_names)
+        mapper = f"{mapinfo.version} | 谱师: {owners_str}"
+
+    else:
+        mapper = f"{mapinfo.version} | 谱师: {mapinfo.beatmapset.creator}"
+    mapper = trim_text_with_ellipsis(mapper, 1000, Torus_SemiBold_20)
+
     draw.text(
         (225, 90),
-        f"{mapinfo.version} | 谱师: {mapinfo.beatmapset.creator}",
+        mapper,
         font=Torus_SemiBold_20,
         anchor="lm",
     )

{nonebot-plugin-osubot-6.18.1 → nonebot-plugin-osubot-6.20.0}/nonebot_plugin_osubot/draw/utils.py

@@ -267,18 +267,18 @@ async def update_icon(info: UnifiedUser):
                 user_icon = await get_projectimg(info.avatar_url)
                 with open(path / f"icon.{info.avatar_url.split('.')[-1]}", "wb") as f:
                     f.write(user_icon.getvalue())
-
-    team_path = team_cache_path / f"{info.team.id}.png"
-    if team_path.exists():
-        modified_time = team_path.stat().st_mtime
-        modified_datetime = datetime.datetime.fromtimestamp(modified_time)
-        time_diff = datetime.datetime.now() - modified_datetime
-        # 判断文件是否创建超过一天
-        if time_diff > datetime.timedelta(days=1):
-            team_path.unlink()
-            team_icon = await get_projectimg(info.team.flag_url)
-            with open(team_path, "wb") as f:
-                f.write(team_icon.getvalue())
+    if info.team:
+        team_path = team_cache_path / f"{info.team.id}.png"
+        if team_path.exists():
+            modified_time = team_path.stat().st_mtime
+            modified_datetime = datetime.datetime.fromtimestamp(modified_time)
+            time_diff = datetime.datetime.now() - modified_datetime
+            # 判断文件是否创建超过一天
+            if time_diff > datetime.timedelta(days=1):
+                team_path.unlink()
+                team_icon = await get_projectimg(info.team.flag_url)
+                with open(team_path, "wb") as f:
+                    f.write(team_icon.getvalue())
 
 
 async def update_map(set_id, map_id):
@@ -410,3 +410,31 @@ def filter_scores_with_regex(scores_with_index, conditions):
             score for score in scores_with_index if matches_condition_with_regex(score, key, operator, value)
         ]
     return scores_with_index
+
+
+def trim_text_with_ellipsis(text, max_width, font):
+    # 初始检查：空字符串或无需处理
+    bbox = font.getbbox(text)
+    text_width = bbox[2] - bbox[0]
+    if not text or text_width <= max_width:
+        return text
+    # 逐字符检查
+    ellipsis_symbol = "…"
+    ellipsis_width = font.getbbox("…")[2] - font.getbbox("…")[0]
+    # 确保最大宽度能至少容纳一个字符+省略号
+    if max_width < font.getbbox("A")[2] - font.getbbox("A")[0] + ellipsis_width:
+        return ellipsis_symbol
+
+    truncated_text = ""
+    current_width = 0
+
+    for char in text:
+        # 检查当前字符宽度 + 省略号宽度是否超标
+        char_width = font.getbbox(char)[2] - font.getbbox(char)[0]
+        if current_width + char_width + ellipsis_width > max_width:
+            break
+        truncated_text += char
+        current_width += char_width
+
+    # 返回截断后的字符串 + 省略号
+    return truncated_text + ellipsis_symbol if truncated_text else ellipsis_symbol

{nonebot-plugin-osubot-6.18.1 → nonebot-plugin-osubot-6.20.0}/nonebot_plugin_osubot/matcher/bp.py

@@ -25,8 +25,8 @@ async def _bp(state: T_State):
     if not best.isdigit():
         await UniMessage.text("只能接受纯数字的bp参数").finish(reply_to=True)
     best = int(best)
-    if best <= 0 or best > 100:
-        await UniMessage.text("只允许查询bp 1-100 的成绩").finish(reply_to=True)
+    if best <= 0 or best > 200:
+        await UniMessage.text("只允许查询bp 1-200 的成绩").finish(reply_to=True)
     try:
         data = await draw_score(
             "bp",
@@ -52,11 +52,11 @@ async def _pfm(state: T_State):
     if "error" in state:
         await UniMessage.text(state["error"]).finish(reply_to=True)
     if not state["range"]:
-        state["range"] = "1-100"
+        state["range"] = "1-200"
     ls = state["range"].split("-")
     low, high = int(ls[0]), int(ls[1])
-    if not 0 < low < high <= 100:
-        await UniMessage.text("仅支持查询bp1-100").finish(reply_to=True)
+    if not 0 < low < high <= 200:
+        await UniMessage.text("仅支持查询bp1-200").finish(reply_to=True)
     try:
         data = await draw_bp(
             "bp",
@@ -84,11 +84,11 @@ async def _tbp(state: T_State):
     if "error" in state:
         await UniMessage.text(state["error"]).finish(reply_to=True)
     if not state["range"]:
-        state["range"] = "1-100"
+        state["range"] = "1-200"
     ls = state["range"].split("-")
     low, high = int(ls[0]), int(ls[1])
-    if not 0 < low < high <= 100:
-        await UniMessage.text("仅支持查询bp1-100").finish(reply_to=True)
+    if not 0 < low < high <= 200:
+        await UniMessage.text("仅支持查询bp1-200").finish(reply_to=True)
     try:
         data = await draw_bp(
             "tbp",

{nonebot-plugin-osubot-6.18.1 → nonebot-plugin-osubot-6.20.0}/nonebot_plugin_osubot/schema/beatmap.py

@@ -11,6 +11,11 @@ class Covers(Base):
     slimcover: str
 
 
+class Gds(Base):
+    id: int
+    username: str
+
+
 class BeatmapsetCompact(Base):
     artist: str
     artist_unicode: str
@@ -78,6 +83,7 @@ class Beatmap(BeatmapCompact):
     playcount: int
     ranked: int
     url: str
+    owners: Optional[list[Gds]] = None
 
 
 class BackgroundsAttributes(Base):

{nonebot-plugin-osubot-6.18.1 → nonebot-plugin-osubot-6.20.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-osubot"
-version = "6.18.1"
+version = "6.20.0"
 description = "OSUbot in NoneBot2"
 authors = [
     { name = "yaowan233", email = "572473053@qq.com" },
@@ -15,7 +15,7 @@ dependencies = [
     "nonebot-plugin-apscheduler>=0.4.0",
     "tortoise-orm>=0.20.0",
     "nonebot-plugin-tortoise-orm>=0.1.4",
-    "rosu-pp-py==2.0.1",
+    "rosu-pp-py==3.0.0",
     "reamber>=0.2.1",
     "httpx>=0.23.3",
     "typing_extensions>=4.11.0",