import pyramid.httpexceptions\r
import re\r
import time\r
+import sqlalchemy.sql.expression as expr\r
from pyramid.response import Response\r
from sqlalchemy import Sequence\r
from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound\r
game_meta = {}\r
events = {}\r
players = []\r
+ teams = []\r
+\r
+ # we're not in either stanza to start\r
+ in_P = in_Q = False\r
\r
for line in body.split('\n'):\r
try:\r
if key in 'S' 'n':\r
value = unicode(value, 'utf-8')\r
\r
- if key in 'V' 'T' 'G' 'M' 'S' 'C' 'R' 'W' 'I' 'D' 'O':\r
+ if key not in 'P' 'Q' 'n' 'e' 't' 'i':\r
game_meta[key] = value\r
\r
- if key == 'P':\r
- # if we were working on a player record already, append\r
- # it and work on a new one (only set team info)\r
- if len(events) > 0:\r
+ if key == 'Q' or key == 'P':\r
+ #log.debug('Found a {0}'.format(key))\r
+ #log.debug('in_Q: {0}'.format(in_Q))\r
+ #log.debug('in_P: {0}'.format(in_P))\r
+ #log.debug('events: {0}'.format(events))\r
+\r
+ # check where we were before and append events accordingly\r
+ if in_Q and len(events) > 0:\r
+ #log.debug('creating a team (Q) entry')\r
+ teams.append(events)\r
+ events = {}\r
+ elif in_P and len(events) > 0:\r
+ #log.debug('creating a player (P) entry')\r
players.append(events)\r
events = {}\r
\r
+ if key == 'P':\r
+ #log.debug('key == P')\r
+ in_P = True\r
+ in_Q = False\r
+ elif key == 'Q':\r
+ #log.debug('key == Q')\r
+ in_P = False\r
+ in_Q = True\r
+\r
events[key] = value\r
\r
if key == 'e':\r
# no key/value pair - move on to the next line\r
pass\r
\r
- # add the last player we were working on\r
- if len(events) > 0:\r
+ # add the last entity we were working on\r
+ if in_P and len(events) > 0:\r
players.append(events)\r
+ elif in_Q and len(events) > 0:\r
+ teams.append(events)\r
\r
- return (game_meta, players)\r
+ return (game_meta, players, teams)\r
\r
\r
def is_blank_game(gametype, players):\r
'as',\r
'ca',\r
# 'cq',\r
+ 'ctf',\r
'cts',\r
'dm',\r
'dom',\r
\r
def should_do_elos(game_type_cd):\r
"""True of the game type should process Elos. False otherwise."""\r
- elo_game_types = ('duel', 'dm', 'ca', 'ctf', 'tdm', 'kh',\r
- 'ka', 'ft', 'freezetag')\r
+ elo_game_types = ('duel', 'dm', 'ca', 'ctf', 'tdm', 'ka', 'ft')\r
\r
if game_type_cd in elo_game_types:\r
return True\r
session.flush()\r
\r
\r
-def get_or_create_server(session=None, name=None, hashkey=None, ip_addr=None,\r
- revision=None):\r
+def get_or_create_server(session, name, hashkey, ip_addr, revision, port):\r
"""\r
Find a server by name or create one if not found. Parameters:\r
\r
name - server name of the server to be found or created\r
hashkey - server hashkey\r
"""\r
- try:\r
- # find one by that name, if it exists\r
- server = session.query(Server).filter_by(name=name).one()\r
-\r
- # store new hashkey\r
- if server.hashkey != hashkey:\r
- server.hashkey = hashkey\r
- session.add(server)\r
-\r
- # store new IP address\r
- if server.ip_addr != ip_addr:\r
- server.ip_addr = ip_addr\r
- session.add(server)\r
+ server = None\r
\r
- # store new revision\r
- if server.revision != revision:\r
- server.revision = revision\r
- session.add(server)\r
-\r
- log.debug("Found existing server {0}".format(server.server_id))\r
+ try:\r
+ port = int(port)\r
+ except:\r
+ port = None\r
+\r
+ # finding by hashkey is preferred, but if not we will fall\r
+ # back to using name only, which can result in dupes\r
+ if hashkey is not None:\r
+ servers = session.query(Server).\\r
+ filter_by(hashkey=hashkey).\\r
+ order_by(expr.desc(Server.create_dt)).limit(1).all()\r
+\r
+ if len(servers) > 0:\r
+ server = servers[0]\r
+ log.debug("Found existing server {0} by hashkey ({1})".format(\r
+ server.server_id, server.hashkey))\r
+ else:\r
+ servers = session.query(Server).\\r
+ filter_by(name=name).\\r
+ order_by(expr.desc(Server.create_dt)).limit(1).all()\r
\r
- except MultipleResultsFound, e:\r
- # multiple found, so also filter by hashkey\r
- server = session.query(Server).filter_by(name=name).\\r
- filter_by(hashkey=hashkey).one()\r
- log.debug("Found existing server {0}".format(server.server_id))\r
+ if len(servers) > 0:\r
+ server = servers[0]\r
+ log.debug("Found existing server {0} by name".format(server.server_id))\r
\r
- except NoResultFound, e:\r
- # not found, create one\r
+ # still haven't found a server by hashkey or name, so we need to create one\r
+ if server is None:\r
server = Server(name=name, hashkey=hashkey)\r
session.add(server)\r
session.flush()\r
log.debug("Created server {0} with hashkey {1}".format(\r
server.server_id, server.hashkey))\r
\r
+ # detect changed fields\r
+ if server.name != name:\r
+ server.name = name\r
+ session.add(server)\r
+\r
+ if server.hashkey != hashkey:\r
+ server.hashkey = hashkey\r
+ session.add(server)\r
+\r
+ if server.ip_addr != ip_addr:\r
+ server.ip_addr = ip_addr\r
+ session.add(server)\r
+\r
+ if server.port != port:\r
+ server.port = port\r
+ session.add(server)\r
+\r
+ if server.revision != revision:\r
+ server.revision = revision\r
+ session.add(server)\r
+\r
return server\r
\r
\r
return gmap\r
\r
\r
-def create_game(session=None, start_dt=None, game_type_cd=None,\r
- server_id=None, map_id=None, winner=None, match_id=None,\r
- duration=None):\r
+def create_game(session, start_dt, game_type_cd, server_id, map_id,\r
+ match_id, duration, mod, winner=None):\r
"""\r
Creates a game. Parameters:\r
\r
server_id - server identifier of the server hosting the game\r
map_id - map on which the game was played\r
winner - the team id of the team that won\r
+ duration - how long the game lasted\r
+ mod - mods in use during the game\r
"""\r
seq = Sequence('games_game_id_seq')\r
game_id = session.execute(seq)\r
game = Game(game_id=game_id, start_dt=start_dt, game_type_cd=game_type_cd,\r
server_id=server_id, map_id=map_id, winner=winner)\r
game.match_id = match_id\r
+ game.mod = mod[:64]\r
\r
try:\r
game.duration = datetime.timedelta(seconds=int(round(float(duration))))\r
def create_game_stat(session, game_meta, game, server, gmap, player, events):\r
"""Game stats handler for all game types"""\r
\r
- pgstat = create_default_game_stat(session, game.game_type_cd)\r
+ game_type_cd = game.game_type_cd\r
+\r
+ pgstat = create_default_game_stat(session, game_type_cd)\r
\r
# these fields should be on every pgstat record\r
pgstat.game_id = game.game_id\r
\r
if key == 'avglatency': pgstat.avg_latency = float(value)\r
if key == 'scoreboard-captime':\r
- pgstat.fastest_cap = datetime.timedelta(seconds=float(value)/100)\r
+ pgstat.fastest = datetime.timedelta(seconds=float(value)/100)\r
if game.game_type_cd == 'ctf':\r
update_fastest_cap(session, player.player_id, game.game_id,\r
- gmap.map_id, pgstat.fastest_cap)\r
+ gmap.map_id, pgstat.fastest)\r
\r
# there is no "winning team" field, so we have to derive it\r
if wins and pgstat.team is not None and game.winner is None:\r
"----- END REQUEST BODY -----\n\n")\r
\r
(idfp, status) = verify_request(request)\r
- (game_meta, raw_players) = parse_stats_submission(request.body)\r
+ (game_meta, raw_players, raw_teams) = parse_stats_submission(request.body)\r
revision = game_meta.get('R', 'unknown')\r
duration = game_meta.get('D', None)\r
\r
hashkey = idfp,\r
name = game_meta['S'],\r
revision = revision,\r
- ip_addr = get_remote_addr(request))\r
+ ip_addr = get_remote_addr(request),\r
+ port = game_meta.get('U', None))\r
\r
gmap = get_or_create_map(\r
session = session,\r
game_type_cd = game_type_cd,\r
map_id = gmap.map_id,\r
match_id = game_meta['I'],\r
- duration = duration)\r
+ duration = duration,\r
+ mod = game_meta.get('O', None))\r
\r
for events in raw_players:\r
player = get_or_create_player(\r
projects / xonotic / xonstat.git / blobdiff