from webhelpers.paginate import Page
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
log = logging.getLogger(__name__)
- cap_ratio (ctf only)
- total_carrier_frags (ctf only)
- game_type_cd
+ - game_type_descr
The key to the dictionary is the game type code. There is also an
"overall" game_type_cd which sums the totals and computes the total ratios.
OverallStats = namedtuple('OverallStats', ['total_kills', 'total_deaths',
'k_d_ratio', 'last_played', 'last_played_epoch', 'last_played_fuzzy',
'total_playing_time', 'total_playing_time_secs', 'total_pickups', 'total_captures', 'cap_ratio',
- 'total_carrier_frags', 'game_type_cd'])
+ 'total_carrier_frags', 'game_type_cd', 'game_type_descr'])
- raw_stats = DBSession.query('game_type_cd', 'total_kills',
- 'total_deaths', 'last_played', 'total_playing_time',
+ raw_stats = DBSession.query('game_type_cd', 'game_type_descr',
+ 'total_kills', 'total_deaths', 'last_played', 'total_playing_time',
'total_pickups', 'total_captures', 'total_carrier_frags').\
from_statement(
"SELECT g.game_type_cd, "
+ "gt.descr game_type_descr, "
"Sum(pgs.kills) total_kills, "
"Sum(pgs.deaths) total_deaths, "
"Max(pgs.create_dt) last_played, "
"Sum(pgs.captures) total_captures, "
"Sum(pgs.carrier_frags) total_carrier_frags "
"FROM games g, "
+ "cd_game_type gt, "
"player_game_stats pgs "
"WHERE g.game_id = pgs.game_id "
+ "AND g.game_type_cd = gt.game_type_cd "
"AND pgs.player_id = :player_id "
- "GROUP BY g.game_type_cd "
+ "GROUP BY g.game_type_cd, game_type_descr "
"UNION "
- "SELECT 'overall' game_type_cd, "
+ "SELECT 'overall' game_type_cd, "
+ "'Overall' game_type_descr, "
"Sum(pgs.kills) total_kills, "
"Sum(pgs.deaths) total_deaths, "
"Max(pgs.create_dt) last_played, "
"Sum(pgs.pickups) total_pickups, "
"Sum(pgs.captures) total_captures, "
"Sum(pgs.carrier_frags) total_carrier_frags "
- "FROM games g, "
- "player_game_stats pgs "
- "WHERE g.game_id = pgs.game_id "
- "AND pgs.player_id = :player_id "
+ "FROM player_game_stats pgs "
+ "WHERE pgs.player_id = :player_id "
).params(player_id=player_id).all()
# to be indexed by game_type_cd
total_captures=row.total_captures,
cap_ratio=cap_ratio,
total_carrier_frags=row.total_carrier_frags,
- game_type_cd=row.game_type_cd)
+ game_type_cd=row.game_type_cd,
+ game_type_descr=row.game_type_descr)
overall_stats[row.game_type_cd] = os
total_captures = os.total_captures,
cap_ratio = os.cap_ratio,
total_carrier_frags = os.total_carrier_frags,
- game_type_cd = os.game_type_cd)
+ game_type_cd = os.game_type_cd,
+ game_type_descr = os.game_type_descr)
return overall_stats
return elos
-def get_recent_games(player_id):
+def get_recent_games(player_id, limit=10):
"""
Provides a list of recent games for a player. Uses the recent_games_q helper.
"""
# recent games played in descending order
- rgs = recent_games_q(player_id=player_id).limit(10).all()
+ rgs = recent_games_q(player_id=player_id, force_player_id=True).limit(limit).all()
recent_games = [RecentGame(row) for row in rgs]
return recent_games
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
ranks = None
recent_games = None
recent_weapons = []
+ cake_day = False
+ ## do not raise exceptions here (only for debugging)
+ # raise e
return {'player':player,
'games_played':games_played,
'elos':elos,
'ranks':ranks,
'recent_games':recent_games,
- 'recent_weapons':recent_weapons
+ 'recent_weapons':recent_weapons,
+ 'cake_day':cake_day,
}
game_type_cd = None
game_type_descr = None
- if request.params.has_key('game_type_cd'):
- game_type_cd = request.params['game_type_cd']
+ if request.params.has_key('type'):
+ game_type_cd = request.params['type']
try:
game_type_descr = DBSession.query(GameType.descr).\
filter(GameType.game_type_cd == game_type_cd).\
filter(Player.active_ind == True).\
one()
- rgs_q = recent_games_q(player_id=player.player_id, game_type_cd=game_type_cd)
+ rgs_q = recent_games_q(player_id=player.player_id,
+ force_player_id=True, game_type_cd=game_type_cd)
- games = Page(rgs_q, current_page, items_per_page=10, url=page_url)
+ games = Page(rgs_q, current_page, items_per_page=20, url=page_url)
# replace the items in the canned pagination class with more rich ones
games.items = [RecentGame(row) for row in games.items]
def player_hashkey_info_data(request):
- hashkey = request.matchdict['hashkey']
+ (idfp, status) = verify_request(request)
+
+ # if config is to *not* verify requests and we get nothing back, this
+ # query will return nothing and we'll 404.
try:
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)
- fav_maps = get_fav_maps(player.player_id)
- elos = get_elos(player.player_id)
- ranks = get_ranks(player.player_id)
+ games_played = get_games_played(player.player_id)
+ overall_stats = get_overall_stats(player.player_id)
+ fav_maps = get_fav_maps(player.player_id)
+ elos = get_elos(player.player_id)
+ ranks = get_ranks(player.player_id)
+ most_recent_game = get_recent_games(player.player_id, 1)[0]
except Exception as e:
raise pyramid.httpexceptions.HTTPNotFound
'fav_maps':fav_maps,
'elos':elos,
'ranks':ranks,
+ 'most_recent_game':most_recent_game,
}
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,
'fav_maps': fav_maps,
'elos': elos,
'ranks': ranks,
+ 'most_recent_game': most_recent_game,
}]
elos = player_info['elos']
ranks = player_info['ranks']
fav_maps = player_info['fav_maps']
+ most_recent_game = player_info['most_recent_game']
# one-offs for things needing conversion for text/plain
player_joined = timegm(player.create_dt.timetuple())
+ 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
'player': player,
'hashkey': player_info['hashkey'],
'player_joined': player_joined,
+ 'player_joined_dt': player_joined_dt,
'games_played': games_played,
'overall_stats': overall_stats,
'alivetime': alivetime,
'fav_maps': fav_maps,
'elos': elos,
'ranks': ranks,
+ 'most_recent_game': most_recent_game,
}
Provides elo information on a specific player. Raw data is returned.
"""
hashkey = request.matchdict['hashkey']
+ print "player_elo_info_data [hashkey={0}]".format(hashkey)
try:
player = DBSession.query(Player).\
filter(Player.player_id == Hashkey.player_id).\
log.debug(e)
raise pyramid.httpexceptions.HTTPNotFound
- return {'elos':elos}
+ return {
+ 'hashkey':hashkey,
+ 'player':player,
+ 'elos':elos,
+ }
def player_elo_info_json(request):
"""
elo_info = player_elo_info_data(request)
+ player = player_info['player'].to_dict()
+
elos = {}
for gt, elo in elo_info['elos'].items():
elos[gt] = to_json(elo.to_dict())
return [{
'version': 1,
+ 'player': player,
'elos': elos,
}]
+
+def player_elo_info_text(request):
+ """
+ Provides elo information on a specific player. Plain text.
+ """
+ # UTC epoch
+ now = timegm(datetime.datetime.utcnow().timetuple())
+
+ # All player_info fields are converted into JSON-formattable dictionaries
+ elo_info = player_elo_info_data(request)
+
+ # this is a plain text response, if we don't do this here then
+ # Pyramid will assume html
+ request.response.content_type = 'text/plain'
+
+ return {
+ 'version': 1,
+ 'now': now,
+ 'hashkey': elo_info['hashkey'],
+ 'player': elo_info['player'],
+ 'elos': elo_info['elos'],
+ }
+
+
def player_captimes_data(request):
player_id = int(request.matchdict['id'])
if player_id <= 2:
player_id = -1;
- #player_captimes = DBSession.query(PlayerCaptime).\
- # filter(PlayerCaptime.player_id==player_id).\
- # order_by(PlayerCaptime.fastest_cap).\
- # 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'])
def player_captimes_json(request):
return player_captimes_data(request)
+
+def player_nvd3_damage(request):
+ player_id = int(request.matchdict['id'])
+ if player_id <= 2:
+ player_id = -1;
+
+ return {}
+
+def player_damage_data_v2(request):
+ player_id = request.matchdict["id"]
+ if player_id <= 2:
+ player_id = -1;
+
+ game_type_cd = None
+ if request.params.has_key("game_type"):
+ game_type_cd = request.params["game_type"]
+
+ limit = 20
+ if request.params.has_key("limit"):
+ limit = int(request.params["limit"])
+
+ if limit < 0:
+ limit = 20
+ if limit > 50:
+ limit = 50
+
+ games_raw = DBSession.query(sa.distinct(Game.game_id)).\
+ filter(Game.game_id == PlayerWeaponStat.game_id).\
+ filter(PlayerWeaponStat.player_id == 6)
+
+ if game_type_cd is not None:
+ games_raw = games_raw.filter(Game.game_type_cd == game_type_cd)
+
+ games_raw = games_raw.order_by(Game.game_id.desc()).limit(limit).all()
+
+ weapon_stats_raw = DBSession.query(PlayerWeaponStat).\
+ filter(PlayerWeaponStat.player_id == 6).\
+ filter(PlayerWeaponStat.game_id.in_(games_raw)).all()
+
+ weapon_stats = [ws.to_dict() for ws in weapon_stats_raw]
+
+ # NVD3 expects data points for all weapons used across the
+ # set of games *for each* point on the x axis. This means populating
+ # 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
+ games_to_weapons = {}
+ weapons_used = []
+ 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)
+
+ if ws.weapon_cd not in weapons_used:
+ weapons_used.append(ws.weapon_cd)
+
+ games = sorted(games_to_weapons.keys())
+
+ log.debug(games_to_weapons)
+ log.debug(weapons_used)
+ log.debug(games)
+
+ return {
+ "weapon_stats": weapon_stats,
+ "weapons_used": weapon_stats,
+ "games": games,
+ }
+
projects / xonotic / xonstat.git / blobdiff