From: Ant Zucaro <azucaro@gmail.com>
Date: Sat, 8 Sep 2012 19:16:59 +0000 (-0400)
Subject: Add a default alivetime of 0, better storage of stripped_nicks.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a6363be939c87af3074f8815068f8d3fc224d761;p=xonotic%2Fxonstat.git

Add a default alivetime of 0, better storage of stripped_nicks.

Default the alivetime to a timedelta of 0 seconds, and store
the qfont-decoded, color-stripped nicks as the stripped_nick.
---

diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py
index ab5bd33..95c8373 100644
--- a/xonstat/views/submission.py
+++ b/xonstat/views/submission.py
@@ -155,7 +155,7 @@ def register_new_nick(session, player, new_nick):
     new_nick - the new nickname
     """
     # see if that nick already exists
-    stripped_nick = strip_colors(player.nick)
+    stripped_nick = strip_colors(qfont_decode(player.nick))
     try:
         player_nick = session.query(PlayerNick).filter_by(
             player_id=player.player_id, stripped_nick=stripped_nick).one()
@@ -171,7 +171,7 @@ def register_new_nick(session, player, new_nick):
 
     # We change to the new nick regardless
     player.nick = new_nick
-    player.stripped_nick = strip_colors(new_nick)
+    player.stripped_nick = strip_colors(qfont_decode(new_nick))
     session.add(player)
 
 
@@ -324,7 +324,7 @@ def get_or_create_player(session=None, hashkey=None, nick=None):
             # with a suffix added for uniqueness.
             if nick:
                 player.nick = nick[:128]
-                player.stripped_nick = strip_colors(nick[:128])
+                player.stripped_nick = strip_colors(qfont_decode(nick[:128]))
             else:
                 player.nick = "Anonymous Player #{0}".format(player.player_id)
                 player.stripped_nick = player.nick
@@ -361,8 +361,9 @@ def create_player_game_stat(session=None, player=None,
     #set game id from game record
     pgstat.game_id = game.game_id
 
-    # all games have a score
+    # all games have a score and every player has an alivetime
     pgstat.score = 0
+    pgstat.alivetime = datetime.timedelta(seconds=0)
 
     if game.game_type_cd == 'dm' or game.game_type_cd == 'tdm' or game.game_type_cd == 'duel':
         pgstat.kills = 0
@@ -377,7 +378,9 @@ def create_player_game_stat(session=None, player=None,
         pgstat.carrier_frags = 0
 
     for (key,value) in player_events.items():
-        if key == 'n': pgstat.nick = value[:128]
+        if key == 'n': 
+            pgstat.nick = value[:128]
+            pgstat.stripped_nick = strip_colors(qfont_decode(pgstat.nick))
         if key == 't': pgstat.team = int(value)
         if key == 'rank': pgstat.rank = int(value)
         if key == 'alivetime':