Fix indentation. Dumb.

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

diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py
index 36a9b1a53f1f87e358f70140d11864f8ee44337e..012e92abcf9f13453d38acdfeea0e14f0fe6f7cf 100755 (executable)
--- a/xonstat/views/submission.py
+++ b/xonstat/views/submission.py
@@ -324,7 +324,7 @@ def create_player_game_stat(session=None, player=None,
     # all games have a score\r
     pgstat.score = 0\r
 \r
-    if game.game_type_cd == 'dm':\r
+    if game.game_type_cd == 'dm' or game.game_type_cd == 'tdm' or game.game_type_cd == 'duel':\r
         pgstat.kills = 0\r
         pgstat.deaths = 0\r
         pgstat.suicides = 0\r
@@ -357,6 +357,9 @@ def create_player_game_stat(session=None, player=None,
     if pgstat.nick == None:\r
         pgstat.nick = player.nick\r
 \r
+    # whichever nick we ended up with, strip it and store as the stripped_nick\r
+    pgstat.stripped_nick = qfont_decode(pgstat.nick)\r
+\r
     # if the nick we end up with is different from the one in the\r
     # player record, change the nick to reflect the new value\r
     if pgstat.nick != player.nick and player.player_id > 2:\r
@@ -449,10 +452,6 @@ def parse_body(request):
                 value = unicode(value, 'utf-8')\r
 \r
             if key in 'V' 'T' 'G' 'M' 'S' 'C' 'R' 'W' 'I':\r
-                # FIXME: hotfix for malformed numbers in the match_id\r
-                if key == 'I' and value.startswith('0.'):\r
-                    value = value[2:]\r
-\r
                 game_meta[key] = value\r
 \r
             if key == 'P':\r
@@ -509,39 +508,40 @@ def stats_submit(request):
 \r
         (idfp, status) = verify_request(request)\r
         if not idfp:\r
-            raise pyramid.httpexceptions.HTTPUnauthorized\r
-\r
-        log.debug('Remote address:')\r
-        log.debug(get_remote_addr(request))\r
+            log.debug("ERROR: Unverified request")\r
+            raise pyramid.httpexceptions.HTTPUnauthorized("Unverified request")\r
 \r
         (game_meta, players) = parse_body(request)  \r
 \r
         if not has_required_metadata(game_meta):\r
-            log.debug("Required game meta fields missing. "\\r
-                    "Can't continue.")\r
-            raise pyramid.exceptions.HTTPUnprocessableEntity\r
+            log.debug("ERROR: Required game meta missing")\r
+            raise pyramid.exceptions.HTTPUnprocessableEntity("Missing game meta")\r
 \r
         if not is_supported_gametype(game_meta['G']):\r
-            raise pyramid.httpexceptions.HTTPOk\r
+            log.debug("ERROR: Unsupported gametype")\r
+            raise pyramid.httpexceptions.HTTPOk("OK")\r
 \r
         if not has_minimum_real_players(request.registry.settings, players):\r
-            log.debug("The number of real players is below the minimum. " + \r
-                "Stats will be ignored.")\r
-            raise pyramid.httpexceptions.HTTPOk\r
+            log.debug("ERROR: Not enough real players")\r
+            raise pyramid.httpexceptions.HTTPOk("OK")\r
+\r
+        # FIXME: if we have two players and game type is 'dm',\r
+        # change this into a 'duel' gametype. This should be\r
+        # removed when the stats actually send 'duel' instead of 'dm'\r
+        if len(players) == 2 and game_meta['G'] == 'dm':\r
+            game_meta['G'] = 'duel'\r
 \r
         server = get_or_create_server(session=session, hashkey=idfp, \r
                 name=game_meta['S'], revision=game_meta['R'],\r
                 ip_addr=get_remote_addr(request))\r
 \r
         gmap = get_or_create_map(session=session, name=game_meta['M'])\r
-        log.debug(gmap)\r
 \r
         game = create_game(session=session, \r
                 start_dt=datetime.datetime(\r
                     *time.gmtime(float(game_meta['T']))[:6]), \r
                 server_id=server.server_id, game_type_cd=game_meta['G'], \r
                    map_id=gmap.map_id, match_id=game_meta['I'])\r
-        log.debug(gmap)\r
 \r
         # find or create a record for each player\r
         # and add stats for each if they were present at the end\r
@@ -565,4 +565,4 @@ def stats_submit(request):
         return Response('200 OK')\r
     except Exception as e:\r
         session.rollback()\r
-        raise e\r
+        return e\r