Merge ec7b65ad95
into 8978457a67
commit
af038e963a
|
@ -1,11 +1,10 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import os
|
||||||
import requests
|
import requests
|
||||||
import urlparse
|
import urlparse
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
import os
|
|
||||||
|
|
||||||
|
|
||||||
class PyLevel2(object):
|
class PyLevel2(object):
|
||||||
|
|
||||||
|
@ -44,13 +43,13 @@ class PyLevel2(object):
|
||||||
if data:
|
if data:
|
||||||
for event in data:
|
for event in data:
|
||||||
if event.get('start'):
|
if event.get('start'):
|
||||||
event['start'] = datetime.fromtimestamp(event['start'])
|
event['start'] = datetime.fromtimestamp(event['start']).strftime('%Y-%m-%d %H:%M:%S')
|
||||||
if event.get('end'):
|
if event.get('end'):
|
||||||
event['end'] = datetime.fromtimestamp(event['end'])
|
event['end'] = datetime.fromtimestamp(event['end']).strftime('%Y-%m-%d %H:%M:%S')
|
||||||
if event.get('date'):
|
if event.get('date'):
|
||||||
# This value does not contains the year, so it is not really usable
|
# This value does not contains the year, so it is not really usable
|
||||||
# Get the day from the start time instead
|
# Get the day from the start time instead
|
||||||
event['date'] = event['start'].date()
|
event['date'] = event['start']
|
||||||
to_return.append(event)
|
to_return.append(event)
|
||||||
else:
|
else:
|
||||||
# invalid query
|
# invalid query
|
||||||
|
@ -69,7 +68,7 @@ class PyLevel2(object):
|
||||||
if response.status_code == 200:
|
if response.status_code == 200:
|
||||||
data = response.json()
|
data = response.json()
|
||||||
if data:
|
if data:
|
||||||
data['state']['lastchange'] = datetime.fromtimestamp(data['state']['lastchange'])
|
data['state']['lastchange'] = datetime.fromtimestamp(data['state']['lastchange']).strftime('%Y-%m-%d %H:%M:%S')
|
||||||
else:
|
else:
|
||||||
# invalid query
|
# invalid query
|
||||||
pass
|
pass
|
||||||
|
|
Loading…
Reference in New Issue