d45345a094
Mods tab bug fixes:
- mod_manager: fix wrong kwargs in set_enabled_mods, fix scan dir to use
mods/ subdir instead of server root, migrate old string-list format to
dict format on read
- service: replace dead server_mods SQL JOIN with get_enabled_mods()
call through the mod_manager capability; pass is_server_mod to
build_mod_args
- mods_router: accept list[EnabledModEntry] objects (name + is_server_mod)
instead of bare strings
Client/server mod split:
- Mods now stored as list[{"name": str, "is_server_mod": bool}]; old
string-list format auto-migrated on read
- is_server_mod=true routes to -serverMod= arg; false to -mod= arg
- ModList UI: amber Client/Server badge in selected pane; toggle button
in split-pane selector
Directory scaffold:
- process_config: adds "mods" to dir layout; provides get_dir_readme()
with per-directory README.txt content
- file_utils: ensure_server_dirs() gains readme_provider kwarg; writes
README.txt idempotently if absent
- service.create_server: passes readme_provider via hasattr probe
- main.py startup: backfills all existing servers with correct subdirs
and README files (idempotent)
Docs: API.md and FRONTEND.md updated for new mod schema and types
Test __init__.py files added for pytest discovery
109 lines
3.6 KiB
Python
109 lines
3.6 KiB
Python
"""Mod management endpoints — list available mods, set enabled mods."""
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from typing import Annotated
|
|
|
|
from fastapi import APIRouter, Depends, HTTPException, status
|
|
from pydantic import BaseModel
|
|
from sqlalchemy.engine import Connection
|
|
|
|
from adapters.exceptions import AdapterError
|
|
from adapters.registry import GameAdapterRegistry
|
|
from core.dal.config_repository import ConfigRepository
|
|
from core.servers.service import ServerService
|
|
from database import get_db
|
|
from dependencies import get_current_user, require_admin
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
router = APIRouter(prefix="/servers/{server_id}/mods", tags=["mods"])
|
|
|
|
|
|
def _ok(data):
|
|
return {"success": True, "data": data, "error": None}
|
|
|
|
|
|
class EnabledModEntry(BaseModel):
|
|
name: str
|
|
is_server_mod: bool = False
|
|
|
|
|
|
class SetEnabledModsRequest(BaseModel):
|
|
mods: list[EnabledModEntry]
|
|
|
|
|
|
def _get_mod_manager(server_id: int, game_type: str):
|
|
"""Get ModManager for the server's game type."""
|
|
adapter = GameAdapterRegistry.get(game_type)
|
|
if not adapter.has_capability("mod_manager"):
|
|
raise HTTPException(
|
|
status_code=status.HTTP_400_BAD_REQUEST,
|
|
detail={"code": "NOT_SUPPORTED", "message": f"Game type '{game_type}' does not support mod management"},
|
|
)
|
|
return adapter.get_mod_manager(server_id)
|
|
|
|
|
|
@router.get("")
|
|
def list_mods(
|
|
server_id: int,
|
|
db: Annotated[Connection, Depends(get_db)],
|
|
_user: Annotated[dict, Depends(get_current_user)],
|
|
) -> dict:
|
|
"""List all available mods and which are enabled."""
|
|
server = ServerService(db).get_server(server_id) # raises 404 if not found
|
|
mgr = _get_mod_manager(server_id, server["game_type"])
|
|
|
|
config_repo = ConfigRepository(db)
|
|
try:
|
|
available = mgr.list_available_mods()
|
|
enabled_mods = mgr.get_enabled_mods(config_repo)
|
|
except AdapterError as exc:
|
|
raise HTTPException(status_code=500, detail={"code": "ADAPTER_ERROR", "message": str(exc)})
|
|
|
|
enabled_map = {m["name"]: m for m in enabled_mods}
|
|
for mod in available:
|
|
entry = enabled_map.get(mod["name"])
|
|
mod["enabled"] = entry is not None
|
|
mod["is_server_mod"] = entry["is_server_mod"] if entry else False
|
|
|
|
return _ok({
|
|
"server_id": server_id,
|
|
"mods": available,
|
|
"enabled_count": len(enabled),
|
|
})
|
|
|
|
|
|
@router.put("/enabled")
|
|
def set_enabled_mods(
|
|
server_id: int,
|
|
body: SetEnabledModsRequest,
|
|
db: Annotated[Connection, Depends(get_db)],
|
|
_admin: Annotated[dict, Depends(require_admin)],
|
|
) -> dict:
|
|
"""
|
|
Set the list of enabled mods.
|
|
Replaces the current enabled list entirely.
|
|
Server must be restarted for changes to take effect.
|
|
"""
|
|
server = ServerService(db).get_server(server_id) # raises 404 if not found
|
|
mgr = _get_mod_manager(server_id, server["game_type"])
|
|
|
|
config_repo = ConfigRepository(db)
|
|
try:
|
|
mgr.set_enabled_mods([m.model_dump() for m in body.mods], config_repo)
|
|
except AdapterError as exc:
|
|
raise HTTPException(status_code=400, detail={"code": "ADAPTER_ERROR", "message": str(exc)})
|
|
except ValueError as exc:
|
|
if "CONFIG_VERSION_CONFLICT" in str(exc):
|
|
raise HTTPException(
|
|
status_code=status.HTTP_409_CONFLICT,
|
|
detail={"code": "VERSION_CONFLICT", "message": "Config was modified by another request. Please retry."},
|
|
)
|
|
raise
|
|
db.commit()
|
|
|
|
return _ok({
|
|
"message": "Enabled mods updated. Restart the server for changes to take effect.",
|
|
"enabled_mods": [m.model_dump() for m in body.mods],
|
|
}) |