Fixes on when to create players.

diff --git a/xonstat/models.py b/xonstat/models.py
index 2ed0f6ee851f535f6c9288c3307180d77d241104..27d50d83b8b8b6db01276342ca69b69c43b8fbb0 100755 (executable)
--- a/xonstat/models.py
+++ b/xonstat/models.py
@@ -94,10 +94,16 @@ class PlayerGameStat(object):
         % (self.player_id, self.game_id, self.create_dt, self.stat_type)
 
     def nick_stripped(self):
-        return strip_colors(self.nick)
+        if self.nick is None:
+            return "Anonymous Player"
+        else:
+            return strip_colors(self.nick)
 
     def nick_html_colors(self):
-        return html_colors(self.nick)
+        if self.nick is None:
+            return "Anonymous Player"
+        else:
+            return html_colors(self.nick)
 
     def team_html_color(self):
         # blue

diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py
index 847a6437980667ffba2a14903072890da94c4d58..7102fee3feb242b2ff394d5131cb0b0d4b482765 100755 (executable)
--- a/xonstat/views/submission.py
+++ b/xonstat/views/submission.py
@@ -301,16 +301,14 @@ def create_player_stats(session=None, player=None, game=None,
     """\r
     Creates player game and weapon stats according to what type of player\r
     """\r
-    # remove 'joins' from here even though it should be required\r
-    if 'matches' in player_events and 'scoreboardvalid' in player_events:\r
-                pgstat = create_player_game_stat(session=session, \r
-                        player=player, game=game, player_events=player_events)\r
-\r
-                #TODO: put this into a config setting in the ini file?\r
-                if not re.search('^bot#\d+$', player_events['P']):\r
-                        create_player_weapon_stats(session=session, \r
-                            player=player, game=game, pgstat=pgstat,\r
-                            player_events=player_events)\r
+    pgstat = create_player_game_stat(session=session, \r
+        player=player, game=game, player_events=player_events)\r
+\r
+    #TODO: put this into a config setting in the ini file?\r
+    if not re.search('^bot#\d+$', player_events['P']):\r
+        create_player_weapon_stats(session=session, \r
+            player=player, game=game, pgstat=pgstat,\r
+            player_events=player_events)\r
     \r
 \r
 def stats_submit(request):\r
@@ -367,11 +365,13 @@ def stats_submit(request):
             else:\r
                 nick = None\r
 \r
-            player = get_or_create_player(session=session, \r
+            if 'matches' in player_events and 'scoreboardvalid' \\r
+                    in player_events:\r
+                player = get_or_create_player(session=session, \r
                     hashkey=player_events['P'], nick=nick)\r
-            log.debug('Creating stats for %s' % player_events['P'])\r
-            create_player_stats(session=session, player=player, game=game, \r
-                    player_events=player_events)\r
+                log.debug('Creating stats for %s' % player_events['P'])\r
+                create_player_stats(session=session, player=player, game=game, \r
+                        player_events=player_events)\r
     \r
         session.commit()\r
         log.debug('Success! Stats recorded.')\r