import logging
import re
import time
+from collections import OrderedDict
from pyramid.response import Response
from sqlalchemy import desc, func, over
from webhelpers.paginate import Page, PageURL
log = logging.getLogger(__name__)
+# DEPRECATED
def _game_index_data(request):
- if request.matchdict.has_key('game_type_cd'):
- game_type_cd = request.matchdict['game_type_cd']
- else:
- game_type_cd = None
+ game_type_cd = None
+ game_type_descr = None
+
+ if request.params.has_key('game_type_cd'):
+ game_type_cd = request.params['game_type_cd']
+ try:
+ game_type_descr = DBSession.query(GameType.descr).\
+ filter(GameType.game_type_cd == game_type_cd).\
+ one()[0]
+ except Exception as e:
+ game_type_cd = None
if request.params.has_key('page'):
current_page = request.params['page']
else:
current_page = 1
-
- rgs_q = recent_games_q(game_type_cd=game_type_cd)
-
- games = Page(rgs_q, current_page, items_per_page=10, url=page_url)
-
- # replace the items in the canned pagination class with more rich ones
- games.items = [RecentGame(row) for row in games.items]
-
- pgstats = {}
- for game in games.items:
- pgstats[game.game_id] = DBSession.query(PlayerGameStat).\
- filter(PlayerGameStat.game_id == game.game_id).\
- order_by(PlayerGameStat.scoreboardpos).\
- order_by(PlayerGameStat.score).all()
+
+ try:
+ rgs_q = recent_games_q(game_type_cd=game_type_cd)
+
+ games = Page(rgs_q, current_page, items_per_page=10, url=page_url)
+
+ # replace the items in the canned pagination class with more rich ones
+ games.items = [RecentGame(row) for row in games.items]
+
+ pgstats = {}
+ for game in games.items:
+ pgstats[game.game_id] = DBSession.query(PlayerGameStat).\
+ filter(PlayerGameStat.game_id == game.game_id).\
+ order_by(PlayerGameStat.scoreboardpos).\
+ order_by(PlayerGameStat.score).all()
+
+ except Exception as e:
+ games = None
+ pgstats = None
+ game_type_cd = None
+ game_type_descr = None
return {'games':games,
'pgstats':pgstats,
- 'game_type_cd':game_type_cd}
+ 'game_type_cd':game_type_cd,
+ 'game_type_descr':game_type_descr,
+ }
def game_index(request):
else:
show_elo = False
- if request.params.has_key('show_latency'):
- show_latency = True
- else:
- show_latency = False
+ show_latency = False
try:
notfound = False
order_by(PlayerGameStat.score).\
all()
+ # if at least one player has a valid latency, we'll show the column
+ for pgstat in pgstats:
+ if pgstat.avg_latency is not None:
+ show_latency = True
+
+ q = DBSession.query(TeamGameStat).\
+ filter(TeamGameStat.game_id == game_id)
+ if game.game_type_cd == 'ctf':
+ q = q.order_by(TeamGameStat.caps.desc())
+ elif game.game_type_cd in 'ca' 'lms' 'ka':
+ q = q.order_by(TeamGameStat.rounds.desc())
+
+ q = q.order_by(TeamGameStat.score.desc())
+
+ tgstats = q.all()
+
+ stats_by_team = OrderedDict()
+ for pgstat in pgstats:
+ if pgstat.team not in stats_by_team.keys():
+ stats_by_team[pgstat.team] = []
+ stats_by_team[pgstat.team].append(pgstat)
+
captimes = []
if game.game_type_cd == 'ctf':
for pgstat in pgstats:
if pgstat.fastest is not None:
captimes.append(pgstat)
-
captimes = sorted(captimes, key=lambda x:x.fastest)
pwstats = {}
pwstats[pgstat.player_game_stat_id] = []
# NOTE adding pgstat to position 6 in order to display nick.
- # You have to use a slice [0:5] to pass to the accuracy
+ # You have to use a slice [0:5] to pass to the accuracy
# template
- pwstats[pgstat.player_game_stat_id].append((weapon.descr,
- weapon.weapon_cd, pwstat.actual, pwstat.max,
+ pwstats[pgstat.player_game_stat_id].append((weapon.descr,
+ weapon.weapon_cd, pwstat.actual, pwstat.max,
pwstat.hit, pwstat.fired, pgstat))
except Exception as inst:
map = None
gametype = None
pgstats = None
+ tgstats = None
pwstats = None
captimes = None
show_elo = False
show_latency = False
+ stats_by_team = None
raise inst
return {'game':game,
'map':map,
'gametype':gametype,
'pgstats':pgstats,
+ 'tgstats':tgstats,
'pwstats':pwstats,
'captimes':captimes,
'show_elo':show_elo,
'show_latency':show_latency,
+ 'stats_by_team':stats_by_team,
}
query = {}
server_id, map_id, player_id = None, None, None
- range_start, range_end = None, None
+ range_start, range_end, game_type_cd = None, None, None
+ game_type_descr = None
+
# these become WHERE clauses when present
if request.params.has_key('server_id'):
server_id = request.params['server_id']
range_end = request.params['range_end']
query['range_end'] = range_end
+ if request.params.has_key('type'):
+ game_type_cd = request.params['type']
+ query['type'] = game_type_cd
+ try:
+ game_type_descr = DBSession.query(GameType.descr).\
+ filter(GameType.game_type_cd == game_type_cd).\
+ one()[0]
+ except Exception as e:
+ game_type_cd = None
+
rgs_q = recent_games_q(server_id=server_id, map_id=map_id,
- player_id=player_id)
+ player_id=player_id, game_type_cd=game_type_cd)
recent_games = Page(rgs_q, current_page, url=page_url)
return {
'recent_games':recent_games,
'query':query,
+ 'game_type_cd':game_type_cd,
}
def game_finder(request):
projects / xonotic / xonstat.git / blobdiff