log = logging.getLogger(__name__)
-def _player_index_data(request):
+def player_index_data(request):
if request.params.has_key('page'):
current_page = request.params['page']
else:
"""
Provides a list of all the current players.
"""
- return _player_index_data(request)
+ return player_index_data(request)
def player_index_json(request):
as the map that he or she has played the most in the past
90 days.
- Returns a map object.
+ Returns a dictionary with keys for the map's name and id.
"""
# 90 day window
back_then = datetime.datetime.utcnow() - datetime.timedelta(days=90)
- fav_map = DBSession.query(Map).\
+ raw_fav_map = DBSession.query(Map.name, Map.map_id).\
filter(Game.game_id == PlayerGameStat.game_id).\
filter(Game.map_id == Map.map_id).\
filter(PlayerGameStat.player_id == player_id).\
filter(PlayerGameStat.create_dt > back_then).\
- group_by(Map.map_id).\
+ group_by(Map.name, Map.map_id).\
order_by(func.count().desc()).\
limit(1).one()
+ fav_map = {}
+ fav_map['name'] = raw_fav_map[0]
+ fav_map['id'] = raw_fav_map[1]
+
return fav_map
+def _get_rank(player_id):
+ """
+ Get the player's rank as well as the total number of ranks.
+ """
+ rank = DBSession.query("game_type_cd", "rank", "max_rank").\
+ from_statement(
+ "select pr.game_type_cd, pr.rank, overall.max_rank "
+ "from player_ranks pr, "
+ "(select game_type_cd, max(rank) max_rank "
+ "from player_ranks "
+ "group by game_type_cd) overall "
+ "where pr.game_type_cd = overall.game_type_cd "
+ "and player_id = :player_id "
+ "order by rank").\
+ params(player_id=player_id).all()
+
+ return rank;
+
+
def get_accuracy_stats(player_id, weapon_cd, games):
"""
Provides accuracy for weapon_cd by player_id for the past N games.
return (avg, dmgs)
-def _player_info_data(request):
+def player_info_data(request):
player_id = int(request.matchdict['id'])
if player_id <= 2:
player_id = -1;
(total_games, games_breakdown) = _get_games_played(player.player_id)
# favorite map from the past 90 days
- fav_map = _get_fav_map(player.player_id)
+ try:
+ fav_map = _get_fav_map(player.player_id)
+ except:
+ fav_map = None
# friendly display of elo information and preliminary status
elos = DBSession.query(PlayerElo).filter_by(player_id=player_id).\
elos_display.append(str.format(round(elo.elo, 3),
elo.game_type_cd))
+ # get current rank information
+ ranks = _get_rank(player_id)
+ ranks_display = ', '.join(["{1} of {2} ({0})".format(gtc, rank,
+ max_rank) for gtc, rank, max_rank in ranks])
+
+
# which weapons have been used in the past 90 days
# and also, used in 5 games or more?
back_then = datetime.datetime.utcnow() - datetime.timedelta(days=90)
games_breakdown = None
recent_weapons = []
fav_map = None
+ ranks_display = None;
return {'player':player,
'elos_display':elos_display,
'games_breakdown':games_breakdown,
'recent_weapons':recent_weapons,
'fav_map':fav_map,
+ 'ranks_display':ranks_display,
}
"""
Provides detailed information on a specific player
"""
- return _player_info_data(request)
+ return player_info_data(request)
def player_info_json(request):
return [{'status':'not implemented'}]
-def _player_game_index_data(request):
+def player_game_index_data(request):
player_id = request.matchdict['player_id']
if request.params.has_key('page'):
player was involved. This is ordered by game_id, with
the most recent game_ids first. Paginated.
"""
- return _player_game_index_data(request)
+ return player_game_index_data(request)
def player_game_index_json(request):
return [{'status':'not implemented'}]
-def _player_accuracy_data(request):
+def player_accuracy_data(request):
player_id = request.matchdict['id']
allowed_weapons = ['nex', 'rifle', 'shotgun', 'uzi', 'minstanex']
weapon_cd = 'nex'
"""
Provides the accuracy for the given weapon. (JSON only)
"""
- return _player_accuracy_data(request)
+ return player_accuracy_data(request)
def player_accuracy_json(request):
'shotgun', 'uzi', and 'minstanex'.
games = over how many games to display accuracy. Can be up to 50.
"""
- return _player_accuracy_data(request)
+ return player_accuracy_data(request)
-def _player_damage_data(request):
+def player_damage_data(request):
player_id = request.matchdict['id']
allowed_weapons = ['grenadelauncher', 'electro', 'crylink', 'hagar',
'rocketlauncher', 'laser']
'laser'.
games = over how many games to display damage. Can be up to 50.
"""
- return _player_damage_data(request)
+ return player_damage_data(request)
projects / xonotic / xonstat.git / blobdiff