X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Fmodels.py;h=23d4a4181972e39136edb94ee56b6b5c30612925;hb=ff5bb884f8c8aa96ad512f613a8d4b133d8b172a;hp=bcebb9c128069a13e7320acb657c0fa3983e4d1c;hpb=eaf0782cee739e0a6d5cca1c87ba5cb8d23079cd;p=xonotic%2Fxonstat.git diff --git a/xonstat/models.py b/xonstat/models.py index bcebb9c..23d4a41 100755 --- a/xonstat/models.py +++ b/xonstat/models.py @@ -3,26 +3,31 @@ 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 +from xonstat.util import strip_colors, html_colors, pretty_date DBSession = scoped_session(sessionmaker()) Base = declarative_base() # define objects for all tables class Player(object): - def nick_html_colors(self): - return html_colors(self.nick) + if self.nick is None: + return "Anonymous Player" + else: + return html_colors(self.nick) - def __repr__(self): - return "" % (self.player_id, self.nick, - self.create_dt, self.location) + def nick_strip_colors(self): + if self.nick is None: + return "Anonymous Player" + else: + return strip_colors(self.nick) + def joined_pretty_date(self): + return pretty_date(self.create_dt) -class Mutator(object): def __repr__(self): - return "" % (self.mutator_cd, self.name, - self.descr, self.active_ind) + return "" % (self.player_id, + self.nick.encode('utf-8')) class GameType(object): @@ -38,12 +43,13 @@ class Weapon(object): class Server(object): - def __init__(self, name=None): + def __init__(self, name=None, hashkey=None, ip_addr=None): self.name = name + self.hashkey = hashkey + self.ip_addr = ip_addr def __repr__(self): - return "" % (self.server_id, self.name, - self.ip_addr) + return "" % (self.server_id, self.name.encode('utf-8')) class Map(object): @@ -54,14 +60,10 @@ class Map(object): return "" % (self.map_id, self.name, self.version) -class MapGameType(object): - def __repr__(self): - return "" % (self.map_id, self.game_type_cd) - - class Game(object): - def __init__(self, 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 self.game_type_cd = game_type_cd self.server_id = server_id @@ -72,37 +74,43 @@ class Game(object): return "" % (self.game_id, self.start_dt, self.game_type_cd, self.server_id) + def fuzzy_date(self): + return pretty_date(self.start_dt) + class PlayerGameStat(object): - def __init__(self, create_dt=None): + def __init__(self, player_game_stat_id=None, create_dt=None): + self.player_game_stat_id = player_game_stat_id self.create_dt = create_dt def __repr__(self): - return "" \ - % (self.player_id, self.game_id, self.create_dt, self.stat_type) + return "" \ + % (self.player_id, self.game_id, self.create_dt) def nick_stripped(self): - return strip_colors(self.nick) + if self.nick is None: + return "Anonymous Player" + else: + return strip_colors(self.nick) def nick_html_colors(self): - return html_colors(self.nick) + if self.nick is None: + return "Anonymous Player" + else: + return html_colors(self.nick) def team_html_color(self): # blue if self.team == 5: - return "#312AB1" + return "blue" # red if self.team == 14: - return "#FF0033" + return "red" if self.team == 13: - return "#FFFF00" + return "yellow" if self.team == 10: - return "#FF00FF" - + return "pink" -class GameMutator(object): - def __repr__(self): - return "" % (self.game_id, self.mutator_cd) class Achievement(object): def __repr__(self): @@ -130,6 +138,11 @@ class Hashkey(object): return "" % (self.player_id, self.hashkey) +class PlayerNick(object): + def __repr__(self): + return "" % (self.player_id, self.stripped_nick) + + def initialize_db(engine=None): DBSession.configure(bind=engine) Base.metadata.bind = engine @@ -140,31 +153,27 @@ def initialize_db(engine=None): achievements_table = MetaData.tables['achievements'] cd_achievement_table = MetaData.tables['cd_achievement'] cd_game_type_table = MetaData.tables['cd_game_type'] - cd_mutator_table = MetaData.tables['cd_mutator'] cd_weapon_table = MetaData.tables['cd_weapon'] db_version_table = MetaData.tables['db_version'] - game_mutators_table = MetaData.tables['game_mutators'] games_table = MetaData.tables['games'] hashkeys_table = MetaData.tables['hashkeys'] - map_game_types_table = MetaData.tables['map_game_types'] maps_table = MetaData.tables['maps'] player_game_stats_table = MetaData.tables['player_game_stats'] players_table = MetaData.tables['players'] player_weapon_stats_table = MetaData.tables['player_weapon_stats'] servers_table = MetaData.tables['servers'] + player_nicks_table = MetaData.tables['player_nicks'] # now map the tables and the objects together mapper(PlayerAchievement, achievements_table) mapper(Achievement, cd_achievement_table) mapper(GameType, cd_game_type_table) - mapper(Mutator, cd_mutator_table) mapper(Weapon, cd_weapon_table) - mapper(GameMutator, game_mutators_table) mapper(Game, games_table) mapper(Hashkey, hashkeys_table) - mapper(MapGameType, map_game_types_table) mapper(Map, maps_table) mapper(PlayerGameStat, player_game_stats_table) mapper(Player, players_table) mapper(PlayerWeaponStat, player_weapon_stats_table) mapper(Server, servers_table) + mapper(PlayerNick, player_nicks_table)