X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Fviews%2Fmap.py;h=2d3957a7dd0a82ab6ba0e47dcfe3d4f9dd56737c;hb=2eb49f64bfe38c0dac1399c3fce2290299885bcf;hp=5fbc7727578780308a3a57beb8ce60ca120591ee;hpb=1bb4bed635c0389f1aeaa2a326448e66de565936;p=xonotic%2Fxonstat.git diff --git a/xonstat/views/map.py b/xonstat/views/map.py index 5fbc772..2d3957a 100644 --- a/xonstat/views/map.py +++ b/xonstat/views/map.py @@ -3,11 +3,10 @@ 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, html_colors +from xonstat.views.helpers import RecentGame, recent_games_q log = logging.getLogger(__name__) @@ -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 @@ -38,7 +37,7 @@ def map_index(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) @@ -50,7 +49,7 @@ def map_index_json(request): def _map_info_data(request): map_id = request.matchdict['id'] - try: + try: leaderboard_lifetime = int( request.registry.settings['xonstat.leaderboard_lifetime']) except: @@ -66,14 +65,9 @@ def _map_info_data(request): 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, @@ -82,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).\ @@ -92,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).\ @@ -108,11 +102,11 @@ 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).\ @@ -124,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] @@ -150,9 +145,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(('-', '-', '-')) @@ -170,3 +162,91 @@ 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']) + + 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: + 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)) + + 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 + + return { + 'map_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)