Refactor language handling in webapi routers

mgxhub/db/operation/add_game.py

@@ -95,7 +95,7 @@ def add_game(session: Session, d: dict, t: str | None = None, source: str = "")
         population=d.get('population'),
         speed=d.get('speedEn'),
         matchup=d.get('matchup'),
-        map_name=d.get('map', {}).get('nameEn'),
+        map_name=d.get('map', {}).get('nameEn', d.get('map', {}).get('name')),
         map_size=d.get('map', {}).get('sizeEn'),
         version_code=d.get('version', {}).get('code'),
         version_log=d.get('version', {}).get('logVer'),

mgxhub/db/operation/get_player_recent_games.py

@@ -1,12 +1,14 @@
 '''Get recent games of a player.'''
 
+import gettext
+
 from sqlalchemy import desc
 from sqlalchemy.orm import Session
 
 from mgxhub.model.orm import Game, Player
 
 
-def get_player_recent_games(db: Session, name_hash: str, limit: int = 50, offset: int = 0) -> list:
+def get_player_recent_games(db: Session, name_hash: str, limit: int = 50, offset: int = 0, lang: str = 'en') -> list:
     '''Get recent games of a player.
 
     Args:
@@ -25,10 +27,13 @@ def get_player_recent_games(db: Session, name_hash: str, limit: int = 50, offset
         .limit(limit)\
         .all()
 
-    return [(g.game_guid, g.version_code, g.map_name, g.matchup, g.duration, g.game_time, p) for g, p in recent_games]
+    t = gettext.translation(lang, localedir='translations', languages=["en"], fallback=True)
+    _ = t.gettext
+
+    return [(g.game_guid, g.version_code, _(g.map_name), g.matchup, g.duration, g.game_time, p) for g, p in recent_games]
 
 
-async def async_get_player_recent_games(db: Session, name_hash: str, limit: int = 50, offset: int = 0) -> list:
+async def async_get_player_recent_games(db: Session, name_hash: str, limit: int = 50, offset: int = 0, lang: str = 'en') -> list:
     '''Async version of fetch_player_recent_games()'''
 
-    return get_player_recent_games(db, name_hash, limit, offset)
+    return get_player_recent_games(db, name_hash, limit, offset, lang)

mgxhub/db/operation/search_games.py

@@ -1,5 +1,6 @@
 '''Search games in the database'''
 
+import gettext
 from datetime import datetime
 
 from sqlalchemy import desc
@@ -9,7 +10,7 @@
 from mgxhub.model.searchcriteria import SearchCriteria
 
 
-def search_games(session: Session, criteria: SearchCriteria) -> dict:
+def search_games(session: Session, criteria: SearchCriteria, lang: str = 'en') -> dict:
     '''Search games.
 
     Args:
@@ -70,19 +71,22 @@ def search_games(session: Session, criteria: SearchCriteria) -> dict:
 
     query = query.order_by(order_by).limit(criteria.page_size).offset((criteria.page - 1) * criteria.page_size)
 
+    t = gettext.translation(lang, localedir='translations', languages=["en"], fallback=True)
+    _ = t.gettext
+
     games = [{
         'game_guid': game.game_guid,
         'version_code': game.version_code,
-        'map_name': game.map_name,
+        'map_name': _(game.map_name),
         'matchup': game.matchup,
         'duration': game.duration,
         'game_time': game.game_time,
         'population': game.population,
         'include_ai': game.include_ai,
         'is_multiplayer': game.is_multiplayer,
-        'speed': game.speed,
-        'victory_type': game.victory_type,
-        'map_size': game.map_size,
+        'speed': _(game.speed),
+        'victory_type': _(game.victory_type),
+        'map_size': _(game.map_size),
         'instruction': game.instruction,
         'players': [(player.slot, player.name, player.civ_name, player.type, player.name_hash) for player in game.players]
     } for game in query.all()]

mgxhub/model/webapi.py

@@ -83,6 +83,7 @@ class GameDetail(BaseModel):
     duration: int | None
     players: dict[int, PlayerInGame] | None
     chats: list[ChatEntry] | None
+    files: list[list] | None
     biggest_file: tuple[str, int] | None
 
     def __init__(self, g: Game, p: list[Player], f: list[File], c: list[Chat], lang: str = 'en'):
@@ -125,6 +126,7 @@ def __init__(self, g: Game, p: list[Player], f: list[File], c: list[Chat], lang:
             duration=g.duration,
             players={},
             chats=[],
+            files=[],
             biggest_file=('', 0)
         )
 
@@ -153,6 +155,8 @@ def __init__(self, g: Game, p: list[Player], f: list[File], c: list[Chat], lang:
                 )
 
         for file in f:
+            self.files.append([file.created, file.md5, file.realsize, file.raw_filename,
+                               file.recorder_slot, self.players[file.recorder_slot].name, self.players[file.recorder_slot].name_hash])
             if file.recorder_slot in self.players:
                 if isinstance(file.realsize, int):
                     if file.realsize > self.biggest_file[1]:

webapi/routers/game_detail.py

@@ -26,7 +26,7 @@ async def get_game(guid: str, lang: str = 'en', db: Session = Depends(db_dep)) -
         raise HTTPException(status_code=404, detail=f"Game profile [{guid}] not found")
 
     player_data = db.query(Player).filter(Player.game_guid == guid).all()
-    file_data = db.query(File).filter(File.game_guid == guid).limit(10).all()
+    file_data = db.query(File).filter(File.game_guid == guid).limit(20).all()
     chat_data = db.query(Chat.chat_time, Chat.chat_content)\
         .filter(Chat.game_guid == guid)\
         .group_by(Chat.chat_time, Chat.chat_content)\

webapi/routers/game_search.py

@@ -12,7 +12,11 @@
 
 
 @app.post("/game/search", tags=['game'])
-async def search_games(criteria: SearchCriteria = Body(...), session: Session = Depends(db_dep)) -> dict:
+async def search_games(
+    criteria: SearchCriteria = Body(...),
+    session: Session = Depends(db_dep),
+    lang: str = 'en'
+) -> dict:
     '''Search games by some criteria
 
     Args:
@@ -26,6 +30,6 @@ async def search_games(criteria: SearchCriteria = Body(...), session: Session =
 
     logger.info(criteria.model_dump())
 
-    result = search_games_in_db(session, criteria)
+    result = search_games_in_db(session, criteria, lang)
 
     return result

webapi/routers/player_profile.py

@@ -25,6 +25,7 @@ async def get_player_comprehensive(
     player_hash: str,
     recent_limit: int = Query(50, gt=0),
     friend_limit: int = Query(50, gt=0),
+    lang: str = 'en',
     db: Session = Depends(db_dep)
 ) -> dict:
     '''Fetch comprehensive information of a player
@@ -40,7 +41,7 @@ async def get_player_comprehensive(
     result = await asyncio.gather(
         async_get_player_totals(db, player_hash),
         async_get_player_rating_stats(db, player_hash),
-        async_get_player_recent_games(db, player_hash, recent_limit),
+        async_get_player_recent_games(db, player_hash, recent_limit, 0, lang),
         async_get_close_friends(db, player_hash, friend_limit),
         hash2name(db, player_hash)
     )

webapi/routers/player_recent_game.py

@@ -15,6 +15,7 @@ async def get_player_games(
     player_hash: str,
     page: int = Query(1, ge=1),
     page_size: int = Query(50, ge=1),
+    lang: str = 'en',
     db: Session = Depends(db_dep)
 ) -> dict:
     '''Get recent games of a player
@@ -27,7 +28,7 @@ async def get_player_games(
     Defined in: `webapi/routers/player_recent_game.py`
     '''
 
-    games = get_player_recent_games(db, player_hash, page_size, (page - 1) * page_size)
+    games = get_player_recent_games(db, player_hash, page_size, (page - 1) * page_size, lang)
 
     current_time = datetime.now().isoformat()