Support teamscores when parsing, but do not store them yet.

[xonotic/xonstat.git] / xonstat / views / submission.py

diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py
index 4541bdf6eb8125572ee554d531f56a049bca573a..b002454e963e418202cdd9a7a7ad12d646994260 100644 (file)
--- a/xonstat/views/submission.py
+++ b/xonstat/views/submission.py
@@ -25,6 +25,10 @@ def parse_stats_submission(body):
     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
@@ -34,16 +38,34 @@ def parse_stats_submission(body):
             if key in 'S' 'n':\r
                 value = unicode(value, 'utf-8')\r
 \r
-            if key not in 'P' 'n' 'e' 't' 'i':\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
@@ -57,11 +79,13 @@ def parse_stats_submission(body):
             # 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
@@ -446,9 +470,8 @@ def get_or_create_map(session=None, name=None):
     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
@@ -458,12 +481,15 @@ def create_game(session=None, start_dt=None, game_type_cd=None,
     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
@@ -598,7 +624,9 @@ def create_default_game_stat(session, game_type_cd):
 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
@@ -752,7 +780,7 @@ def submit_stats(request):
                 "----- 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
@@ -795,7 +823,8 @@ def submit_stats(request):
                 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