From 9a77c8d2464e962e1fbe0200fe45bad4378f1a92 Mon Sep 17 00:00:00 2001
From: MingxuanGame <MingxuanGame@outlook.com>
Date: Thu, 2 Oct 2025 14:50:21 +0000
Subject: [PATCH] feat(beatmapset): use https://catboy.best as global
 downloading service

---
 app/router/v2/beatmapset.py             |  2 +-
 app/service/beatmap_download_service.py | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/router/v2/beatmapset.py b/app/router/v2/beatmapset.py
index f3c6166..01b5658 100644
--- a/app/router/v2/beatmapset.py
+++ b/app/router/v2/beatmapset.py
@@ -231,7 +231,7 @@ async def download_beatmapset(
                 f"https://dl.sayobot.cn/beatmaps/download/{'novideo' if no_video else 'full'}/{beatmapset_id}"
             )
         else:
-            return RedirectResponse(f"https://api.nerinyan.moe/d/{beatmapset_id}?noVideo={no_video}")
+            return RedirectResponse(f"https://catboy.best/d/{beatmapset_id}{'n' if no_video else ''}")
 
 
 @router.post(
diff --git a/app/service/beatmap_download_service.py b/app/service/beatmap_download_service.py
index c290277..4d82244 100644
--- a/app/service/beatmap_download_service.py
+++ b/app/service/beatmap_download_service.py
@@ -54,22 +54,31 @@ class BeatmapDownloadService:
 
         # 国外区域端点
         self.international_endpoints = [
+            DownloadEndpoint(
+                name="Catboy",
+                base_url="https://catboy.best",
+                health_check_url="https://catboy.best/api",
+                url_template="https://catboy.best/d/{sid}",
+                is_china=False,
+                priority=0,
+                timeout=10,
+            ),
             DownloadEndpoint(
                 name="Nerinyan",
                 base_url="https://api.nerinyan.moe",
                 health_check_url="https://api.nerinyan.moe/health",
                 url_template="https://api.nerinyan.moe/d/{sid}?noVideo={no_video}",
                 is_china=False,
-                priority=0,
+                priority=1,
                 timeout=10,
             ),
             DownloadEndpoint(
                 name="OsuDirect",
                 base_url="https://osu.direct",
                 health_check_url="https://osu.direct/api/status",
-                url_template="https://osu.direct/api/d/{sid}",
+                url_template="https://osu.direct/api/d/{sid}?noVideo={no_video}",
                 is_china=False,
-                priority=1,
+                priority=2,
                 timeout=10,
             ),
         ]
@@ -211,11 +220,10 @@ class BeatmapDownloadService:
         if endpoint.name == "Sayobot":
             video_type = "novideo" if no_video else "full"
             return endpoint.url_template.format(type=video_type, sid=beatmapset_id)
-        elif endpoint.name == "Nerinyan":
+        elif endpoint.name == "Nerinyan" or endpoint.name == "OsuDirect":
             return endpoint.url_template.format(sid=beatmapset_id, no_video="true" if no_video else "false")
-        elif endpoint.name == "OsuDirect":
-            # osu.direct 似乎没有no_video参数，直接使用基础URL
-            return endpoint.url_template.format(sid=beatmapset_id)
+        elif endpoint.name == "Catboy":
+            return endpoint.url_template.format(sid=f"{beatmapset_id}n" if no_video else beatmapset_id)
         else:
             # 默认处理
             return endpoint.url_template.format(sid=beatmapset_id)