Get rid of "git build" from the header image. It is a carryover from the original...

[xonotic/xonstat.git] / xonstat / models.py

diff --git a/xonstat/models.py b/xonstat/models.py
index 517536ab93ca7e8f9219b5bf5a19658f0c819b27..0dcda1fc904815ef1928e81be2c90d661a342849 100755 (executable)
--- a/xonstat/models.py
+++ b/xonstat/models.py
@@ -10,22 +10,21 @@ Base = declarative_base()
 
 # define objects for all tables
 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)
-
-    def __repr__(self):
-        return "<Player(%s, %s, %s, %s)>" % (self.player_id, self.nick, 
-                self.create_dt, self.location)
-
+        if self.nick is None:
+            return "Anonymous Player"
+        else:
+            return strip_colors(self.nick)
 
-class Mutator(object):
     def __repr__(self):
-        return "<Mutator(%s, %s, %s, %s)>" % (self.mutator_cd, self.name, 
-                self.descr, self.active_ind)
+        return "<Player(%s, %s)>" % (self.player_id, 
+                self.nick.encode('utf-8'))
 
 
 class GameType(object):
@@ -41,12 +40,13 @@ class Weapon(object):
 
 
 class Server(object):
-    def __init__(self, name=None):
+    def __init__(self, name=None, hashkey=None, ip_addr=None):
         self.name = name
+        self.hashkey = hashkey
+        self.ip_addr = ip_addr
 
     def __repr__(self):
-        return "<Server(%s, %s, %s)>" % (self.server_id, self.name, 
-                self.ip_addr)
+        return "<Server(%s, %s)>" % (self.server_id, self.name.encode('utf-8'))
 
 
 class Map(object):
@@ -57,14 +57,10 @@ class Map(object):
         return "<Map(%s, %s, %s)>" % (self.map_id, self.name, self.version)
 
 
-class MapGameType(object):
-    def __repr__(self):
-        return "<MapGameType(%s, %s)>" % (self.map_id, self.game_type_cd)
-
-
 class Game(object):
-    def __init__(self, start_dt=None, game_type_cd=None, 
+    def __init__(self, game_id=None, start_dt=None, game_type_cd=None, 
             server_id=None, map_id=None, winner=None):
+        self.game_id = game_id
         self.start_dt = start_dt
         self.game_type_cd = game_type_cd
         self.server_id = server_id
@@ -80,18 +76,25 @@ class Game(object):
 
 
 class PlayerGameStat(object):
-    def __init__(self, create_dt=None):
+    def __init__(self, player_game_stat_id=None, create_dt=None):
+        self.player_game_stat_id = player_game_stat_id
         self.create_dt = create_dt
 
     def __repr__(self):
-        return "<PlayerGameStat(%s, %s, %s, %s)>" \
-        % (self.player_id, self.game_id, self.create_dt, self.stat_type)
+        return "<PlayerGameStat(%s, %s, %s)>" \
+        % (self.player_id, self.game_id, self.create_dt)
 
     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
@@ -106,10 +109,6 @@ class PlayerGameStat(object):
             return "pink"
 
 
-class GameMutator(object):
-    def __repr__(self):
-        return "<GameMutator(%s, %s)>" % (self.game_id, self.mutator_cd)
-
 class Achievement(object):
     def __repr__(self):
         return "<Achievement(%s, %s, %s)>" % (self.achievement_cd, self.descr,
@@ -136,6 +135,11 @@ class Hashkey(object):
         return "<Hashkey(%s, %s)>" % (self.player_id, self.hashkey)
 
 
+class PlayerNick(object):
+    def __repr__(self):
+        return "<PlayerNick(%s, %s)>" % (self.player_id, self.stripped_nick)
+
+
 def initialize_db(engine=None):
     DBSession.configure(bind=engine)
     Base.metadata.bind = engine
@@ -146,31 +150,27 @@ def initialize_db(engine=None):
     achievements_table = MetaData.tables['achievements']
     cd_achievement_table = MetaData.tables['cd_achievement']
     cd_game_type_table = MetaData.tables['cd_game_type']
-    cd_mutator_table = MetaData.tables['cd_mutator']
     cd_weapon_table = MetaData.tables['cd_weapon']
     db_version_table = MetaData.tables['db_version']
-    game_mutators_table = MetaData.tables['game_mutators']
     games_table = MetaData.tables['games']
     hashkeys_table = MetaData.tables['hashkeys']
-    map_game_types_table = MetaData.tables['map_game_types']
     maps_table = MetaData.tables['maps']
     player_game_stats_table = MetaData.tables['player_game_stats']
     players_table = MetaData.tables['players']
     player_weapon_stats_table = MetaData.tables['player_weapon_stats']
     servers_table = MetaData.tables['servers']
+    player_nicks_table = MetaData.tables['player_nicks']
 
     # now map the tables and the objects together
     mapper(PlayerAchievement, achievements_table)
     mapper(Achievement, cd_achievement_table)
     mapper(GameType, cd_game_type_table)
-    mapper(Mutator, cd_mutator_table)
     mapper(Weapon, cd_weapon_table)
-    mapper(GameMutator, game_mutators_table)
     mapper(Game, games_table)
     mapper(Hashkey, hashkeys_table)
-    mapper(MapGameType, map_game_types_table)
     mapper(Map, maps_table)
     mapper(PlayerGameStat, player_game_stats_table)
     mapper(Player, players_table)
     mapper(PlayerWeaponStat, player_weapon_stats_table)
     mapper(Server, servers_table)
+    mapper(PlayerNick, player_nicks_table)