Move MapCapTime and PlayerCapTime to models.

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

diff --git a/xonstat/views/map.py b/xonstat/views/map.py
index 4c65a2d45a44ecfe29be115c85d7aa1607c3f9a3..f43ee35efd17b88bb12db01ef8f56d519f85e906 100644 (file)
--- a/xonstat/views/map.py
+++ b/xonstat/views/map.py
@@ -3,8 +3,7 @@ import sqlalchemy.sql.functions as func
 import sqlalchemy.sql.expression as expr
 from collections import namedtuple
 from datetime import datetime, timedelta
-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
@@ -21,7 +20,7 @@ def _map_index_data(request):
         map_q = DBSession.query(Map).\
                 order_by(Map.map_id.desc())
 
-        maps = Page(map_q, current_page, items_per_page=10, url=page_url)
+        maps = Page(map_q, current_page, items_per_page=25, url=page_url)
 
     except Exception as e:
         maps = None
@@ -48,7 +47,7 @@ def map_index_json(request):
 
 
 def _map_info_data(request):
-    map_id = request.matchdict['id']
+    map_id = int(request.matchdict['id'])
 
     try:
         leaderboard_lifetime = int(
@@ -119,7 +118,8 @@ def _map_info_data(request):
                 filter(PlayerCaptime.map_id == map_id).\
                 filter(Player.player_id == PlayerCaptime.player_id).\
                 order_by(PlayerCaptime.fastest_cap).\
-                limit(10).all()
+                limit(25).\
+                all()
 
         captimes = [Captime(c.player_id, html_colors(c.nick),
             c.fastest_cap, c.game_id) for c in captimes_raw]
@@ -167,61 +167,45 @@ def map_info_json(request):
 def map_captimes_data(request):
     map_id = int(request.matchdict['id'])
 
-    MapCaptimes = namedtuple('PlayerCaptimes', ['fastest_cap', 'create_dt', 'create_dt_epoch', 'create_dt_fuzzy',
-        'player_id', 'player_nick', 'player_nick_stripped', 'player_nick_html',
-        'game_id', 'server_id', 'server_name'])
-
-    dbquery = DBSession.query('fastest_cap', 'create_dt', 'player_id', 'game_id',
-                'server_id', 'server_name', 'player_nick').\
-            from_statement(
-                "SELECT ct.fastest_cap, "
-                       "ct.create_dt, "
-                       "ct.player_id, "
-                       "ct.game_id, "
-                       "g.server_id, "
-                       "s.name server_name, "
-                       "pgs.nick player_nick "
-                "FROM   player_map_captimes ct, "
-                       "games g, "
-                       "maps m, "
-                       "servers s, "
-                       "player_game_stats pgs "
-                "WHERE  ct.map_id = :map_id "
-                  "AND  g.game_id = ct.game_id "
-                  "AND  g.server_id = s.server_id "
-                  "AND  m.map_id = ct.map_id "
-                  "AND  pgs.player_id = ct.player_id "
-                  "AND  pgs.game_id = ct.game_id "
-                "ORDER  BY ct.fastest_cap "
-            ).params(map_id=map_id).all()
-
-    mmap = DBSession.query(Map).filter_by(map_id=map_id).one()
-
-    map_captimes = []
-    for row in dbquery:
-        map_captimes.append(MapCaptimes(
-                fastest_cap=row.fastest_cap,
-                create_dt=row.create_dt,
-                create_dt_epoch=timegm(row.create_dt.timetuple()),
-                create_dt_fuzzy=pretty_date(row.create_dt),
-                player_id=row.player_id,
-                player_nick=row.player_nick,
-                player_nick_stripped=strip_colors(row.player_nick),
-                player_nick_html=html_colors(row.player_nick),
-                game_id=row.game_id,
-                server_id=row.server_id,
-                server_name=row.server_name,
-            ))
+    current_page = request.params.get('page', 1)
+
+    try:
+        mmap = DBSession.query(Map).filter_by(map_id=map_id).one()
+
+        mct_q = DBSession.query(PlayerCaptime.fastest_cap, PlayerCaptime.create_dt,
+                PlayerCaptime.player_id, PlayerCaptime.game_id,
+                Game.server_id, Server.name.label('server_name'),
+                PlayerGameStat.nick.label('player_nick')).\
+                filter(PlayerCaptime.map_id==map_id).\
+                filter(PlayerCaptime.game_id==Game.game_id).\
+                filter(PlayerCaptime.map_id==Map.map_id).\
+                filter(Game.server_id==Server.server_id).\
+                filter(PlayerCaptime.player_id==PlayerGameStat.player_id).\
+                filter(PlayerCaptime.game_id==PlayerGameStat.game_id).\
+                order_by(expr.asc(PlayerCaptime.fastest_cap))
+
+    except Exception as e:
+        raise pyramid.httpexceptions.HTTPNotFound
+
+    map_captimes = Page(mct_q, current_page, items_per_page=20, url=page_url)
+
+    map_captimes.items = [MapCapTime(row) for row in map_captimes.items]
 
     return {
-            'captimes':map_captimes,
             'map_id':map_id,
-            'map_url':request.route_url('map_info', id=map_id),
             'map':mmap,
+            'captimes':map_captimes,
         }
 
 def map_captimes(request):
     return map_captimes_data(request)
 
 def map_captimes_json(request):
-    return map_captimes_data(request)
+    current_page = request.params.get('page', 1)
+    data = map_captimes_data(request)
+
+    return {
+            "map": data["map"].to_dict(),
+            "captimes": [e.to_dict() for e in data["captimes"].items],
+            "page": current_page,
+            }