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 34d38620a3025aa1b748054c5fa4ad242f64a7a8..0dcda1fc904815ef1928e81be2c90d661a342849 100755 (executable)
--- a/xonstat/models.py
+++ b/xonstat/models.py
@@ -40,8 +40,10 @@ 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)>" % (self.server_id, self.name.encode('utf-8'))
@@ -56,8 +58,9 @@ class Map(object):
 
 
 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
@@ -73,12 +76,13 @@ 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):
         if self.nick is None:
@@ -136,15 +140,6 @@ class PlayerNick(object):
         return "<PlayerNick(%s, %s)>" % (self.player_id, self.stripped_nick)
 
 
-class ServerHashkey(object):
-    def __init__(self, server_id=None, hashkey=None):
-        self.server_id = server_id
-        self.hashkey = hashkey
-
-    def __repr__(self):
-        return "<ServerHashkey(%s, %s)>" % (self.server_id, self.hashkey)
-
-
 def initialize_db(engine=None):
     DBSession.configure(bind=engine)
     Base.metadata.bind = engine
@@ -165,7 +160,6 @@ def initialize_db(engine=None):
     player_weapon_stats_table = MetaData.tables['player_weapon_stats']
     servers_table = MetaData.tables['servers']
     player_nicks_table = MetaData.tables['player_nicks']
-    server_hashkeys_table = MetaData.tables['server_hashkeys']
 
     # now map the tables and the objects together
     mapper(PlayerAchievement, achievements_table)
@@ -180,4 +174,3 @@ def initialize_db(engine=None):
     mapper(PlayerWeaponStat, player_weapon_stats_table)
     mapper(Server, servers_table)
     mapper(PlayerNick, player_nicks_table)
-    mapper(ServerHashkey, server_hashkeys_table)