Fixes for new BOM_rrd python
This commit is contained in:
parent
89ac550635
commit
52e456f13d
17
bom_rrd2.py
17
bom_rrd2.py
|
@ -28,11 +28,11 @@ bedroom_temp = 0
|
||||||
|
|
||||||
lounge = rrdtool.fetch("/media/media/mqtt/ESP_4c7682/temp.rrd", "AVERAGE")
|
lounge = rrdtool.fetch("/media/media/mqtt/ESP_4c7682/temp.rrd", "AVERAGE")
|
||||||
rows = lounge[2][::-1]
|
rows = lounge[2][::-1]
|
||||||
for data in rows:
|
try:
|
||||||
if data[0] is not None:
|
lounge_temp = int(rows[1][0])
|
||||||
lounge_temp = int(data[0])
|
except TypeError:
|
||||||
break
|
lounge_temp = int(rows[2][0])
|
||||||
|
|
||||||
bom_icons = {
|
bom_icons = {
|
||||||
'sunny': 'SUNNY.JPG',
|
'sunny': 'SUNNY.JPG',
|
||||||
'clear': 'CLEAR.JPG',
|
'clear': 'CLEAR.JPG',
|
||||||
|
@ -85,8 +85,8 @@ if night:
|
||||||
new[day]['icon'] = bom_icons[weather['today']['icon_descriptor']]
|
new[day]['icon'] = bom_icons[weather['today']['icon_descriptor']]
|
||||||
else:
|
else:
|
||||||
new[day]['day'] = datetime.datetime.strptime(weather[day]['date'], "%Y-%m-%dT%H:%M:%S%z").strftime("%A")
|
new[day]['day'] = datetime.datetime.strptime(weather[day]['date'], "%Y-%m-%dT%H:%M:%S%z").strftime("%A")
|
||||||
new[day]['icon'] = bom_icons[weather['today']['icon_descriptor']]
|
new[day]['icon'] = bom_icons[weather[day]['icon_descriptor']]
|
||||||
new[day]['max'] = weather['today']['temp_max']
|
new[day]['max'] = weather[day]['temp_max']
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
|
||||||
|
@ -103,6 +103,7 @@ new['current']['outside'] = outside_temp
|
||||||
new['current']['bedroom'] = bedroom_temp
|
new['current']['bedroom'] = bedroom_temp
|
||||||
new['current']['lounge'] = lounge_temp
|
new['current']['lounge'] = lounge_temp
|
||||||
|
|
||||||
with open('bom.json', 'w') as output:
|
with open('/var/www/darksky/bom.json', 'w') as output:
|
||||||
output.write(json.dumps(new))
|
output.write(json.dumps(new))
|
||||||
output.close()
|
output.close()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue