import logging
-import sqlalchemy.sql.expression as expr
+from calendar import timegm
from datetime import datetime
-from xonstat.models import *
-from xonstat.util import *
+
+import sqlalchemy.sql.expression as expr
+from sqlalchemy.orm import aliased
+from xonstat.models import DBSession, Server, Map, Game, PlayerGameStat, GameType
+from xonstat.util import pretty_date, html_colors
log = logging.getLogger(__name__)
The constructor takes a query row that has been fetched, and
it requires the following columns to be present in the row:
- game_id, game_type_cd, winner, start_dt, server_id, server_name,
- map_id, map_name, player_id, nick, rank, team
+ game_id, game_type_cd, game_type_descr, winner, start_dt,
+ server_id, server_name, map_id, map_name, player_id, nick,
+ rank, team
The following columns are optional:
which will return rows matching this specification.
'''
def __init__(self, row):
- self.game_id = row.game_id
- self.game_type_cd = row.game_type_cd
- self.winner = row.winner
- self.start_dt = row.start_dt
- self.fuzzy_date = pretty_date(row.start_dt)
- self.epoch = timegm(row.start_dt.timetuple())
- self.server_id = row.server_id
- self.server_name = row.server_name
- self.map_id = row.map_id
- self.map_name = row.map_name
- self.player_id = row.player_id
- self.nick = row.nick
+ self.game_id = row.game_id
+ self.game_type_cd = row.game_type_cd
+ self.game_type_descr = row.game_type_descr
+ self.winner = row.winner
+ self.start_dt = row.start_dt
+ self.fuzzy_date = pretty_date(row.start_dt)
+ self.epoch = timegm(row.start_dt.timetuple())
+ self.server_id = row.server_id
+ self.server_name = row.server_name
+ self.map_id = row.map_id
+ self.map_name = row.map_name
+ self.player_id = row.player_id
+ self.nick = row.nick
self.nick_html_colors = html_colors(row.nick)
- self.rank = row.rank
- self.team = row.team
+ self.rank = row.rank
+ self.team = row.team
try:
self.elo_delta = row.elo_delta
except:
self.elo_delta = None
- def _asdict(self):
+ def to_dict(self):
return {
- "game_id": self.game_id,
- "game_type_cd": self.game_type_cd,
- "winner": self.winner,
- "start_dt": self.start_dt,
- "fuzzy_dt": self.fuzzy_date,
- "epoch": self.epoch,
- "server_id": self.server_id,
- "server_name": self.server_name,
- "map_id": self.map_id,
- "map_name": self.map_name,
- "player_id": self.player_id,
- "nick": self.nick,
- "nick_html_colors": self.nick_html_colors,
- "rank": self.rank,
- "team": self.team,
- "elo_delta": self.elo_delta,
+ "game_id" : self.game_id,
+ "game_type_cd" : self.game_type_cd,
+ "winning_team" : self.winner,
+ "fuzzy_dt" : self.fuzzy_date,
+ "epoch" : self.epoch,
+ "server_id" : self.server_id,
+ "server_name" : self.server_name,
+ "map_id" : self.map_id,
+ "map_name" : self.map_name,
+ "player_id" : self.player_id,
+ "winner" : self.nick,
}
def __repr__(self):
return "<RecentGame(id=%s, gametype=%s, server=%s, map=%s)>" % (self.game_id, self.game_type_cd, self.server_name, self.map_name)
-def recent_games_q(server_id=None, map_id=None, player_id=None, cutoff=None):
+def recent_games_q(server_id=None, map_id=None, player_id=None,
+ game_type_cd=None, cutoff=None, force_player_id=False,
+ start_game_id=None, end_game_id=None, player_id_2=None):
'''
Returns a SQLA query of recent game data. Parameters filter
the results returned if they are provided. If not, it is
look when querying. Only games that happened on or after the
cutoff (which is a datetime object) will be returned.
'''
- recent_games_q = DBSession.query(Game.game_id, Game.game_type_cd,
- Game.winner, Game.start_dt, Server.server_id,
- Server.name.label('server_name'), Map.map_id,
+ pgstat_alias = aliased(PlayerGameStat, name='pgstat_alias')
+
+ recent_games_q = DBSession.query(Game.game_id, GameType.game_type_cd,
+ Game.winner, Game.start_dt, GameType.descr.label('game_type_descr'),
+ Server.server_id, Server.name.label('server_name'), Map.map_id,
Map.name.label('map_name'), PlayerGameStat.player_id,
PlayerGameStat.nick, PlayerGameStat.rank, PlayerGameStat.team,
PlayerGameStat.elo_delta).\
filter(Game.server_id==Server.server_id).\
filter(Game.map_id==Map.map_id).\
filter(Game.game_id==PlayerGameStat.game_id).\
- order_by(expr.desc(Game.game_id))
+ filter(Game.game_type_cd==GameType.game_type_cd).\
+ order_by(expr.desc(Game.create_dt))
# the various filters provided get tacked on to the query
if server_id is not None:
recent_games_q = recent_games_q.\
filter(Map.map_id==map_id)
+ # Note: force_player_id makes the pgstat row returned be from the
+ # specified player_id. Otherwise it will just look for a game
+ # *having* that player_id, but returning the #1 player's pgstat row
if player_id is not None:
- recent_games_q = recent_games_q.\
- filter(PlayerGameStat.player_id==player_id)
+ if force_player_id:
+ recent_games_q = recent_games_q.\
+ filter(PlayerGameStat.player_id==player_id).\
+ filter(Game.players.contains([player_id]))
+ else:
+ recent_games_q = recent_games_q.\
+ filter(PlayerGameStat.scoreboardpos==1).\
+ filter(Game.game_id==pgstat_alias.game_id).\
+ filter(Game.players.contains([player_id])).\
+ filter(pgstat_alias.player_id==player_id)
+
+ # supports versus queries
+ if player_id_2 is not None:
+ recent_games_q = recent_games_q.\
+ filter(Game.players.contains([player_id, player_id_2]))
+
else:
recent_games_q = recent_games_q.\
- filter(PlayerGameStat.rank==1)
+ filter(PlayerGameStat.scoreboardpos==1)
+
+ if game_type_cd is not None:
+ recent_games_q = recent_games_q.\
+ filter(Game.game_type_cd==game_type_cd.lower())
if cutoff is not None:
right_now = datetime.utcnow()
recent_games_q = recent_games_q.\
filter(expr.between(Game.create_dt, cutoff, right_now))
+ if start_game_id is not None:
+ recent_games_q = recent_games_q.filter(Game.game_id <= start_game_id)
+
+ if end_game_id is not None:
+ recent_games_q = recent_games_q.filter(Game.game_id >= end_game_id)
+
return recent_games_q
projects / xonotic / xonstat.git / blobdiff