Last Seen: <small>${recent_games[0][1].fuzzy_date()} </small><br />
- Playing Time: <small>${total_stats['alivetime']} hours
- % if total_stats['alivetime'] > total_stats['alivetime_month']:
- % if total_stats['alivetime_month'] > total_stats['alivetime_week']:
- (${total_stats['alivetime_month']} hours this month; ${total_stats['alivetime_week']} hours this week)
+ % if fav_server is not None:
+ Favorite Server: <small>
+ <% srv_list = fav_server[:1] %>
+ % for srvinfo in srv_list:
+ % if srvinfo != srv_list[-1]:
+ <% delim = ", " %>
% else:
- (${total_stats['alivetime_month']} hours this month)
+ <% delim = "" %>
% endif
- % endif
+ <a href="${request.route_url('server_info', id=srvinfo['id'])}" title="view server info">${srvinfo['name']}</a>${delim}
+ % endfor
</small><br />
-
- <% games_breakdown_str = ', '.join(["{0} {1}".format(ng, gt) for (gt, ng) in games_breakdown]) %>
- Games Played: <small>${total_games} (${games_breakdown_str})</small><br />
+ % endif
% if fav_map is not None:
Favorite Maps: <small>
% if fav_weapon is not None:
Favorite Weapons: <small>
- <% wpn_list = fav_weapon[:2] %>
+ <% wpn_list = fav_weapon[:3] %>
% for wpninfo in wpn_list:
% if wpninfo != wpn_list[-1]:
<% delim = ", " %>
</div>
<div class="span6">
<p>
- % if total_games > 0 and total_stats['wins'] is not None:
- Win Percentage: <small>${round(float(total_stats['wins'])/total_games * 100, 2)}% (${total_stats['wins']} wins, ${total_games - total_stats['wins']} losses) </small><br />
+ Playing Time: <small>${total_stats['alivetime']} hours
+ % if total_stats['alivetime'] > total_stats['alivetime_month']:
+ % if total_stats['alivetime_month'] > total_stats['alivetime_week']:
+ (${total_stats['alivetime_month']} hours this month; ${total_stats['alivetime_week']} hours this week)
+ % else:
+ (${total_stats['alivetime_month']} hours this month)
+ % endif
+ % endif
+ </small><br />
+
+ <% games_breakdown_str = ', '.join(["{0} {1}".format(ng, gt) for (gt, ng) in total_stats['games_breakdown'].items()]) %>
+ Games Played: <small>${total_stats['games']} (${games_breakdown_str})</small><br />
+
+ % if total_stats['games'] > 0 and total_stats['wins'] is not None:
+ Win Percentage: <small>${round(float(total_stats['wins'])/total_stats['games'] * 100, 2)}% (${total_stats['wins']} wins, ${total_stats['games'] - total_stats['wins']} losses) </small><br />
% endif
% if total_stats['kills'] > 0 and total_stats['deaths'] > 0:
Kill Ratio: <small>${round(float(total_stats['kills'])/total_stats['deaths'], 3)} (${total_stats['kills']} kills, ${total_stats['deaths']} deaths, ${total_stats['suicides']} suicides) </small><br />
% endif
+ </p>
+ </div>
+</div>
+
+<div class="row">
+ <div class="span10">
+ <p>
+ % if total_stats['games_breakdown'].has_key('duel'):
+ Duel Stats: <small>
+ % if total_stats['duel_wins'] is not None:
+ Win Percentage ${round(float(total_stats['duel_wins'])/total_stats['games_breakdown']['duel'] * 100, 2)}% (${total_stats['duel_wins']} wins, ${total_stats['games_breakdown']['duel'] - total_stats['duel_wins']} losses)
+ % endif
+
+ % if total_stats['duel_kills'] > 0 and total_stats['duel_deaths'] > 0:
+ | Kill Ratio ${round(float(total_stats['duel_kills'])/total_stats['duel_deaths'], 3)} (${total_stats['duel_kills']} kills, ${total_stats['duel_deaths']} deaths, ${total_stats['duel_suicides']} suicides)
+ % endif
+ </small><br />
+ % endif
+
+ % if total_stats['games_breakdown'].has_key('dm'):
+ DM Stats: <small>
+ % if total_stats['dm_wins'] is not None:
+ Win Percentage ${round(float(total_stats['dm_wins'])/total_stats['games_breakdown']['dm'] * 100, 2)}% (${total_stats['dm_wins']} wins, ${total_stats['games_breakdown']['dm'] - total_stats['dm_wins']} losses)
+ % endif
+
+ % if total_stats['dm_kills'] > 0 and total_stats['dm_deaths'] > 0:
+ | Kill Ratio ${round(float(total_stats['dm_kills'])/total_stats['dm_deaths'], 3)} (${total_stats['dm_kills']} kills, ${total_stats['dm_deaths']} deaths, ${total_stats['dm_suicides']} suicides)
+ % endif
+ </small><br />
+ % endif
+
+ % if total_stats['games_breakdown'].has_key('tdm'):
+ TDM Stats: <small>
+ % if total_stats['tdm_wins'] is not None:
+ Win Percentage ${round(float(total_stats['tdm_wins'])/total_stats['games_breakdown']['tdm'] * 100, 2)}% (${total_stats['tdm_wins']} wins, ${total_stats['games_breakdown']['tdm'] - total_stats['tdm_wins']} losses)
+ % endif
+
+ % if total_stats['tdm_kills'] > 0 and total_stats['tdm_deaths'] > 0:
+ | Kill Ratio ${round(float(total_stats['tdm_kills'])/total_stats['tdm_deaths'], 3)} (${total_stats['tdm_kills']} kills, ${total_stats['tdm_deaths']} deaths, ${total_stats['tdm_suicides']} suicides)
+ % endif
+ </small><br />
+ % endif
+
+ % if total_stats['games_breakdown'].has_key('ctf'):
+ CTF Stats: <small>
+ % if total_stats['ctf_wins'] is not None:
+ Win Percentage ${round(float(total_stats['ctf_wins'])/total_stats['games_breakdown']['ctf'] * 100, 2)}% (${total_stats['ctf_wins']} wins, ${total_stats['games_breakdown']['ctf'] - total_stats['ctf_wins']} losses)
+ % endif
+
+ % if total_stats['ctf_pickups'] > 0 and total_stats['tdm_captures'] > 0:
+ | Cap Ratio ${round(float(total_stats['ctf_caps'])/total_stats['ctf_pickups'], 3)} (${total_stats['ctf_caps']} caps, ${total_stats['ctf_pickups']} pickups, ${total_stats['ctf_returns']} returns, ${total_stats['ctf_fckills']} fckills)
+ % endif
+ </small><br />
+ % endif
% if elos_display is not None and len(elos_display) > 0:
Elo:
- <small>${', '.join(elos_display)} </small>
- <br />
- %if '*' in ', '.join(elos_display):
- <small><i>*preliminary Elo</i></small><br />
+ <small>${elos_display} </small>
+ %if '*' in elos_display:
+ <small><i>*preliminary Elo</i></small>
%endif
+ <br />
% endif
% if ranks_display != '':
</div>
</div>
-
% if 'nex' in recent_weapons or 'rifle' in recent_weapons or 'minstanex' in recent_weapons or 'uzi' in recent_weapons or 'shotgun' in recent_weapons:
<div class="row">
<div class="span10">
def _get_games_played(player_id):
"""
+ DEPRECATED: Now included in _get_total_stats()
+
Provides a breakdown by gametype of the games played by player_id.
Returns a tuple containing (total_games, games_breakdown), where
return (total, games_played)
-# TODO: should probably factor the above function into this one such that
-# total_stats['ctf_games'] is the count of CTF games and so on...
def _get_total_stats(player_id):
"""
Provides aggregated stats by player_id.
Returns a dict with the keys 'kills', 'deaths', 'alivetime'.
+ games = how many games a player has played
+ games_breakdown = how many games of given type a player has played (dictionary)
kills = how many kills a player has over all games
deaths = how many deaths a player has over all games
suicides = how many suicides a player has over all games
one_month_ago = datetime.datetime.utcnow() - datetime.timedelta(days=30)
total_stats = {}
- (total_stats['kills'], total_stats['deaths'], total_stats['suicides'], total_stats['alivetime'],) = DBSession.query(
+
+ games_played = DBSession.query(
+ Game.game_type_cd, func.count()).\
+ filter(Game.game_id == PlayerGameStat.game_id).\
+ filter(PlayerGameStat.player_id == player_id).\
+ group_by(Game.game_type_cd).\
+ order_by(func.count().desc()).\
+ all()
+
+ total_stats['games'] = 0
+ total_stats['games_breakdown'] = {} # this is a dictionary inside a dictionary .. dictception?
+ for (game_type_cd, games) in games_played:
+ total_stats['games'] += games
+ total_stats['games_breakdown'][game_type_cd] = games
+
+ # more fields can be added here, e.g. 'collects' for kh games
+ (total_stats['kills'], total_stats['deaths'], total_stats['suicides'],
+ total_stats['alivetime'],) = DBSession.query(
func.sum(PlayerGameStat.kills),
func.sum(PlayerGameStat.deaths),
func.sum(PlayerGameStat.suicides),
filter(PlayerGameStat.player_id == player_id).\
filter(Game.winner == PlayerGameStat.team or PlayerGameStat.rank == 1).\
one()
+
+ (total_stats['duel_wins'],) = DBSession.query(
+ func.count("*")).\
+ filter(Game.game_id == PlayerGameStat.game_id).\
+ filter(Game.game_type_cd == "duel").\
+ filter(PlayerGameStat.player_id == player_id).\
+ filter(PlayerGameStat.rank == 1).\
+ one()
+
+ (total_stats['duel_kills'], total_stats['duel_deaths'], total_stats['duel_suicides'],) = DBSession.query(
+ func.sum(PlayerGameStat.kills),
+ func.sum(PlayerGameStat.deaths),
+ func.sum(PlayerGameStat.suicides)).\
+ filter(Game.game_id == PlayerGameStat.game_id).\
+ filter(Game.game_type_cd == "duel").\
+ filter(PlayerGameStat.player_id == player_id).\
+ one()
+
+ (total_stats['dm_wins'],) = DBSession.query(
+ func.count("*")).\
+ filter(Game.game_id == PlayerGameStat.game_id).\
+ filter(Game.game_type_cd == "dm" or Game.game_type_cd == "tdm").\
+ filter(PlayerGameStat.player_id == player_id).\
+ filter(PlayerGameStat.rank == 1).\
+ one()
+
+ (total_stats['dm_kills'], total_stats['dm_deaths'], total_stats['dm_suicides'],) = DBSession.query(
+ func.sum(PlayerGameStat.kills),
+ func.sum(PlayerGameStat.deaths),
+ func.sum(PlayerGameStat.suicides)).\
+ filter(Game.game_id == PlayerGameStat.game_id).\
+ filter(Game.game_type_cd == "dm" or Game.game_type_cd == "tdm").\
+ filter(PlayerGameStat.player_id == player_id).\
+ one()
+
+ (total_stats['ctf_wins'],) = DBSession.query(
+ func.count("*")).\
+ filter(Game.game_id == PlayerGameStat.game_id).\
+ filter(Game.game_type_cd == "ctf").\
+ filter(PlayerGameStat.player_id == player_id).\
+ filter(PlayerGameStat.rank == 1).\
+ one()
+
+ (total_stats['ctf_caps'], total_stats['ctf_pickups'], total_stats['ctf_drops'],
+ total_stats['ctf_returns'], total_stats['ctf_fckills'],) = DBSession.query(
+ func.sum(PlayerGameStat.captures),
+ func.sum(PlayerGameStat.pickups),
+ func.sum(PlayerGameStat.drops),
+ func.sum(PlayerGameStat.returns),
+ func.sum(PlayerGameStat.carrier_frags)).\
+ filter(Game.game_id == PlayerGameStat.game_id).\
+ filter(Game.game_type_cd == "ctf").\
+ filter(PlayerGameStat.player_id == player_id).\
+ one()
for (key,value) in total_stats.items():
if value == None:
return fav_weapon
+def _get_fav_server(player_id):
+ """
+ Get the player's favorite server. The favorite server is defined
+ as the server that he or she has played on the most in the past
+ 90 days.
+
+ Returns a sequence of dictionaries with keys for the server's name and id.
+ The sequence holds the most-used servers in decreasing order.
+ """
+ # 90 day window
+ back_then = datetime.datetime.utcnow() - datetime.timedelta(days=90)
+
+ raw_fav_server = DBSession.query(Server.name, Server.server_id).\
+ filter(Game.game_id == PlayerGameStat.game_id).\
+ filter(Game.server_id == Server.server_id).\
+ filter(PlayerGameStat.player_id == player_id).\
+ filter(PlayerGameStat.create_dt > back_then).\
+ group_by(Server.name, Server.server_id).\
+ order_by(func.count().desc()).\
+ all()
+
+ fav_server = []
+ for srv_e in raw_fav_server:
+ entry = {}
+ entry['name'] = srv_e[0]
+ entry['id'] = srv_e[1]
+ fav_server.append(entry)
+
+ return fav_server
+
+
def _get_rank(player_id):
"""
Get the player's rank as well as the total number of ranks.
total_stats = _get_total_stats(player.player_id)
# games breakdown - N games played (X ctf, Y dm) etc
- (total_games, games_breakdown) = _get_games_played(player.player_id)
+ # DEPRECATED: included in total_stats, see above
+ # (total_games, games_breakdown) = _get_games_played(player.player_id)
# favorite map from the past 90 days
try:
except:
fav_weapon = None
+ # favorite server from the past 90 days
+ try:
+ fav_server = _get_fav_server(player.player_id)
+ except:
+ fav_server = None
+
# friendly display of elo information and preliminary status
elos = DBSession.query(PlayerElo).filter_by(player_id=player_id).\
filter(PlayerElo.game_type_cd.in_(['ctf','duel','dm'])).\
order_by(PlayerElo.elo.desc()).all()
elos_display = []
+ elos_dict = {}
for elo in elos:
if elo.games > 32:
str = "{0} ({1})"
elos_display.append(str.format(round(elo.elo, 3),
elo.game_type_cd))
+ elos_dict[elo.game_type_cd] = round(elo.elo, 3)
+ elos_display = ', '.join(elos_display)
# 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])
+
+ ranks_display = []
+ ranks_dict = {}
+ for gtc,rank,max_rank in ranks:
+ ranks_display.append("{1} of {2} ({0})".format(gtc, rank, max_rank))
+ ranks_dict[gtc] = (rank, max_rank)
+ ranks_display = ', '.join(ranks_display)
# which weapons have been used in the past 90 days
except Exception as e:
player = None
+ elos = None
elos_display = None
total_stats = None
recent_games = None
- total_games = None
- games_breakdown = None
+ # DEPRECATED: included in total_stats, see above
+ #total_games = None
+ #games_breakdown = None
recent_weapons = []
fav_map = None
fav_weapon = None
+ fav_server = None
+ ranks = None
ranks_display = None;
return {'player':player,
+ 'elos':elos_dict,
'elos_display':elos_display,
'recent_games':recent_games,
'total_stats':total_stats,
- 'total_games':total_games,
- 'games_breakdown':games_breakdown,
+ # DEPRECATED: included in total_stats, see above
+ #'total_games':total_games,
+ #'games_breakdown':games_breakdown,
'recent_weapons':recent_weapons,
'fav_map':fav_map,
'fav_weapon':fav_weapon,
+ 'fav_server':fav_server,
+ 'ranks':ranks_dict,
'ranks_display':ranks_display,
}
projects / xonotic / xonstat.git / commitdiff