feat(beatmap,score): update beatmaps from Bancho & deleting scores (#50)
New API:
- DELETE /api/private/score/{score_id}: delete a score
- POST /api/private/beatmapsets/{beatmapset_id}/sync: request for syncing a beatmapset
New configuration:
- OLD_SCORE_PROCESSING_MODE
This commit is contained in:
@@ -2,7 +2,7 @@ from __future__ import annotations
|
||||
|
||||
from app.config import settings
|
||||
|
||||
from . import audio_proxy, avatar, beatmapset_ratings, cover, oauth, relationship, team, username # noqa: F401
|
||||
from . import audio_proxy, avatar, beatmapset, cover, oauth, relationship, score, team, username # noqa: F401
|
||||
from .router import router as private_router
|
||||
|
||||
if settings.enable_totp_verification:
|
||||
|
||||
@@ -7,10 +7,12 @@ from app.database.lazer_user import User
|
||||
from app.database.score import Score
|
||||
from app.dependencies.database import Database
|
||||
from app.dependencies.user import get_client_user
|
||||
from app.service.beatmapset_update_service import get_beatmapset_update_service
|
||||
|
||||
from .router import router
|
||||
|
||||
from fastapi import Body, HTTPException, Security
|
||||
from fastapi import Body, Depends, HTTPException, Security
|
||||
from fastapi_limiter.depends import RateLimiter
|
||||
from sqlmodel import col, exists, select
|
||||
|
||||
|
||||
@@ -82,3 +84,36 @@ async def rate_beatmaps(
|
||||
new_rating: BeatmapRating = BeatmapRating(beatmapset_id=beatmapset_id, user_id=user_id, rating=rating)
|
||||
session.add(new_rating)
|
||||
await session.commit()
|
||||
|
||||
|
||||
@router.post(
|
||||
"/beatmapsets/{beatmapset_id}/sync",
|
||||
name="请求同步谱面集",
|
||||
status_code=202,
|
||||
tags=["谱面集", "g0v0 API"],
|
||||
dependencies=[Depends(RateLimiter(times=50, hours=1))],
|
||||
)
|
||||
async def sync_beatmapset(
|
||||
beatmapset_id: int,
|
||||
session: Database,
|
||||
current_user: User = Security(get_client_user),
|
||||
):
|
||||
"""请求同步谱面集
|
||||
|
||||
请求将指定的谱面集从 Bancho 同步到服务器
|
||||
|
||||
请求发送后会加入同步队列,等待自动同步
|
||||
|
||||
速率限制:
|
||||
- 每个用户每小时最多50次请求
|
||||
|
||||
参数:
|
||||
- beatmapset_id: 谱面集ID
|
||||
|
||||
错误情况:
|
||||
- 404: 找不到指定谱面集
|
||||
"""
|
||||
current_beatmapset = (await session.exec(select(exists()).where(Beatmapset.id == beatmapset_id))).first()
|
||||
if not current_beatmapset:
|
||||
raise HTTPException(404, "Beatmapset Not Found")
|
||||
await get_beatmapset_update_service().add_missing_beatmapset(beatmapset_id)
|
||||
49
app/router/private/score.py
Normal file
49
app/router/private/score.py
Normal file
@@ -0,0 +1,49 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from app.database.lazer_user import User
|
||||
from app.database.score import Score
|
||||
from app.dependencies.database import Database, get_redis
|
||||
from app.dependencies.storage import get_storage_service
|
||||
from app.dependencies.user import get_client_user
|
||||
from app.service.user_cache_service import refresh_user_cache_background
|
||||
from app.storage.base import StorageService
|
||||
|
||||
from .router import router
|
||||
|
||||
from fastapi import BackgroundTasks, Depends, HTTPException, Security
|
||||
from redis.asyncio import Redis
|
||||
|
||||
|
||||
@router.delete(
|
||||
"/score/{score_id}",
|
||||
name="删除指定ID的成绩",
|
||||
tags=["成绩", "g0v0 API"],
|
||||
status_code=204,
|
||||
)
|
||||
async def delete_score(
|
||||
session: Database,
|
||||
background_task: BackgroundTasks,
|
||||
score_id: int,
|
||||
redis: Redis = Depends(get_redis),
|
||||
current_user: User = Security(get_client_user),
|
||||
storage_service: StorageService = Depends(get_storage_service),
|
||||
):
|
||||
"""删除成绩
|
||||
|
||||
删除成绩,同时删除对应的统计信息、排行榜分数、pp、回放文件
|
||||
|
||||
参数:
|
||||
- score_id: 成绩ID
|
||||
|
||||
错误情况:
|
||||
- 404: 找不到指定成绩
|
||||
"""
|
||||
score = await session.get(Score, score_id)
|
||||
if not score or score.user_id != current_user.id:
|
||||
raise HTTPException(status_code=404, detail="找不到指定成绩")
|
||||
|
||||
gamemode = score.gamemode
|
||||
user_id = score.user_id
|
||||
await score.delete(session, storage_service)
|
||||
await session.commit()
|
||||
background_task.add_task(refresh_user_cache_background, redis, user_id, gamemode)
|
||||
@@ -69,7 +69,7 @@ async def download_replay(
|
||||
except KeyError:
|
||||
raise HTTPException(status_code=400, detail="Invalid request")
|
||||
|
||||
filepath = f"replays/{score_record.id}_{score_record.beatmap_id}_{score_record.user_id}_lazer_replay.osr"
|
||||
filepath = score_record.replay_filename
|
||||
if not await storage_service.is_exists(filepath):
|
||||
raise HTTPException(status_code=404, detail="Replay file not found")
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ from app.database.score import (
|
||||
process_user,
|
||||
)
|
||||
from app.dependencies.api_version import APIVersion
|
||||
from app.dependencies.database import Database, get_redis, with_db
|
||||
from app.dependencies.database import Database, get_redis
|
||||
from app.dependencies.fetcher import get_fetcher
|
||||
from app.dependencies.storage import get_storage_service
|
||||
from app.dependencies.user import get_client_user, get_current_user
|
||||
@@ -50,7 +50,7 @@ from app.models.score import (
|
||||
Rank,
|
||||
SoloScoreSubmissionInfo,
|
||||
)
|
||||
from app.service.user_cache_service import get_user_cache_service
|
||||
from app.service.user_cache_service import refresh_user_cache_background
|
||||
from app.storage.base import StorageService
|
||||
from app.utils import utcnow
|
||||
|
||||
@@ -222,22 +222,11 @@ async def submit_score(
|
||||
|
||||
await db.commit()
|
||||
if user_id is not None:
|
||||
background_task.add_task(_refresh_user_cache_background, redis, user_id, score_gamemode)
|
||||
background_task.add_task(refresh_user_cache_background, redis, user_id, score_gamemode)
|
||||
background_task.add_task(process_user_achievement, resp.id)
|
||||
return resp
|
||||
|
||||
|
||||
async def _refresh_user_cache_background(redis: Redis, user_id: int, mode: GameMode):
|
||||
"""后台任务:刷新用户缓存"""
|
||||
try:
|
||||
user_cache_service = get_user_cache_service(redis)
|
||||
# 创建独立的数据库会话
|
||||
async with with_db() as session:
|
||||
await user_cache_service.refresh_user_cache_on_score_submit(session, user_id, mode)
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to refresh user cache after score submit: {e}")
|
||||
|
||||
|
||||
async def _preload_beatmap_for_pp_calculation(beatmap_id: int) -> None:
|
||||
"""
|
||||
预缓存beatmap文件以加速PP计算
|
||||
@@ -949,7 +938,7 @@ async def download_score_replay(
|
||||
if not score:
|
||||
raise HTTPException(status_code=404, detail="Score not found")
|
||||
|
||||
filepath = f"replays/{score.id}_{score.beatmap_id}_{score.user_id}_lazer_replay.osr"
|
||||
filepath = score.replay_filename
|
||||
|
||||
if not await storage_service.is_exists(filepath):
|
||||
raise HTTPException(status_code=404, detail="Replay file not found")
|
||||
|
||||
Reference in New Issue
Block a user