nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 23:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git@dev.dredd.it/dreddit-auth

Browse Source
This commit is contained in:
Andrew Williams
2010-07-01 12:32:01 +01:00
parent 1ddbbbe590 97c6f8f9bb
commit 73d7be470e
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
api/handlers.py
View File

@@ -125,11 +125,21 @@ class OpTimerHandler(BaseHandler):
params = {'userID':obj.id,'apiKey':obj.api_key,'characterID':FULL_API_CHARACTER_ID} params = {'userID':obj.id,'apiKey':obj.api_key,'characterID':FULL_API_CHARACTER_ID}
cached_doc = CachedDocument.objects.api_query('/char/UpcomingCalendarEvents.xml.aspx', params, exceptions=False) cached_doc = CachedDocument.objects.api_query('/char/UpcomingCalendarEvents.xml.aspx', params, exceptions=False)
print cached_doc.body
dom = minidom.parseString(cached_doc.body.encode('utf-8')) dom = minidom.parseString(cached_doc.body.encode('utf-8'))
enode = dom.getElementsByTagName('error') enode = dom.getElementsByTagName('error')
if enode: if enode:
return {'error':True} return {'ops':[{
'startsIn': -1,
'eventID': 0,
'ownerName': '',
'eventDate': '',
'eventTitle': '<div style="text-align:center">The EVE API is currently down</div>',
'duration': 0,
'isImportant': 0,
'eventText': 'Fuck CCP tbqh imho srsly',
'endsIn':-1
}]}
events = [] events = []
events_node_children = dom.getElementsByTagName('rowset')[0].childNodes events_node_children = dom.getElementsByTagName('rowset')[0].childNodes
@@ -143,6 +153,9 @@ class OpTimerHandler(BaseHandler):
now = datetime.utcnow() now = datetime.utcnow()
startsIn = int(dt.strftime('%s')) - int(now.strftime('%s')) startsIn = int(dt.strftime('%s')) - int(now.strftime('%s'))
duration = int(node.getAttribute('duration')) duration = int(node.getAttribute('duration'))
#In case people forget to set a duration, we'll give a default of 1 hour
if duration == 0:
duration = 3600
endsIn = startsIn + (duration * 60) endsIn = startsIn + (duration * 60)
if startsIn < 0: if startsIn < 0:
startsIn = 0 startsIn = 0
@@ -159,6 +172,18 @@ class OpTimerHandler(BaseHandler):
'endsIn':endsIn 'endsIn':endsIn
} }
events.append(event) events.append(event)
if len(events) == 0:
return {'ops':events} return {'ops':[{
'startsIn': -1,
'eventID': 0,
'ownerName': '',
'eventDate': '',
'eventTitle': '<div style="text-align:center">No ops are currently scheduled</div>',
'duration': 0,
'isImportant': 0,
'eventText': 'Add ops using EVE-Gate or the in-game calendar',
'endsIn':-1
}]}
else:
return {'ops':events}