Change the query group by, return dict instead of Map.

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

diff --git a/xonstat/models.py b/xonstat/models.py
old mode 100755 (executable)
new mode 100644 (file)
index 50d0a35..39c6586
--- a/xonstat/models.py
+++ b/xonstat/models.py
@@ -1,3 +1,4 @@
+import json
 import logging
 import math
 import sqlalchemy
@@ -33,20 +34,26 @@ class Player(object):
         return pretty_date(self.create_dt)
 
     def __repr__(self):
-        return "<Player(%s, %s)>" % (self.player_id, 
-                self.nick.encode('utf-8'))
+        return "<Player(%s, %s)>" % (self.player_id, self.nick.encode('utf-8'))
+
+    def to_dict(self):
+        return {'player_id':self.player_id, 'name':self.nick.encode('utf-8')}
 
 
 class GameType(object):
     def __repr__(self):
-        return "<GameType(%s, %s, %s)>" % (self.game_type_cd, self.descr, 
-                self.active_ind)
+        return "<GameType(%s, %s, %s)>" % (self.game_type_cd, self.descr, self.active_ind)
+
+    def to_dict(self):
+        return {'game_type_cd':self.game_type_cd, 'name':self.descr, 'active':self.active_ind}
 
 
 class Weapon(object):
     def __repr__(self):
-        return "<Weapon(%s, %s, %s)>" % (self.weapon_cd, self.descr, 
-                self.active_ind)
+        return "<Weapon(%s, %s, %s)>" % (self.weapon_cd, self.descr, self.active_ind)
+
+    def to_dict(self):
+        return {'weapon_cd':self.weapon_cd, 'name':self.descr, 'active':self.active_ind}
 
 
 class Server(object):
@@ -58,6 +65,9 @@ class Server(object):
     def __repr__(self):
         return "<Server(%s, %s)>" % (self.server_id, self.name.encode('utf-8'))
 
+    def to_dict(self):
+        return {'server_id':self.server_id, 'name':self.name.encode('utf-8')}
+
 
 class Map(object):
     def __init__(self, name=None):
@@ -66,6 +76,9 @@ class Map(object):
     def __repr__(self):
         return "<Map(%s, %s, %s)>" % (self.map_id, self.name, self.version)
 
+    def to_dict(self):
+        return {'map_id':self.map_id, 'name':self.name, 'version':self.version}
+
 
 class Game(object):
     def __init__(self, game_id=None, start_dt=None, game_type_cd=None, 
@@ -78,8 +91,10 @@ class Game(object):
         self.winner = winner
 
     def __repr__(self):
-        return "<Game(%s, %s, %s, %s)>" % (self.game_id, self.start_dt, 
-                self.game_type_cd, self.server_id)
+        return "<Game(%s, %s, %s, %s)>" % (self.game_id, self.start_dt, self.game_type_cd, self.server_id)
+
+    def to_dict(self):
+        return {'game_id':self.game_id, 'start':self.start_dt.strftime('%Y-%m-%dT%H:%M:%SZ'), 'game_type_cd':self.game_type_cd, 'server_id':self.server_id}
 
     def fuzzy_date(self):
         return pretty_date(self.start_dt)
@@ -197,8 +212,10 @@ class PlayerGameStat(object):
         self.create_dt = create_dt
 
     def __repr__(self):
-        return "<PlayerGameStat(%s, %s, %s)>" \
-        % (self.player_id, self.game_id, self.create_dt)
+        return "<PlayerGameStat(%s, %s, %s)>" % (self.player_id, self.game_id, self.create_dt)
+
+    def to_dict(self):
+        return {'player_id':self.player_id, 'game_id':self.game_id, 'create_dt':self.create_dt.strftime('%Y-%m-%dT%H:%M:%SZ')}
 
     def nick_stripped(self):
         if self.nick is None:
@@ -227,19 +244,26 @@ class PlayerGameStat(object):
 
 class Achievement(object):
     def __repr__(self):
-        return "<Achievement(%s, %s, %s)>" % (self.achievement_cd, self.descr,
-                self.limit)
+        return "<Achievement(%s, %s, %s)>" % (self.achievement_cd, self.descr, self.limit)
+
+    def to_dict(self):
+        return {'achievement_cd':self.achievement_cd, 'name':self.descr, 'limit':self.limit}
 
 
 class PlayerAchievement(object):
     def __repr__(self):
         return "<PlayerAchievement(%s, %s)>" % (self.player_id, self.achievement_cd)
 
+    def to_dict(self):
+        return {'player_id':self.player_id, 'achievement_cd':self.achievement_cd}
+
 
 class PlayerWeaponStat(object):
     def __repr__(self):
-        return "<PlayerWeaponStat(%s, %s, %s)>" % (self.player_weapon_stats_id,
-                self.player_id, self.game_id)
+        return "<PlayerWeaponStat(%s, %s, %s)>" % (self.player_weapon_stats_id, self.player_id, self.game_id)
+
+    def to_dict(self):
+        return {'player_weapon_stats_id':self.player_weapon_stats_id, 'player_id':self.player_id, 'game_id':self.game_id}
 
 
 class Hashkey(object):
@@ -250,11 +274,17 @@ class Hashkey(object):
     def __repr__(self):
         return "<Hashkey(%s, %s)>" % (self.player_id, self.hashkey)
 
+    def to_dict(self):
+        return {'player_id':self.player_id, 'hashkey':self.hashkey}
+
 
 class PlayerNick(object):
     def __repr__(self):
         return "<PlayerNick(%s, %s)>" % (self.player_id, self.stripped_nick)
 
+    def to_dict(self):
+        return {'player_id':self.player_id, 'name':self.stripped_nick}
+
 
 class PlayerElo(object):
     def __init__(self, player_id=None, game_type_cd=None):
@@ -266,8 +296,25 @@ class PlayerElo(object):
         self.elo = ELOPARMS.initial
 
     def __repr__(self):
-        return "<PlayerElo(pid=%s, gametype=%s, elo=%s)>" % \
-                (self.player_id, self.game_type_cd, self.elo)
+        return "<PlayerElo(pid=%s, gametype=%s, elo=%s)>" % (self.player_id, self.game_type_cd, self.elo)
+
+    def to_dict(self):
+        return {'player_id':self.player_id, 'game_type_cd':self.game_type_cd, 'elo':self.elo}
+
+
+class PlayerRank(object):
+
+    def nick_html_colors(self):
+        if self.nick is None:
+            return "Anonymous Player"
+        else:
+            return html_colors(self.nick)
+
+    def __repr__(self):
+        return "<PlayerRank(pid=%s, gametype=%s, rank=%s)>" % (self.player_id, self.game_type_cd, self.rank)
+
+    def to_dict(self):
+        return {'player_id':self.player_id, 'game_type_cd':self.game_type_cd, 'rank':self.rank}
 
 
 def initialize_db(engine=None):
@@ -291,6 +338,7 @@ def initialize_db(engine=None):
     servers_table = MetaData.tables['servers']
     player_nicks_table = MetaData.tables['player_nicks']
     player_elos_table = MetaData.tables['player_elos']
+    player_ranks_table = MetaData.tables['player_ranks']
 
     # now map the tables and the objects together
     mapper(PlayerAchievement, achievements_table)
@@ -306,3 +354,4 @@ def initialize_db(engine=None):
     mapper(Server, servers_table)
     mapper(PlayerNick, player_nicks_table)
     mapper(PlayerElo, player_elos_table)
+    mapper(PlayerRank, player_ranks_table)