Make recent games more bullet-resistant :)

[xonotic/xonstat.git] / xonstat / views / map.py

diff --git a/xonstat/views/map.py b/xonstat/views/map.py
index a74a220644f6b7b39c1a4b50722b531e7536b835..6ecbf371760dfa6c1adce920a5468b0cab46835f 100644 (file)
--- a/xonstat/views/map.py
+++ b/xonstat/views/map.py
@@ -1,12 +1,13 @@
 import logging
 import sqlalchemy.sql.functions as func
 import sqlalchemy.sql.expression as expr
+from collections import namedtuple
 from datetime import datetime, timedelta
-from pyramid.response import Response
 from sqlalchemy import desc
 from webhelpers.paginate import Page, PageURL
 from xonstat.models import *
-from xonstat.util import page_url
+from xonstat.util import page_url, html_colors
+from xonstat.views.helpers import RecentGame, recent_games_q
 
 log = logging.getLogger(__name__)
 
@@ -58,17 +59,16 @@ def _map_info_data(request):
     leaderboard_count = 10
     recent_games_count = 20
 
+    # captime tuples
+    Captime = namedtuple('Captime', ['player_id', 'nick_html_colors',
+        'fastest_cap', 'game_id'])
+
     try:
         gmap = DBSession.query(Map).filter_by(map_id=map_id).one()
 
-        # recent games on this map
-        recent_games = DBSession.query(Game, Server, Map, PlayerGameStat).\
-            filter(Game.server_id==Server.server_id).\
-            filter(Game.map_id==Map.map_id).\
-            filter(Game.map_id==map_id).\
-            filter(PlayerGameStat.game_id==Game.game_id).\
-            filter(PlayerGameStat.rank==1).\
-            order_by(expr.desc(Game.start_dt)).all()[0:recent_games_count]
+        # recent games played in descending order
+        rgs = recent_games_q(map_id=map_id).limit(recent_games_count).all()
+        recent_games = [RecentGame(row) for row in rgs]
 
         # top players by score
         top_scorers = DBSession.query(Player.player_id, Player.nick,
@@ -113,6 +113,17 @@ def _map_info_data(request):
                 group_by(Server.name).\
                 group_by(Server.server_id).all()[0:leaderboard_count]
 
+        # top captimes
+        captimes_raw = DBSession.query(Player.player_id, Player.nick,
+            PlayerCaptime.fastest_cap, PlayerCaptime.game_id).\
+                filter(PlayerCaptime.map_id == map_id).\
+                filter(Player.player_id == PlayerCaptime.player_id).\
+                order_by(PlayerCaptime.fastest_cap).\
+                limit(10).all()
+
+        captimes = [Captime(c.player_id, html_colors(c.nick),
+            c.fastest_cap, c.game_id) for c in captimes_raw]
+
     except Exception as e:
         gmap = None
     return {'gmap':gmap,
@@ -120,6 +131,7 @@ def _map_info_data(request):
             'top_scorers':top_scorers,
             'top_players':top_players,
             'top_servers':top_servers,
+            'captimes':captimes,
             }
 
 
@@ -133,9 +145,6 @@ def map_info(request):
     leaderboard_count = 10
     recent_games_count = 20
 
-    for i in range(recent_games_count-len(mapinfo_data['recent_games'])):
-        mapinfo_data['recent_games'].append(('-', '-', '-', '-'))
-
     for i in range(leaderboard_count-len(mapinfo_data['top_scorers'])):
         mapinfo_data['top_scorers'].append(('-', '-', '-'))