From 413de1312131aac85dcb086c73f4c4a326b66398 Mon Sep 17 00:00:00 2001 From: raylu Date: Mon, 21 Oct 2013 22:52:57 -0700 Subject: don't show :00 seconds the api always returns :00 --- db/queries.py | 5 +++++ web/api.py | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/db/queries.py b/db/queries.py index 5da3262..a760c34 100644 --- a/db/queries.py +++ b/db/queries.py @@ -43,6 +43,7 @@ def corporation(corp_id): else: characters[kill_id]['attackers'] += 1 for kill in kills: + kill['kill_time'] = _format_kill_time(kill['kill_time']) chars = characters[kill['kill_id']] kill['victim'] = chars['victim'] kill['final_blow'] = chars['final_blow'] @@ -56,6 +57,7 @@ def kill(kill_id): JOIN eve.mapSolarSystems ON solar_system_id = solarSystemID WHERE kill_id = ? ''', kill_id) + kill['kill_time'] = _format_kill_time(kill['kill_time']) characters = db.query(c, ''' SELECT character_id, character_name, damage, victim, final_blow, @@ -136,3 +138,6 @@ def kill(kill_id): 'items': items, 'slots': slots, } + +def _format_kill_time(kill_time): + return kill_time.strftime('%Y-%m-%d %H:%m') diff --git a/web/api.py b/web/api.py index 87d262e..0f19d0c 100644 --- a/web/api.py +++ b/web/api.py @@ -6,12 +6,6 @@ import tornado.web from config import web as config import db.queries -class JSONDateEncoder(json.JSONEncoder): - def default(self, data): - if isinstance(data, datetime.datetime): - return str(data) - return super(JSONDateEncoder, self).default(data) - class APIHandler(tornado.web.RequestHandler): def set_default_headers(self): self.set_header('Access-Control-Allow-Origin', '*') @@ -22,7 +16,7 @@ class APIHandler(tornado.web.RequestHandler): def respond_json(self, data): self.set_header('Content-Type', 'application/json; charset=UTF-8') - for chunk in JSONDateEncoder(indent='\t').iterencode(data): + for chunk in json.JSONEncoder(indent='\t').iterencode(data): self.write(chunk) self.finish() -- cgit v1.2.3