X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Fviews%2Fmap.py;h=506dcd97369f84723bf16a27c97138461666006f;hb=6ca697e28e9fc31f7a91df033f0fe2813c222d67;hp=df641222c1680a3e265984efaa76a100021acfcc;hpb=678b131718d039ea912c8458a3db9264c8d9e883;p=xonotic%2Fxonstat.git diff --git a/xonstat/views/map.py b/xonstat/views/map.py index df64122..506dcd9 100644 --- a/xonstat/views/map.py +++ b/xonstat/views/map.py @@ -1,12 +1,12 @@ import logging import sqlalchemy.sql.functions as func import sqlalchemy.sql.expression as expr +from collections import namedtuple 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 +from xonstat.util import page_url, html_colors +from xonstat.views.helpers import RecentGame, recent_games_q log = logging.getLogger(__name__) @@ -20,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 @@ -30,16 +30,16 @@ def _map_index_data(request): def map_index(request): """ - Provides a list of all the current maps. + Provides a list of all the current maps. """ return _map_index_data(request) def map_index_json(request): """ - Provides a JSON-serialized list of all the current maps. + Provides a JSON-serialized list of all the current maps. """ - view_data = _map_index_data(request) + view_data = _map_index_data(request) maps = [m.to_dict() for m in view_data['maps']] @@ -47,9 +47,9 @@ def map_index_json(request): def _map_info_data(request): - map_id = request.matchdict['id'] + map_id = int(request.matchdict['id']) - try: + try: leaderboard_lifetime = int( request.registry.settings['xonstat.leaderboard_lifetime']) except: @@ -58,17 +58,16 @@ def _map_info_data(request): leaderboard_count = 10 recent_games_count = 20 + # captime tuples + Captime = namedtuple('Captime', ['player_id', 'nick_html_colors', + 'fastest_cap', 'game_id']) + try: gmap = DBSession.query(Map).filter_by(map_id=map_id).one() - # recent games on this map - recent_games = DBSession.query(Game, Server, Map, PlayerGameStat).\ - filter(Game.server_id==Server.server_id).\ - filter(Game.map_id==Map.map_id).\ - filter(Game.map_id==map_id).\ - filter(PlayerGameStat.game_id==Game.game_id).\ - filter(PlayerGameStat.rank==1).\ - order_by(expr.desc(Game.start_dt)).all()[0:recent_games_count] + # recent games played in descending order + rgs = recent_games_q(map_id=map_id).limit(recent_games_count).all() + recent_games = [RecentGame(row) for row in rgs] # top players by score top_scorers = DBSession.query(Player.player_id, Player.nick, @@ -77,7 +76,7 @@ def _map_info_data(request): filter(Game.game_id == PlayerGameStat.game_id).\ filter(Game.map_id == map_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).\ @@ -87,13 +86,13 @@ def _map_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.map_id == map_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).\ @@ -103,16 +102,29 @@ def _map_info_data(request): for (player_id, nick, score) in top_players] # top servers using/playing this map - top_servers = DBSession.query(Server.server_id, Server.name, + top_servers = DBSession.query(Server.server_id, Server.name, func.count(Game.game_id)).\ filter(Game.server_id == Server.server_id).\ filter(Game.map_id == map_id).\ - filter(Game.create_dt > + filter(Game.create_dt > (datetime.utcnow() - timedelta(days=leaderboard_lifetime))).\ order_by(expr.desc(func.count(Game.game_id))).\ 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(10).\ + all() + + captimes = [Captime(c.player_id, html_colors(c.nick), + c.fastest_cap, c.game_id) for c in captimes_raw] + except Exception as e: gmap = None return {'gmap':gmap, @@ -120,6 +132,7 @@ def _map_info_data(request): 'top_scorers':top_scorers, 'top_players':top_players, 'top_servers':top_servers, + 'captimes':captimes, } @@ -133,9 +146,6 @@ def map_info(request): leaderboard_count = 10 recent_games_count = 20 - for i in range(recent_games_count-len(mapinfo_data['recent_games'])): - mapinfo_data['recent_games'].append(('-', '-', '-', '-')) - for i in range(leaderboard_count-len(mapinfo_data['top_scorers'])): mapinfo_data['top_scorers'].append(('-', '-', '-')) @@ -146,3 +156,57 @@ def map_info(request): mapinfo_data['top_servers'].append(('-', '-', '-')) return mapinfo_data + + +def map_info_json(request): + """ + List the information stored about a given map. JSON. + """ + return [{'status':'not implemented'}] + + +def map_captimes_data(request): + map_id = int(request.matchdict['id']) + + 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 { + 'map_id':map_id, + 'map':mmap, + 'captimes':map_captimes, + } + +def map_captimes(request): + return map_captimes_data(request) + +def map_captimes_json(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, + }