The reflect option is deprecated. Use method instead.

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

diff --git a/xonstat/models.py b/xonstat/models.py
index b1e4ddfd2c181db29955ad0a4e134c41160d56bb..a4071843d73cb5c995fe64d5493df9005d98640c 100644 (file)
--- a/xonstat/models.py
+++ b/xonstat/models.py
@@ -4,12 +4,13 @@ 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
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.ext.declarative import declarative_base
-from xonstat.util import strip_colors, html_colors, pretty_date
+from xonstat.util import qfont_decode, strip_colors, html_colors, pretty_date
 
 log = logging.getLogger(__name__)
 
@@ -18,11 +19,11 @@ Base = declarative_base()
 
 # define objects for all tables
 class Player(object):
-    def nick_html_colors(self):
+    def nick_html_colors(self, limit=None):
         if self.nick is None:
             return "Anonymous Player"
         else:
-            return html_colors(self.nick)
+            return html_colors(self.nick, limit)
 
     def nick_strip_colors(self):
         if self.nick is None:
@@ -40,7 +41,7 @@ class Player(object):
         return {'player_id':self.player_id, 'nick':self.nick,
             'joined':self.create_dt.strftime('%Y-%m-%dT%H:%M:%SZ'),
             'active_ind':self.active_ind, 'location':self.location,
-            'stripped_nick':self.stripped_nick}
+            'stripped_nick':qfont_decode(self.stripped_nick)}
 
     def epoch(self):
         return timegm(self.create_dt.timetuple())
@@ -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'))
@@ -100,7 +102,7 @@ class Map(object):
 
 
 class Game(object):
-    def __init__(self, game_id=None, 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
@@ -142,17 +144,15 @@ class PlayerGameStat(object):
         else:
             return strip_colors(self.nick)
 
-    def nick_html_colors(self):
+    def nick_html_colors(self, limit=None):
         if self.nick is None:
             return "Anonymous Player"
         else:
-            return html_colors(self.nick)
+            return html_colors(self.nick, limit)
 
     def team_html_color(self):
-        # blue
         if self.team == 5:
             return "red"
-        # red
         if self.team == 14:
             return "blue"
         if self.team == 13:
@@ -206,10 +206,10 @@ class Hashkey(object):
 
 class PlayerNick(object):
     def __repr__(self):
-        return "<PlayerNick(%s, %s)>" % (self.player_id, self.stripped_nick)
+        return "<PlayerNick(%s, %s)>" % (self.player_id, qfont_decode(self.stripped_nick))
 
     def to_dict(self):
-        return {'player_id':self.player_id, 'name':self.stripped_nick}
+        return {'player_id':self.player_id, 'name':qfont_decode(self.stripped_nick)}
 
 
 class PlayerElo(object):
@@ -230,11 +230,11 @@ class PlayerElo(object):
 
 class PlayerRank(object):
 
-    def nick_html_colors(self):
+    def nick_html_colors(self, limit=None):
         if self.nick is None:
             return "Anonymous Player"
         else:
-            return html_colors(self.nick)
+            return html_colors(self.nick, limit)
 
     def __repr__(self):
         return "<PlayerRank(pid=%s, gametype=%s, rank=%s)>" % (self.player_id, self.game_type_cd, self.rank)
@@ -255,11 +255,47 @@ class PlayerCaptime(object):
         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)
+
+
+class TeamGameStat(object):
+    def __init__(self, team_game_stat_id=None, create_dt=None):
+        self.team_game_stat_id = team_game_stat_id
+        self.create_dt = create_dt
+
+    def __repr__(self):
+        return "<TeamGameStat(%s, %s, %s)>" % (self.team_game_stat_id, self.game_id, self.team)
+
+    def to_dict(self):
+        return {
+            'team_game_stat_id':self.team_game_stat_id,
+            'game_id':self.game_id,
+            'team':self.team,
+            'score':self.score,
+            'rounds':self.rounds,
+            'caps':self.caps,
+            'create_dt':self.create_dt.strftime('%Y-%m-%dT%H:%M:%SZ'),
+        }
+
+    def team_html_color(self):
+        if self.team == 5:
+            return "red"
+        if self.team == 14:
+            return "blue"
+        if self.team == 13:
+            return "yellow"
+        if self.team == 10:
+            return "pink"
+
+
 def initialize_db(engine=None):
     DBSession.configure(bind=engine)
     Base.metadata.bind = engine
     Base.metadata.create_all(engine)
-    MetaData = sqlalchemy.MetaData(bind=engine, reflect=True)
+    MetaData = sqlalchemy.MetaData(bind=engine)
+    MetaData.reflect()
 
     # assign all those tables to an object
     achievements_table = MetaData.tables['achievements']
@@ -278,6 +314,8 @@ def initialize_db(engine=None):
     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']
+    team_game_stats_table = MetaData.tables['team_game_stats']
 
     # now map the tables and the objects together
     mapper(PlayerAchievement, achievements_table)
@@ -295,3 +333,5 @@ def initialize_db(engine=None):
     mapper(PlayerElo, player_elos_table)
     mapper(PlayerRank, player_ranks_table)
     mapper(PlayerCaptime, player_captimes_table)
+    mapper(SummaryStat, summary_stats_table)
+    mapper(TeamGameStat, team_game_stats_table)