import logging
-import sqlalchemy.sql.functions as func
-import sqlalchemy.sql.expression as expr
from collections import namedtuple
from datetime import datetime, timedelta
+
+import sqlalchemy.sql.expression as expr
+import sqlalchemy.sql.functions as func
+from pyramid.httpexceptions import HTTPNotFound
from webhelpers.paginate import Page
-from xonstat.models import *
+from xonstat.models import DBSession, Server, Map, Game, PlayerGameStat, Player, PlayerCaptime
+from xonstat.models.map import MapCapTime
from xonstat.util import page_url, html_colors
from xonstat.views.helpers import RecentGame, recent_games_q
log = logging.getLogger(__name__)
-def _map_index_data(request):
- if request.params.has_key('page'):
- current_page = request.params['page']
- else:
- current_page = 1
-
- try:
- map_q = DBSession.query(Map).\
- order_by(Map.map_id.desc())
+# Defaults
+INDEX_COUNT = 20
- maps = Page(map_q, current_page, items_per_page=25, url=page_url)
- except Exception as e:
- maps = None
+class MapIndex(object):
+ """Returns a list of maps."""
- return {'maps':maps, }
+ def __init__(self, request):
+ """Common parameter parsing."""
+ self.request = request
+ self.page = request.params.get("page", 1)
+ # all views share this data, so we'll precalculate
+ self.maps = self.map_index()
-def map_index(request):
- """
- Provides a list of all the current maps.
- """
- return _map_index_data(request)
+ def map_index(self):
+ """Returns the raw data shared by all renderers."""
+ try:
+ map_q = DBSession.query(Map).order_by(Map.map_id.desc())
+ maps = Page(map_q, self.page, items_per_page=INDEX_COUNT, url=page_url)
+ except Exception as e:
+ log.debug(e)
+ raise HTTPNotFound
-def map_index_json(request):
- """
- Provides a JSON-serialized list of all the current maps.
- """
- view_data = _map_index_data(request)
+ return maps
- maps = [m.to_dict() for m in view_data['maps']]
+ def html(self):
+ """For rendering this data using something HTML-based."""
+ return {
+ 'maps': self.maps,
+ }
- return maps
+ def json(self):
+ """For rendering this data using JSON."""
+ return {
+ 'maps': [m.to_dict() for m in self.maps],
+ }
def _map_info_data(request):
group_by(Server.name).\
group_by(Server.server_id).all()[0:leaderboard_count]
+ # TODO make this a configuration parameter to be set in the settings
# 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(25).\
+ limit(10).\
all()
captimes = [Captime(c.player_id, html_colors(c.nick),
def map_captimes_data(request):
map_id = int(request.matchdict['id'])
- if request.params.has_key('page'):
- current_page = request.params['page']
- else:
- current_page = 1
-
- 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'])
-
- mmap = DBSession.query(Map).filter_by(map_id=map_id).one()
-
- #mct_q = 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 "
- # "LIMIT 25"
- # ).params(map_id=map_id)
-
- #try:
- if True:
+ 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'),
filter(PlayerCaptime.game_id==PlayerGameStat.game_id).\
order_by(expr.asc(PlayerCaptime.fastest_cap))
- map_captimes = Page(mct_q, current_page, items_per_page=20, url=page_url)
-
- map_captimes.items = [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,
- ) for row in map_captimes.items]
-
- #except Exception as e:
- else:
- map = None
- map_captimes = None
+ except Exception as e:
+ raise 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 {
'map_id':map_id,
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,
+ }
projects / xonotic / xonstat.git / blobdiff