From 1c10f6ac04ccdad13eed71bc2d1d405d92197a7a Mon Sep 17 00:00:00 2001 From: Ant Zucaro Date: Tue, 4 Oct 2011 09:33:21 -0400 Subject: [PATCH] Return "Anonymous Player" for tracked players who hide their name --- xonstat/models.py | 10 ++++++++-- xonstat/util.py | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/xonstat/models.py b/xonstat/models.py index 517536a..2ed0f6e 100755 --- a/xonstat/models.py +++ b/xonstat/models.py @@ -12,10 +12,16 @@ Base = declarative_base() class Player(object): 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 nick_strip_colors(self): - return strip_colors(self.nick) + if self.nick is None: + return "Anonymous Player" + else: + return strip_colors(self.nick) def __repr__(self): return "" % (self.player_id, self.nick, diff --git a/xonstat/util.py b/xonstat/util.py index e9d179a..4ef6c80 100755 --- a/xonstat/util.py +++ b/xonstat/util.py @@ -1,13 +1,19 @@ import re from datetime import datetime -def strip_colors(str=None): +def strip_colors(str=''): + if str is None: + str = '' + str = re.sub(r'\^x\w\w\w', '', str) str = re.sub(r'\^\d', '', str) return str -def html_colors(str=None): +def html_colors(str=''): + if str is None: + str = '' + orig = str str = re.sub(r'\^x(\w)(\w)(\w)', "", str) -- 2.39.2