Make recent games more bullet-resistant :)

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

diff --git a/xonstat/views/server.py b/xonstat/views/server.py
index 93e5fecc49b3300756c8b84a848a0f3c2b69166d..d25e8e89a1d42e140df48c1dd15b6b06eecb694f 100644 (file)
--- a/xonstat/views/server.py
+++ b/xonstat/views/server.py
@@ -3,11 +3,11 @@ import sqlalchemy.sql.functions as func
 import sqlalchemy.sql.expression as expr
 import time
 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, html_colors
+from xonstat.views.helpers import RecentGame, recent_games_q
 
 log = logging.getLogger(__name__)
 
@@ -37,6 +37,13 @@ def server_index(request):
     return _server_index_data(request)
 
 
+def server_index_json(request):
+    """
+    Provides a list of all the current servers. JSON.
+    """
+    return [{'status':'not implemented'}]
+
+
 def _server_info_data(request):
     server_id = request.matchdict['id']
 
@@ -96,13 +103,8 @@ def _server_info_data(request):
                 for (player_id, nick, score) in top_players]
 
         # recent games played in descending order
-        recent_games = DBSession.query(Game, Server, Map, PlayerGameStat).\
-            filter(Game.server_id==Server.server_id).\
-            filter(Game.map_id==Map.map_id).\
-            filter(PlayerGameStat.game_id==Game.game_id).\
-            filter(PlayerGameStat.rank==1).\
-            filter(Server.server_id==server.server_id).\
-            order_by(expr.desc(Game.start_dt)).all()[0:recent_games_count]
+        rgs = recent_games_q(server_id=server_id).limit(recent_games_count).all()
+        recent_games = [RecentGame(row) for row in rgs]
 
     except Exception as e:
         server = None
@@ -136,12 +138,16 @@ def server_info(request):
     for i in range(leaderboard_count-len(serverinfo_data['top_players'])):
         serverinfo_data['top_players'].append(('-', '-', '-'))
 
-    for i in range(recent_games_count-len(serverinfo_data['recent_games'])):
-        serverinfo_data['recent_games'].append(('-', '-', '-', '-'))
-
     return serverinfo_data
 
 
+def server_info_json(request):
+    """
+    List the stored information about a given server. JSON.
+    """
+    return [{'status':'not implemented'}]
+
+
 def _server_game_index_data(request):
     server_id = request.matchdict['server_id']
     current_page = request.matchdict['page']
@@ -170,3 +176,10 @@ def server_game_index(request):
     List the games played on a given server. Paginated.
     """
     return _server_game_index_data(request)
+
+
+def server_game_index_json(request):
+    """
+    List the games played on a given server. Paginated. JSON.
+    """
+    return [{'status':'not implemented'}]