X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Fmodels%2Fgame.py;h=18cf9e8dc6be5f9839211d7a779aaec52623cebb;hb=7fe3ae838800023c9943948f565752e96d28acdc;hp=d221cec3a56990a89c6e69a655cb16efe152eff7;hpb=acf828ab53fd35b5d2fd39091b3314f4e376289e;p=xonotic%2Fxonstat.git diff --git a/xonstat/models/game.py b/xonstat/models/game.py index d221cec..18cf9e8 100644 --- a/xonstat/models/game.py +++ b/xonstat/models/game.py @@ -2,18 +2,17 @@ Models related to games. """ -from calendar import timegm +from xonstat.models.mixins import FuzzyDateMixin, EpochMixin +from xonstat.util import strip_colors, html_colors -from xonstat.util import pretty_date, strip_colors, html_colors - -class Game(object): +class Game(FuzzyDateMixin, EpochMixin): """ An individual game. """ - def __init__(self, game_id=None, start_dt=None, game_type_cd=None, - server_id=None, map_id=None, winner=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 @@ -22,7 +21,7 @@ class Game(object): self.winner = winner def __repr__(self): - return ("".format(self)) + return "".format(self) def to_dict(self): return { @@ -32,12 +31,6 @@ class Game(object): '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): """