Remove the join to game stats for accuracy data.

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

diff --git a/xonstat/views/server.py b/xonstat/views/server.py
index 93e5fecc49b3300756c8b84a848a0f3c2b69166d..6270ed0338585e3ea346d2940aa076f81cb532b1 100644 (file)
--- a/xonstat/views/server.py
+++ b/xonstat/views/server.py
@@ -1,13 +1,11 @@
 import logging
 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 webhelpers.paginate import Page
 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__)
 
@@ -21,9 +19,9 @@ def _server_index_data(request):
         server_q = DBSession.query(Server).\
                 order_by(Server.server_id.desc())
 
-        servers = Page(server_q, current_page, items_per_page=10, url=page_url)
+        servers = Page(server_q, current_page, items_per_page=25, url=page_url)
+
 
-        
     except Exception as e:
         servers = None
 
@@ -37,10 +35,17 @@ 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']
 
-    try: 
+    try:
         leaderboard_lifetime = int(
                 request.registry.settings['xonstat.leaderboard_lifetime'])
     except:
@@ -53,24 +58,24 @@ def _server_info_data(request):
         server = DBSession.query(Server).filter_by(server_id=server_id).one()
 
         # top maps by total times played
-        top_maps = DBSession.query(Game.map_id, Map.name, 
+        top_maps = DBSession.query(Game.map_id, Map.name,
                 func.count()).\
                 filter(Map.map_id==Game.map_id).\
                 filter(Game.server_id==server.server_id).\
-                filter(Game.create_dt > 
+                filter(Game.create_dt >
                     (datetime.utcnow() - timedelta(days=leaderboard_lifetime))).\
                 order_by(expr.desc(func.count())).\
                 group_by(Game.map_id).\
                 group_by(Map.name).all()[0:leaderboard_count]
 
         # top players by score
-        top_scorers = DBSession.query(Player.player_id, Player.nick, 
+        top_scorers = DBSession.query(Player.player_id, Player.nick,
                 func.sum(PlayerGameStat.score)).\
                 filter(Player.player_id == PlayerGameStat.player_id).\
                 filter(Game.game_id == PlayerGameStat.game_id).\
                 filter(Game.server_id == server.server_id).\
                 filter(Player.player_id > 2).\
-                filter(PlayerGameStat.create_dt > 
+                filter(PlayerGameStat.create_dt >
                         (datetime.utcnow() - timedelta(days=leaderboard_lifetime))).\
                 order_by(expr.desc(func.sum(PlayerGameStat.score))).\
                 group_by(Player.nick).\
@@ -80,13 +85,13 @@ def _server_info_data(request):
                 for (player_id, nick, score) in top_scorers]
 
         # top players by playing time
-        top_players = DBSession.query(Player.player_id, Player.nick, 
+        top_players = DBSession.query(Player.player_id, Player.nick,
                 func.sum(PlayerGameStat.alivetime)).\
                 filter(Player.player_id == PlayerGameStat.player_id).\
                 filter(Game.game_id == PlayerGameStat.game_id).\
                 filter(Game.server_id == server.server_id).\
                 filter(Player.player_id > 2).\
-                filter(PlayerGameStat.create_dt > 
+                filter(PlayerGameStat.create_dt >
                         (datetime.utcnow() - timedelta(days=leaderboard_lifetime))).\
                 order_by(expr.desc(func.sum(PlayerGameStat.alivetime))).\
                 group_by(Player.nick).\
@@ -96,13 +101,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,37 +136,11 @@ 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_game_index_data(request):
-    server_id = request.matchdict['server_id']
-    current_page = request.matchdict['page']
-
-    try:
-        server = DBSession.query(Server).filter_by(server_id=server_id).one()
-
-        games_q = DBSession.query(Game, Server, Map).\
-                filter(Game.server_id == server_id).\
-                filter(Game.server_id == Server.server_id).\
-                filter(Game.map_id == Map.map_id).\
-                order_by(Game.game_id.desc())
-
-        games = Page(games_q, current_page, url=page_url)
-    except Exception as e:
-        server = None
-        games = None
-        raise e
-
-    return {'games':games,
-            'server':server}
-
-
-def server_game_index(request):
+def server_info_json(request):
     """
-    List the games played on a given server. Paginated.
+    List the stored information about a given server. JSON.
     """
-    return _server_game_index_data(request)
+    return [{'status':'not implemented'}]