Loop until binding to the address

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

diff --git a/xonstat/models.py b/xonstat/models.py
index 73caedd2c54744ada57eb1ddc38186381617817b..eb0a1317647522517ad67be21bd6a45dee9b981d 100644 (file)
--- a/xonstat/models.py
+++ b/xonstat/models.py
@@ -4,6 +4,7 @@ import math
 import sqlalchemy
 import sqlalchemy.sql.functions as sfunc
 from calendar import timegm
+from datetime import datetime as dt
 from datetime import timedelta
 from sqlalchemy.orm import mapper
 from sqlalchemy.orm import scoped_session
@@ -67,6 +68,7 @@ class Server(object):
         self.name = name
         self.hashkey = hashkey
         self.ip_addr = ip_addr
+        self.create_dt = dt.utcnow()
 
     def __repr__(self):
         return "<Server(%s, %s)>" % (self.server_id, self.name.encode('utf-8'))
@@ -149,10 +151,8 @@ class PlayerGameStat(object):
             return html_colors(self.nick)
 
     def team_html_color(self):
-        # blue
         if self.team == 5:
             return "red"
-        # red
         if self.team == 14:
             return "blue"
         if self.team == 13:
@@ -243,6 +243,23 @@ class PlayerRank(object):
         return {'player_id':self.player_id, 'game_type_cd':self.game_type_cd, 'rank':self.rank}
 
 
+class PlayerCaptime(object):
+    def __init__(self, player_id=None, game_id=None, map_id=None,
+            fastest_cap=None):
+        self.player_id = player_id
+        self.game_id = game_id
+        self.map_id = map_id
+        self.fastest_cap = fastest_cap
+
+    def __repr__(self):
+        return "<PlayerCaptime(pid=%s, map_id=%s)>" % (self.player_id, self.map_id)
+
+
+class SummaryStat(object):
+    def __repr__(self):
+        return "<SummaryStat(total_players=%s, total_games=%s, total_servers=%s)>" % (self.total_players, self.total_games, self.total_servers)
+
+
 def initialize_db(engine=None):
     DBSession.configure(bind=engine)
     Base.metadata.bind = engine
@@ -265,6 +282,8 @@ def initialize_db(engine=None):
     player_nicks_table = MetaData.tables['player_nicks']
     player_elos_table = MetaData.tables['player_elos']
     player_ranks_table = MetaData.tables['player_ranks']
+    player_captimes_table = MetaData.tables['player_map_captimes']
+    summary_stats_table = MetaData.tables['summary_stats']
 
     # now map the tables and the objects together
     mapper(PlayerAchievement, achievements_table)
@@ -281,3 +300,5 @@ def initialize_db(engine=None):
     mapper(PlayerNick, player_nicks_table)
     mapper(PlayerElo, player_elos_table)
     mapper(PlayerRank, player_ranks_table)
+    mapper(PlayerCaptime, player_captimes_table)
+    mapper(SummaryStat, summary_stats_table)