X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Fmodels.py;h=6ee379cf706ae8c600f14c92893f417bafda80d3;hb=2dffdb9dbb4402376f774340251fa88006f68ebb;hp=6de2fa05666948a0bd9fcde785a0c1bf83fab754;hpb=71c8d6efdc344d0fc9b83d834f02f31ef6293916;p=xonotic%2Fxonstat.git diff --git a/xonstat/models.py b/xonstat/models.py index 6de2fa0..6ee379c 100644 --- a/xonstat/models.py +++ b/xonstat/models.py @@ -3,6 +3,8 @@ import logging 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 @@ -17,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: @@ -36,7 +38,13 @@ class Player(object): return "" % (self.player_id, self.nick.encode('utf-8')) def to_dict(self): - return {'player_id':self.player_id, 'name':self.nick.encode('utf-8')} + 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} + + def epoch(self): + return timegm(self.create_dt.timetuple()) class GameType(object): @@ -60,16 +68,21 @@ class Server(object): self.name = name self.hashkey = hashkey self.ip_addr = ip_addr + self.create_dt = dt.utcnow() def __repr__(self): return "" % (self.server_id, self.name.encode('utf-8')) def to_dict(self): - return {'server_id':self.server_id, 'name':self.name.encode('utf-8')} + return {'server_id':self.server_id, 'name':self.name, + 'ip_addr':self.ip_addr, 'location':self.location} def fuzzy_date(self): return pretty_date(self.create_dt) + def epoch(self): + return timegm(self.create_dt.timetuple()) + class Map(object): def __init__(self, name=None): @@ -79,13 +92,17 @@ class Map(object): return "" % (self.map_id, self.name, self.version) def to_dict(self): - return {'map_id':self.map_id, 'name':self.name, 'version':self.version} + return {'map_id':self.map_id, 'name':self.name, 'version':self.version,} def fuzzy_date(self): return pretty_date(self.create_dt) + def epoch(self): + return timegm(self.create_dt.timetuple()) + + 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 @@ -98,11 +115,15 @@ class Game(object): return "" % (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} + 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) + def epoch(self): + return timegm(self.start_dt.timetuple()) + class PlayerGameStat(object): def __init__(self, player_game_stat_id=None, create_dt=None): @@ -113,7 +134,9 @@ class PlayerGameStat(object): return "" % (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')} + return {'player_id':self.player_id, 'game_id':self.game_id, + 'create_dt':self.create_dt.strftime('%Y-%m-%dT%H:%M:%SZ'), + 'alivetime':self.alivetime, 'rank':self.rank, 'score':self.score, 'team':self.team} def nick_stripped(self): if self.nick is None: @@ -121,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: @@ -157,6 +178,13 @@ class PlayerAchievement(object): class PlayerWeaponStat(object): + def __init__(self): + self.fired = 0 + self.max = 0 + self.hit = 0 + self.actual = 0 + self.frags = 0 + def __repr__(self): return "" % (self.player_weapon_stats_id, self.player_id, self.game_id) @@ -194,19 +222,19 @@ class PlayerElo(object): self.games = 0 def __repr__(self): - return "" % (self.player_id, self.game_type_cd, self.elo) + return "" % (self.player_id, self.game_type_cd, self.elo, self.games) def to_dict(self): - return {'player_id':self.player_id, 'game_type_cd':self.game_type_cd, 'elo':self.elo} + return {'player_id':self.player_id, 'game_type_cd':self.game_type_cd, 'elo':self.elo, 'games':self.games} 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 "" % (self.player_id, self.game_type_cd, self.rank) @@ -215,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 "" % (self.player_id, self.map_id) + + +class SummaryStat(object): + def __repr__(self): + return "" % (self.total_players, self.total_games, self.total_servers) + + def initialize_db(engine=None): DBSession.configure(bind=engine) Base.metadata.bind = engine @@ -237,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) @@ -253,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)