X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Fviews%2Fmap.py;h=702d280795a2cceb76b97379efe185f2a9609fcb;hb=0054cde3de9bf50b49c2c67f3295a7c39b195a63;hp=004f22a37f788078d3471d6bb00e9f4282d4516b;hpb=5d1a78293f44986ae007f9098a2b00082dc4153f;p=xonotic%2Fxonstat.git diff --git a/xonstat/views/map.py b/xonstat/views/map.py index 004f22a..702d280 100644 --- a/xonstat/views/map.py +++ b/xonstat/views/map.py @@ -1,53 +1,161 @@ 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 sqlalchemy import func as fg 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 +# Defaults +INDEX_COUNT = 20 +LEADERBOARD_LIFETIME = 30 - try: - map_q = DBSession.query(Map).\ - order_by(Map.map_id.desc()) - maps = Page(map_q, current_page, items_per_page=25, url=page_url) +class MapIndex(object): + """Returns a list of maps.""" - except Exception as e: - maps = None + def __init__(self, request): + """Common parameter parsing.""" + self.request = request + self.page = request.params.get("page", 1) + self.last = request.params.get("last", None) - return {'maps':maps, } + # all views share this data, so we'll pre-calculate + self.maps = self.map_index() + def map_index(self): + """Returns the raw data shared by all renderers.""" + try: + map_q = DBSession.query(Map) -def map_index(request): - """ - Provides a list of all the current maps. - """ - return _map_index_data(request) + if self.last: + map_q = map_q.filter(Map.map_id < self.last) + map_q = map_q.order_by(Map.map_id.desc()).limit(INDEX_COUNT) + maps = map_q.all() -def map_index_json(request): - """ - Provides a JSON-serialized list of all the current maps. - """ - view_data = _map_index_data(request) + except Exception as e: + log.debug(e) + raise HTTPNotFound + + return maps + + def html(self): + """For rendering this data using something HTML-based.""" + # build the query string + query = {} + if len(self.maps) > 1: + query['last'] = self.maps[-1].map_id + + return { + 'maps': self.maps, + 'query': query, + } + + def json(self): + """For rendering this data using JSON.""" + return { + 'maps': [m.to_dict() for m in self.maps], + 'last': self.last, + } + + +class MapInfoBase(object): + """Base class for all map-based views with a map_id parameter in them.""" + + def __init__(self, request, limit=None, last=None): + """Common parameter parsing.""" + self.request = request + self.map_id = request.matchdict.get("id", None) + + raw_lifetime = request.registry.settings.get('xonstat.leaderboard_lifetime', + LEADERBOARD_LIFETIME) + self.lifetime = int(raw_lifetime) + + self.limit = request.params.get("limit", limit) + self.last = request.params.get("last", last) + self.now = datetime.utcnow() + + +class MapTopScorers(MapInfoBase): + """Returns the top scorers on a given map.""" + + def __init__(self, request, limit=INDEX_COUNT, last=None): + """Common parameter parsing.""" + super(MapTopScorers, self).__init__(request, limit, last) + self.top_scorers = self.get_top_scorers() - maps = [m.to_dict() for m in view_data['maps']] + def get_top_scorers(self): + """Top players by score. Shared by all renderers.""" + cutoff = self.now - timedelta(days=self.lifetime) + cutoff = self.now - timedelta(days=120) - return maps + top_scorers_q = DBSession.query( + fg.row_number().over(order_by=expr.desc(func.sum(PlayerGameStat.score))).label("rank"), + Player.player_id, Player.nick, func.sum(PlayerGameStat.score).label("total_score"))\ + .filter(Player.player_id == PlayerGameStat.player_id)\ + .filter(Game.game_id == PlayerGameStat.game_id)\ + .filter(Game.map_id == self.map_id)\ + .filter(Player.player_id > 2)\ + .filter(PlayerGameStat.create_dt > cutoff)\ + .order_by(expr.desc(func.sum(PlayerGameStat.score)))\ + .group_by(Player.nick)\ + .group_by(Player.player_id) + + if self.last: + top_scorers_q = top_scorers_q.offset(self.last) + + if self.limit: + top_scorers_q = top_scorers_q.limit(self.limit) + + top_scorers = top_scorers_q.all() + + return top_scorers + + def html(self): + """Returns an HTML-ready representation.""" + TopScorer = namedtuple("TopScorer", ["rank", "player_id", "nick", "total_score"]) + + top_scorers = [TopScorer(ts.rank, ts.player_id, html_colors(ts.nick), ts.total_score) + for ts in self.top_scorers] + + # build the query string + query = {} + if len(top_scorers) > 1: + query['last'] = top_scorers[-1].rank + + return { + "map_id": self.map_id, + "top_scorers": top_scorers, + "lifetime": self.lifetime, + "query": query, + } + + def json(self): + """For rendering this data using JSON.""" + top_scorers = [{ + "rank": ts.rank, + "player_id": ts.player_id, + "nick": ts.nick, + "score": ts.total_score, + } for ts in self.top_scorers] + + return { + "map_id": self.map_id, + "top_scorers": top_scorers, + } def _map_info_data(request): - map_id = request.matchdict['id'] + map_id = int(request.matchdict['id']) try: leaderboard_lifetime = int( @@ -112,13 +220,14 @@ 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), @@ -166,63 +275,46 @@ 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 " - "LIMIT 25" - ).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 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, + }