import datetime
-import json
import logging
import pyramid.httpexceptions
-import re
import sqlalchemy as sa
import sqlalchemy.sql.functions as func
-import time
from calendar import timegm
from collections import namedtuple
-from pyramid.url import current_route_url
-from sqlalchemy import desc, distinct
-from webhelpers.paginate import Page, PageURL
+from webhelpers.paginate import Page
from xonstat.models import *
-from xonstat.util import page_url, to_json, pretty_date, datetime_seconds, html_colors
+from xonstat.util import page_url, to_json, pretty_date, datetime_seconds
+from xonstat.util import is_cake_day
from xonstat.views.helpers import RecentGame, recent_games_q
log = logging.getLogger(__name__)
filter(sa.not_(Player.nick.like('Anonymous Player%'))).\
order_by(Player.player_id.desc())
- players = Page(player_q, current_page, items_per_page=10, url=page_url)
+ players = Page(player_q, current_page, items_per_page=25, url=page_url)
except Exception as e:
players = None
"g.game_type_cd, "
"CASE "
"WHEN g.winner = pgs.team THEN 1 "
- "WHEN pgs.rank = 1 THEN 1 "
+ "WHEN pgs.scoreboardpos = 1 THEN 1 "
"ELSE 0 "
"END win, "
"CASE "
"WHEN g.winner = pgs.team THEN 0 "
- "WHEN pgs.rank = 1 THEN 0 "
+ "WHEN pgs.scoreboardpos = 1 THEN 0 "
"ELSE 1 "
"END loss "
"FROM games g, "
- 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
overall_stats = {}
- raw_overall = None
for row in raw_stats:
# individual gametype ratio calculations
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
for row in raw_ranks:
rank = Rank(rank=row.rank,
max_rank=row.max_rank,
- percentile=100 - 100*float(row.rank)/row.max_rank,
+ percentile=100 - 100*float(row.rank-1)/(row.max_rank-1),
game_type_cd=row.game_type_cd)
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(10).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,
}
def player_game_index_data(request):
player_id = request.matchdict['player_id']
+ game_type_cd = None
+ game_type_descr = None
+
+ 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).\
+ one()[0]
+ except Exception as e:
+ pass
+
+ else:
+ game_type_cd = None
+ game_type_descr = None
+
if request.params.has_key('page'):
current_page = request.params['page']
else:
current_page = 1
try:
- player = DBSession.query(Player).filter_by(player_id=player_id).\
- filter(Player.active_ind == True).one()
+ player = DBSession.query(Player).\
+ filter_by(player_id=player_id).\
+ filter(Player.active_ind == True).\
+ one()
- rgs_q = recent_games_q(player_id=player.player_id)
+ 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]
+ games_played = get_games_played(player_id)
+
except Exception as e:
player = None
games = None
+ game_type_cd = None
+ game_type_descr = None
+ games_played = None
return {
'player_id':player.player_id,
'player':player,
'games':games,
+ 'game_type_cd':game_type_cd,
+ 'game_type_descr':game_type_descr,
+ 'games_played':games_played,
}
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'])
projects / xonotic / xonstat.git / blobdiff