Clean up xs_submit.

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

diff --git a/xonstat/models.py b/xonstat/models.py
index a8be3241fe11849b5851fb37f381466dc58f10b1..a8de35a489fc77815ea5334ceb2b1e60ee99c999 100644 (file)
--- a/xonstat/models.py
+++ b/xonstat/models.py
@@ -258,14 +258,16 @@ class PlayerRank(object):
 
 class PlayerCaptime(object):
     def __init__(self, player_id=None, game_id=None, map_id=None,
-            fastest_cap=None):
+            fastest_cap=None, mod=None):
         self.player_id = player_id
         self.game_id = game_id
         self.map_id = map_id
         self.fastest_cap = fastest_cap
+        self.mod = mod
 
     def __repr__(self):
-        return "<PlayerCaptime(pid=%s, map_id=%s)>" % (self.player_id, self.map_id)
+        return "<PlayerCaptime(pid=%s, map_id=%s, mod=%s)>" % (self.player_id,
+                self.map_id, self.mod)
 
     def fuzzy_date(self):
         return pretty_date(self.create_dt)
@@ -309,6 +311,28 @@ class TeamGameStat(object):
             return "pink"
 
 
+class PlayerGameAnticheat(object):
+    def __init__(self, player_id=None, game_id=None, key=None,
+            value=None, create_dt=None):
+        self.player_id                = player_id
+        self.game_id                  = game_id
+        self.key                      = key
+        self.value                    = value
+        self.create_dt                = create_dt
+
+    def __repr__(self):
+        return "<PlayerGameAnticheat(%s, %d)>" % (self.key, self.value)
+
+
+class PlayerGroups(object):
+    def __init__(self, player_id=None, group_name=None):
+        self.player_id  = player_id
+        self.group_name = group_name
+
+    def __repr__(self):
+        return "<PlayerGroups(%s, %s)>" % (self.player_id, self.group_name)
+
+
 def initialize_db(engine=None):
     DBSession.configure(bind=engine)
     Base.metadata.bind = engine
@@ -335,6 +359,8 @@ def initialize_db(engine=None):
     player_captimes_table = MetaData.tables['player_map_captimes']
     summary_stats_table = MetaData.tables['summary_stats']
     team_game_stats_table = MetaData.tables['team_game_stats']
+    player_game_anticheats_table = MetaData.tables['player_game_anticheats']
+    player_groups_table = MetaData.tables['player_groups']
 
     # now map the tables and the objects together
     mapper(PlayerAchievement, achievements_table)
@@ -354,3 +380,5 @@ def initialize_db(engine=None):
     mapper(PlayerCaptime, player_captimes_table)
     mapper(SummaryStat, summary_stats_table)
     mapper(TeamGameStat, team_game_stats_table)
+    mapper(PlayerGameAnticheat, player_game_anticheats_table)
+    mapper(PlayerGroups, player_groups_table)