Add more info to the player_info view and template

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

diff --git a/xonstat/views/main.py b/xonstat/views/main.py
index 811a1a626f68ae7fc2b75d33702c886f4f319c61..c22fc88ce06fb6d5451e639ddf84f4c1c28b6c78 100755 (executable)
--- a/xonstat/views/main.py
+++ b/xonstat/views/main.py
@@ -1,37 +1,63 @@
 import logging
 import sqlalchemy.sql.functions as func
+import sqlalchemy.sql.expression as expr
 from pyramid.response import Response
 from xonstat.models import *
+from xonstat.util import *
 
 log = logging.getLogger(__name__)
 
 def main_index(request):
+    leaderboard_count = 10
+    recent_games_count = 32
+
     # top players by score
     top_players = DBSession.query(Player.player_id, Player.nick, 
             func.sum(PlayerGameStat.score)).\
             filter(Player.player_id == PlayerGameStat.player_id).\
             filter(Player.player_id > 2).\
-            order_by(func.sum(PlayerGameStat.score)).\
+            order_by(expr.desc(func.sum(PlayerGameStat.score))).\
             group_by(Player.nick).\
             group_by(Player.player_id).all()[0:10]
 
+    top_players = [(player_id, html_colors(nick), score) \
+            for (player_id, nick, score) in top_players]
+
+    for i in range(leaderboard_count-len(top_players)):
+        top_players.append(('-', '-', '-'))
+
     # top servers by number of total players played
     top_servers = DBSession.query(Server.server_id, Server.name, 
             func.count()).\
             filter(Game.server_id==Server.server_id).\
-            order_by(func.count(Game.game_id)).\
+            order_by(expr.desc(func.count(Game.game_id))).\
             group_by(Server.server_id).\
             group_by(Server.name).all()[0:10]
 
+    for i in range(leaderboard_count-len(top_servers)):
+        top_servers.append(('-', '-', '-'))
+
     # top maps by total times played
     top_maps = DBSession.query(Map.map_id, Map.name, 
             func.count(Game.game_id)).\
             filter(Map.map_id==Game.game_id).\
-            order_by(func.count(Game.game_id)).\
+            order_by(expr.desc(func.count(Game.game_id))).\
             group_by(Map.map_id).\
             group_by(Map.name).all()[0:10]
 
+    for i in range(leaderboard_count-len(top_maps)):
+        top_maps.append(('-', '-', '-'))
+
+    recent_games = DBSession.query(Game, Server, Map).\
+            filter(Game.server_id==Server.server_id).\
+            filter(Game.map_id==Map.map_id).\
+            order_by(expr.desc(Game.start_dt)).all()[0:recent_games_count]
+
+    for i in range(recent_games_count-len(recent_games)):
+        recent_games.append(('-', '-', '-'))
+
     return {'top_players':top_players,
             'top_servers':top_servers,
             'top_maps':top_maps,
+            'recent_games':recent_games,
             }