X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Fviews%2Fsubmission.py;h=66dcd1107dc8ca57a30d683ea7eaa616680f85aa;hb=dc8eea0d9d154bd6020bc2516fda578466ffe300;hp=ea3e5c1a37f5f74b07ea3d83161f0533529b99eb;hpb=02b767cebaac2aa16ec90b09bff3e0a6563c4988;p=xonotic%2Fxonstat.git diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py index ea3e5c1..66dcd11 100755 --- a/xonstat/views/submission.py +++ b/xonstat/views/submission.py @@ -1,17 +1,26 @@ import datetime import logging +import os import pyramid.httpexceptions import re import time -from pyramid.config import get_current_registry from pyramid.response import Response +from sqlalchemy import Sequence from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound from xonstat.d0_blind_id import d0_blind_id_verify from xonstat.models import * -from xonstat.util import strip_colors +from xonstat.util import strip_colors, qfont_decode log = logging.getLogger(__name__) +def get_remote_addr(request): + """Get the Xonotic server's IP address""" + if 'X-Forwarded-For' in request.headers: + return request.headers['X-Forwarded-For'] + else: + return request.remote_addr + + def is_supported_gametype(gametype): """Whether a gametype is supported or not""" flg_supported = True @@ -37,7 +46,21 @@ def verify_request(request): return (idfp, status) -def has_minimum_real_players(player_events): +def num_real_players(player_events): + """ + Returns the number of real players (those who played + and are on the scoreboard). + """ + real_players = 0 + + for events in player_events: + if is_real_player(events): + real_players += 1 + + return real_players + + +def has_minimum_real_players(settings, player_events): """ Determines if the collection of player events has enough "real" players to store in the database. The minimum setting comes from the config file @@ -45,17 +68,13 @@ def has_minimum_real_players(player_events): """ flg_has_min_real_players = True - settings = get_current_registry().settings - try: + try: minimum_required_players = int( settings['xonstat.minimum_required_players']) except: minimum_required_players = 2 - real_players = 0 - for events in player_events: - if is_real_player(events): - real_players += 1 + real_players = num_real_players(player_events) #TODO: put this into a config setting in the ini file? if real_players < minimum_required_players: @@ -74,16 +93,17 @@ def has_required_metadata(metadata): if 'T' not in metadata or\ 'G' not in metadata or\ 'M' not in metadata or\ + 'I' not in metadata or\ 'S' not in metadata: flg_has_req_metadata = False return flg_has_req_metadata - + def is_real_player(events): """ Determines if a given set of player events correspond with a player who - + 1) is not a bot (P event does not look like a bot) 2) played in the game (matches 1) 3) was present at the end of the game (scoreboardvalid 1) @@ -112,24 +132,26 @@ def register_new_nick(session, player, new_nick): # see if that nick already exists stripped_nick = strip_colors(player.nick) try: - player_nick = session.query(PlayerNick).filter_by( - player_id=player.player_id, stripped_nick=stripped_nick).one() + player_nick = session.query(PlayerNick).filter_by( + player_id=player.player_id, stripped_nick=stripped_nick).one() except NoResultFound, e: - # player_id/stripped_nick not found, create one + # player_id/stripped_nick not found, create one # but we don't store "Anonymous Player #N" if not re.search('^Anonymous Player #\d+$', player.nick): - player_nick = PlayerNick() + player_nick = PlayerNick() player_nick.player_id = player.player_id - player_nick.stripped_nick = stripped_nick + player_nick.stripped_nick = player.stripped_nick player_nick.nick = player.nick session.add(player_nick) # We change to the new nick regardless player.nick = new_nick + player.stripped_nick = strip_colors(new_nick) session.add(player) -def get_or_create_server(session=None, name=None, hashkey=None): +def get_or_create_server(session=None, name=None, hashkey=None, ip_addr=None, + revision=None): """ Find a server by name or create one if not found. Parameters: @@ -146,6 +168,16 @@ def get_or_create_server(session=None, name=None, hashkey=None): server.hashkey = hashkey session.add(server) + # store new IP address + if server.ip_addr != ip_addr: + server.ip_addr = ip_addr + session.add(server) + + # store new revision + if server.revision != revision: + server.revision = revision + session.add(server) + log.debug("Found existing server {0}".format(server.server_id)) except MultipleResultsFound, e: @@ -196,7 +228,7 @@ def get_or_create_map(session=None, name=None): def create_game(session=None, start_dt=None, game_type_cd=None, - server_id=None, map_id=None, winner=None): + server_id=None, map_id=None, winner=None, match_id=None): """ Creates a game. Parameters: @@ -207,14 +239,24 @@ def create_game(session=None, start_dt=None, game_type_cd=None, map_id - map on which the game was played winner - the team id of the team that won """ - - game = Game(start_dt=start_dt, game_type_cd=game_type_cd, + seq = Sequence('games_game_id_seq') + game_id = session.execute(seq) + game = Game(game_id=game_id, start_dt=start_dt, game_type_cd=game_type_cd, server_id=server_id, map_id=map_id, winner=winner) - session.add(game) - session.flush() - log.debug("Created game id {0} on server {1}, map {2} at \ - {3}".format(game.game_id, - server_id, map_id, start_dt)) + game.match_id = match_id + + try: + session.query(Game).filter(Game.server_id==server_id).\ + filter(Game.match_id==match_id).one() + # if a game under the same server and match_id found, + # this is a duplicate game and can be ignored + raise pyramid.httpexceptions.HTTPOk + except NoResultFound, e: + # server_id/match_id combination not found. game is ok to insert + session.add(game) + log.debug("Created game id {0} on server {1}, map {2} at \ + {3}".format(game.game_id, + server_id, map_id, start_dt)) return game @@ -239,28 +281,30 @@ def get_or_create_player(session=None, hashkey=None, nick=None): # see if the player is already in the database # if not, create one and the hashkey along with it try: - hashkey = session.query(Hashkey).filter_by( + hk = session.query(Hashkey).filter_by( hashkey=hashkey).one() player = session.query(Player).filter_by( - player_id=hashkey.player_id).one() + player_id=hk.player_id).one() log.debug("Found existing player {0} with hashkey {1}".format( - player.player_id, hashkey.hashkey)) + player.player_id, hashkey)) except: player = Player() session.add(player) session.flush() - # if nick is given to us, use it. If not, use "Anonymous Player" + # if nick is given to us, use it. If not, use "Anonymous Player" # with a suffix added for uniqueness. if nick: player.nick = nick[:128] - else: + player.stripped_nick = strip_colors(nick[:128]) + else: player.nick = "Anonymous Player #{0}".format(player.player_id) + player.stripped_nick = player.nick - hashkey = Hashkey(player_id=player.player_id, hashkey=hashkey) - session.add(hashkey) + hk = Hashkey(player_id=player.player_id, hashkey=hashkey) + session.add(hk) log.debug("Created player {0} ({2}) with hashkey {1}".format( - player.player_id, hashkey.hashkey, player.nick.encode('utf-8'))) + player.player_id, hashkey, player.nick.encode('utf-8'))) return player @@ -278,7 +322,10 @@ def create_player_game_stat(session=None, player=None, # in here setup default values (e.g. if game type is CTF then # set kills=0, score=0, captures=0, pickups=0, fckills=0, etc # TODO: use game's create date here instead of now() - pgstat = PlayerGameStat(create_dt=datetime.datetime.now()) + seq = Sequence('player_game_stats_player_game_stat_id_seq') + pgstat_id = session.execute(seq) + pgstat = PlayerGameStat(player_game_stat_id=pgstat_id, + create_dt=datetime.datetime.utcnow()) # set player id from player record pgstat.player_id = player.player_id @@ -289,7 +336,7 @@ def create_player_game_stat(session=None, player=None, # all games have a score pgstat.score = 0 - if game.game_type_cd == 'dm': + if game.game_type_cd == 'dm' or game.game_type_cd == 'tdm' or game.game_type_cd == 'duel': pgstat.kills = 0 pgstat.deaths = 0 pgstat.suicides = 0 @@ -322,6 +369,9 @@ def create_player_game_stat(session=None, player=None, if pgstat.nick == None: pgstat.nick = player.nick + # whichever nick we ended up with, strip it and store as the stripped_nick + pgstat.stripped_nick = qfont_decode(strip_colors(pgstat.nick)) + # if the nick we end up with is different from the one in the # player record, change the nick to reflect the new value if pgstat.nick != player.nick and player.player_id > 2: @@ -335,7 +385,6 @@ def create_player_game_stat(session=None, player=None, session.add(game) session.add(pgstat) - session.flush() return pgstat @@ -359,7 +408,10 @@ def create_player_weapon_stats(session=None, player=None, matched = re.search("acc-(.*?)-cnt-fired", key) if matched: weapon_cd = matched.group(1) + seq = Sequence('player_weapon_stats_player_weapon_stats_id_seq') + pwstat_id = session.execute(seq) pwstat = PlayerWeaponStat() + pwstat.player_weapon_stats_id = pwstat_id pwstat.player_id = player.player_id pwstat.game_id = game.game_id pwstat.player_game_stat_id = pgstat.player_game_stat_id @@ -401,21 +453,17 @@ def parse_body(request): player_events = {} current_team = None players = [] - - log.debug("----- BEGIN REQUEST BODY -----") - log.debug(request.body) - log.debug("----- END REQUEST BODY -----") for line in request.body.split('\n'): try: (key, value) = line.strip().split(' ', 1) # Server (S) and Nick (n) fields can have international characters. - # We encode these as UTF-8. + # We convert to UTF-8. if key in 'S' 'n': value = unicode(value, 'utf-8') - - if key in 'V' 'T' 'G' 'M' 'S' 'C' 'R' 'W': + + if key in 'V' 'T' 'G' 'M' 'S' 'C' 'R' 'W' 'I': game_meta[key] = value if key == 'P': @@ -424,7 +472,7 @@ def parse_body(request): if len(player_events) != 0: players.append(player_events) player_events = {} - + player_events[key] = value if key == 'e': @@ -437,7 +485,7 @@ def parse_body(request): except: # no key/value pair - move on to the next line pass - + # add the last player we were working on if len(player_events) > 0: players.append(player_events) @@ -458,7 +506,7 @@ def create_player_stats(session=None, player=None, game=None, create_player_weapon_stats(session=session, player=player, game=game, pgstat=pgstat, player_events=player_events) - + def stats_submit(request): """ @@ -467,36 +515,49 @@ def stats_submit(request): try: session = DBSession() + log.debug("\n----- BEGIN REQUEST BODY -----\n" + request.body + + "----- END REQUEST BODY -----\n\n") + (idfp, status) = verify_request(request) if not idfp: - raise pyramid.httpexceptions.HTTPUnauthorized + log.debug("ERROR: Unverified request") + raise pyramid.httpexceptions.HTTPUnauthorized("Unverified request") (game_meta, players) = parse_body(request) - + if not has_required_metadata(game_meta): - log.debug("Required game meta fields missing. "\ - "Can't continue.") - raise pyramid.exceptions.HTTPUnprocessableEntity - + log.debug("ERROR: Required game meta missing") + raise pyramid.exceptions.HTTPUnprocessableEntity("Missing game meta") + if not is_supported_gametype(game_meta['G']): - raise pyramid.httpexceptions.HTTPOk - - if not has_minimum_real_players(players): - log.debug("The number of real players is below the minimum. " + - "Stats will be ignored.") - raise pyramid.httpexceptions.HTTPOk + log.debug("ERROR: Unsupported gametype") + raise pyramid.httpexceptions.HTTPOk("OK") + + if not has_minimum_real_players(request.registry.settings, players): + log.debug("ERROR: Not enough real players") + raise pyramid.httpexceptions.HTTPOk("OK") + + # FIXME: if we have two players and game type is 'dm', + # change this into a 'duel' gametype. This should be + # removed when the stats actually send 'duel' instead of 'dm' + if num_real_players(players) == 2 and game_meta['G'] == 'dm': + game_meta['G'] = 'duel' server = get_or_create_server(session=session, hashkey=idfp, - name=game_meta['S']) + name=game_meta['S'], revision=game_meta['R'], + ip_addr=get_remote_addr(request)) gmap = get_or_create_map(session=session, name=game_meta['M']) + # FIXME: use the gmtime instead of utcnow() when the timezone bug is + # fixed game = create_game(session=session, - start_dt=datetime.datetime( - *time.gmtime(float(game_meta['T']))[:6]), + start_dt=datetime.datetime.utcnow(), + #start_dt=datetime.datetime( + #*time.gmtime(float(game_meta['T']))[:6]), server_id=server.server_id, game_type_cd=game_meta['G'], - map_id=gmap.map_id) - + map_id=gmap.map_id, match_id=game_meta['I']) + # find or create a record for each player # and add stats for each if they were present at the end # of the game @@ -507,16 +568,16 @@ def stats_submit(request): nick = None if 'matches' in player_events and 'scoreboardvalid' \ - in player_events: + in player_events: player = get_or_create_player(session=session, hashkey=player_events['P'], nick=nick) log.debug('Creating stats for %s' % player_events['P']) create_player_stats(session=session, player=player, game=game, player_events=player_events) - + session.commit() log.debug('Success! Stats recorded.') return Response('200 OK') except Exception as e: session.rollback() - raise e + return e