X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Fviews%2Fplayer.py;h=4b4017f171d7efb762ac7dc487d2083b366e9737;hb=31d29e1f1101f6419f934542cbb2790c2667571f;hp=774672903c7203c863bed85af7f25f60638c2988;hpb=c0375fa96904f45c7cc6d26cedefcb0dfd7d7ec3;p=xonotic%2Fxonstat.git diff --git a/xonstat/views/player.py b/xonstat/views/player.py index 7746729..4b4017f 100644 --- a/xonstat/views/player.py +++ b/xonstat/views/player.py @@ -3,6 +3,7 @@ import logging import pyramid.httpexceptions import sqlalchemy as sa import sqlalchemy.sql.functions as func +import sqlalchemy.sql.expression as expr from calendar import timegm from collections import namedtuple from webhelpers.paginate import Page @@ -10,6 +11,7 @@ from xonstat.models import * from xonstat.util import page_url, to_json, pretty_date, datetime_seconds from xonstat.util import is_cake_day, verify_request from xonstat.views.helpers import RecentGame, recent_games_q +from urllib import unquote log = logging.getLogger(__name__) @@ -87,7 +89,8 @@ def get_games_played(player_id): "FROM games g, " "player_game_stats pgs " "WHERE g.game_id = pgs.game_id " - "AND pgs.player_id = :player_id) win_loss " + "AND pgs.player_id = :player_id " + "AND g.players @> ARRAY[:player_id]) win_loss " "GROUP BY game_type_cd " ).params(player_id=player_id).all() @@ -165,6 +168,7 @@ def get_overall_stats(player_id): "player_game_stats pgs " "WHERE g.game_id = pgs.game_id " "AND g.game_type_cd = gt.game_type_cd " + "AND g.players @> ARRAY[:player_id] " "AND pgs.player_id = :player_id " "GROUP BY g.game_type_cd, game_type_descr " "UNION " @@ -287,6 +291,7 @@ def get_fav_maps(player_id, game_type_cd=None): "maps m " "WHERE g.game_id = pgs.game_id " "AND g.map_id = m.map_id " + "AND g.players @> ARRAY[:player_id]" "AND pgs.player_id = :player_id " "GROUP BY g.game_type_cd, " "m.map_id, " @@ -343,6 +348,7 @@ def get_ranks(player_id): "from player_ranks " "group by game_type_cd) overall " "where pr.game_type_cd = overall.game_type_cd " + "and max_rank > 1 " "and player_id = :player_id " "order by rank").\ params(player_id=player_id).all() @@ -406,24 +412,6 @@ def get_recent_games(player_id, limit=10): return recent_games -def get_recent_weapons(player_id): - """ - Returns the weapons that have been used in the past 90 days - and also used in 5 games or more. - """ - cutoff = datetime.datetime.utcnow() - datetime.timedelta(days=90) - recent_weapons = [] - for weapon in DBSession.query(PlayerWeaponStat.weapon_cd, func.count()).\ - filter(PlayerWeaponStat.player_id == player_id).\ - filter(PlayerWeaponStat.create_dt > cutoff).\ - group_by(PlayerWeaponStat.weapon_cd).\ - having(func.count() > 4).\ - all(): - recent_weapons.append(weapon[0]) - - return recent_weapons - - def get_accuracy_stats(player_id, weapon_cd, games): """ Provides accuracy for weapon_cd by player_id for the past N games. @@ -520,20 +508,12 @@ def player_info_data(request): elos = get_elos(player_id) ranks = get_ranks(player_id) recent_games = get_recent_games(player_id) - recent_weapons = get_recent_weapons(player_id) cake_day = is_cake_day(player.create_dt) except Exception as e: - player = None - games_played = None - overall_stats = None - fav_maps = None - elos = None - ranks = None - recent_games = None - recent_weapons = [] - cake_day = False - ## do not raise exceptions here (only for debugging) + raise pyramid.httpexceptions.HTTPNotFound + + ## do not raise application exceptions here (only for debugging) # raise e return {'player':player, @@ -543,7 +523,6 @@ def player_info_data(request): 'elos':elos, 'ranks':ranks, 'recent_games':recent_games, - 'recent_weapons':recent_weapons, 'cake_day':cake_day, } @@ -589,8 +568,6 @@ def player_info_json(request): for game in player_info['recent_games']: recent_games.append(to_json(game)) - #recent_weapons = player_info['recent_weapons'] - return [{ 'player': player, 'games_played': games_played, @@ -599,14 +576,15 @@ def player_info_json(request): 'elos': elos, 'ranks': ranks, 'recent_games': recent_games, - # 'recent_weapons': recent_weapons, - 'recent_weapons': ['not implemented'], }] #return [{'status':'not implemented'}] def player_game_index_data(request): - player_id = request.matchdict['player_id'] + try: + player_id = int(request.matchdict['player_id']) + except: + player_id = -1 game_type_cd = None game_type_descr = None @@ -646,6 +624,7 @@ def player_game_index_data(request): games_played = get_games_played(player_id) except Exception as e: + raise e player = None games = None game_type_cd = None @@ -788,10 +767,17 @@ def player_damage_json(request): def player_hashkey_info_data(request): - #(idfp, status) = verify_request(request) - #print "player_hashkey_info_data [idfp={0} status={1}]".format(idfp, status) + # hashkey = request.matchdict['hashkey'] - hashkey = request.matchdict['hashkey'] + # the incoming hashkey is double quoted, and WSGI unquotes once... + # hashkey = unquote(hashkey) + + # if using request verification to obtain the hashkey + (idfp, status) = verify_request(request) + log.debug("d0_blind_id verification: idfp={0} status={1}\n".format(idfp, status)) + + log.debug("\n----- BEGIN REQUEST BODY -----\n" + request.body + + "----- END REQUEST BODY -----\n\n") # if config is to *not* verify requests and we get nothing back, this # query will return nothing and we'll 404. @@ -799,7 +785,7 @@ def player_hashkey_info_data(request): player = DBSession.query(Player).\ filter(Player.player_id == Hashkey.player_id).\ filter(Player.active_ind == True).\ - filter(Hashkey.hashkey == hashkey).one() + filter(Hashkey.hashkey == idfp).one() games_played = get_games_played(player.player_id) overall_stats = get_overall_stats(player.player_id) @@ -812,7 +798,7 @@ def player_hashkey_info_data(request): raise pyramid.httpexceptions.HTTPNotFound return {'player':player, - 'hashkey':hashkey, + 'hashkey':idfp, 'games_played':games_played, 'overall_stats':overall_stats, 'fav_maps':fav_maps, @@ -852,6 +838,8 @@ def player_hashkey_info_json(request): for gt,mapinfo in player_info['fav_maps'].items(): fav_maps[gt] = to_json(mapinfo) + most_recent_game = to_json(player_info['most_recent_game']) + return [{ 'version': 1, 'player': player, @@ -860,6 +848,7 @@ def player_hashkey_info_json(request): 'fav_maps': fav_maps, 'elos': elos, 'ranks': ranks, + 'most_recent_game': most_recent_game, }] @@ -884,7 +873,7 @@ def player_hashkey_info_text(request): # one-offs for things needing conversion for text/plain player_joined = timegm(player.create_dt.timetuple()) - player_joined_dt = player.create_dt.strftime('%Y-%m-%d %H:%M:%SZ') + player_joined_dt = player.create_dt alivetime = int(datetime_seconds(overall_stats['overall'].total_playing_time)) # this is a plain text response, if we don't do this here then @@ -912,8 +901,17 @@ def player_elo_info_data(request): """ Provides elo information on a specific player. Raw data is returned. """ + (idfp, status) = verify_request(request) + log.debug("d0_blind_id verification: idfp={0} status={1}\n".format(idfp, status)) + + log.debug("\n----- BEGIN REQUEST BODY -----\n" + request.body + + "----- END REQUEST BODY -----\n\n") + hashkey = request.matchdict['hashkey'] - print "player_elo_info_data [hashkey={0}]".format(hashkey) + + # the incoming hashkey is double quoted, and WSGI unquotes once... + hashkey = unquote(hashkey) + try: player = DBSession.query(Player).\ filter(Player.player_id == Hashkey.player_id).\ @@ -976,41 +974,58 @@ def player_elo_info_text(request): def player_captimes_data(request): - player_id = int(request.matchdict['id']) + player_id = int(request.matchdict['player_id']) if player_id <= 2: player_id = -1; - PlayerCaptimes = namedtuple('PlayerCaptimes', ['fastest_cap', 'create_dt', 'create_dt_epoch', 'create_dt_fuzzy', - 'player_id', 'game_id', 'map_id', 'map_name', 'server_id', 'server_name']) + if request.params.has_key('page'): + current_page = request.params['page'] + else: + current_page = 1 - dbquery = DBSession.query('fastest_cap', 'create_dt', 'player_id', 'game_id', 'map_id', - 'map_name', 'server_id', 'server_name').\ - from_statement( - "SELECT ct.fastest_cap, " - "ct.create_dt, " - "ct.player_id, " - "ct.game_id, " - "ct.map_id, " - "m.name map_name, " - "g.server_id, " - "s.name server_name " - "FROM player_map_captimes ct, " - "games g, " - "maps m, " - "servers s " - "WHERE ct.player_id = :player_id " - "AND g.game_id = ct.game_id " - "AND g.server_id = s.server_id " - "AND m.map_id = ct.map_id " - #"ORDER BY ct.fastest_cap " - "ORDER BY ct.create_dt desc" - ).params(player_id=player_id).all() + PlayerCaptimes = namedtuple('PlayerCaptimes', ['fastest_cap', + 'create_dt', 'create_dt_epoch', 'create_dt_fuzzy', + 'player_id', 'game_id', 'map_id', 'map_name', 'server_id', 'server_name']) player = DBSession.query(Player).filter_by(player_id=player_id).one() - player_captimes = [] - for row in dbquery: - player_captimes.append(PlayerCaptimes( + #pct_q = DBSession.query('fastest_cap', 'create_dt', 'player_id', 'game_id', 'map_id', + # 'map_name', 'server_id', 'server_name').\ + # from_statement( + # "SELECT ct.fastest_cap, " + # "ct.create_dt, " + # "ct.player_id, " + # "ct.game_id, " + # "ct.map_id, " + # "m.name map_name, " + # "g.server_id, " + # "s.name server_name " + # "FROM player_map_captimes ct, " + # "games g, " + # "maps m, " + # "servers s " + # "WHERE ct.player_id = :player_id " + # "AND g.game_id = ct.game_id " + # "AND g.server_id = s.server_id " + # "AND m.map_id = ct.map_id " + # #"ORDER BY ct.fastest_cap " + # "ORDER BY ct.create_dt desc" + # ).params(player_id=player_id) + + try: + pct_q = DBSession.query(PlayerCaptime.fastest_cap, PlayerCaptime.create_dt, + PlayerCaptime.player_id, PlayerCaptime.game_id, PlayerCaptime.map_id, + Map.name.label('map_name'), Game.server_id, Server.name.label('server_name')).\ + filter(PlayerCaptime.player_id==player_id).\ + filter(PlayerCaptime.game_id==Game.game_id).\ + filter(PlayerCaptime.map_id==Map.map_id).\ + filter(Game.server_id==Server.server_id).\ + order_by(expr.desc(PlayerCaptime.create_dt)) + + player_captimes = Page(pct_q, current_page, items_per_page=20, url=page_url) + + # replace the items in the canned pagination class with more rich ones + player_captimes.items = [PlayerCaptimes( fastest_cap=row.fastest_cap, create_dt=row.create_dt, create_dt_epoch=timegm(row.create_dt.timetuple()), @@ -1020,18 +1035,96 @@ def player_captimes_data(request): map_id=row.map_id, map_name=row.map_name, server_id=row.server_id, - server_name=row.server_name, - )) + server_name=row.server_name + ) for row in player_captimes.items] + + except Exception as e: + player = None + player_captimes = None return { - 'captimes':player_captimes, 'player_id':player_id, - 'player_url':request.route_url('player_info', id=player_id), 'player':player, + 'captimes':player_captimes, + #'player_url':request.route_url('player_info', id=player_id), } + def player_captimes(request): return player_captimes_data(request) + def player_captimes_json(request): return player_captimes_data(request) + + +def player_weaponstats_data_json(request): + player_id = int(request.matchdict["id"]) + if player_id <= 2: + player_id = -1; + + game_type_cd = request.params.get("game_type", None) + if game_type_cd == "overall": + game_type_cd = None + + limit = 20 + if request.params.has_key("limit"): + limit = int(request.params["limit"]) + + if limit < 0: + limit = 20 + if limit > 50: + limit = 50 + + + # the game_ids of the most recently played ones + # of the given game type is used for a subquery + games_list = DBSession.query(Game.game_id).\ + filter(Game.players.contains([player_id])) + + if game_type_cd is not None: + games_list = games_list.filter(Game.game_type_cd == game_type_cd) + + games_list = games_list.order_by(Game.game_id.desc()).limit(limit) + + weapon_stats_raw = DBSession.query(PlayerWeaponStat).\ + filter(PlayerWeaponStat.player_id == player_id).\ + filter(PlayerWeaponStat.game_id.in_(games_list)).\ + all() + + games_to_weapons = {} + weapons_used = {} + sum_avgs = {} + for ws in weapon_stats_raw: + if ws.game_id not in games_to_weapons: + games_to_weapons[ws.game_id] = [ws.weapon_cd] + else: + games_to_weapons[ws.game_id].append(ws.weapon_cd) + + weapons_used[ws.weapon_cd] = weapons_used.get(ws.weapon_cd, 0) + 1 + sum_avgs[ws.weapon_cd] = sum_avgs.get(ws.weapon_cd, 0) + float(ws.hit)/float(ws.fired) + + # Creating zero-valued weapon stat entries for games where a weapon was not + # used in that game, but was used in another game for the set. This makes + # the charts look smoother + for game_id in games_to_weapons.keys(): + for weapon_cd in set(weapons_used.keys()) - set(games_to_weapons[game_id]): + weapon_stats_raw.append(PlayerWeaponStat(player_id=player_id, + game_id=game_id, weapon_cd=weapon_cd)) + + # averages for the weapons used in the range + avgs = {} + for w in weapons_used.keys(): + avgs[w] = round(sum_avgs[w]/float(weapons_used[w])*100, 2) + + weapon_stats_raw = sorted(weapon_stats_raw, key = lambda x: x.game_id) + games = sorted(games_to_weapons.keys()) + weapon_stats = [ws.to_dict() for ws in weapon_stats_raw] + + return { + "weapon_stats": weapon_stats, + "weapons_used": weapons_used.keys(), + "games": games, + "averages": avgs, + } +