nemunaire/epaper
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: nemunaire:07c92550408f28448ff4a243e43a31ba0948a07b
Branches Tags
nemunaire:master
...
compare: nemunaire:960c1592cd63e9c96da7ab7f5a24c394f4b77d58
Branches Tags
nemunaire:master

2 Commits
07c9255040 ... 960c1592cd

Author SHA1 Message Date
Pierre-Olivier Mercier
960c1592cd Fix weather module when no air_quality available 2023-05-03 12:34:29 +02:00
Pierre-Olivier Mercier
4fb1f7f08f Fix Ical module when dealing with UTC event 2023-05-03 12:34:10 +02:00
2 changed files with 5 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
modules/ical.py
View File

@ -367,7 +367,7 @@ class IcalModule:
) )
elif "end" in evt and not isinstance(evt["end"], datetime): elif "end" in evt and not isinstance(evt["end"], datetime):
pass pass
elif "end" in evt and (("new_start" in evt and now > evt["new_start"]) or ("new_start" not in evt and now > evt["start"])): elif "end" in evt and (("new_start" in evt and now > evt["new_start"].astimezone(pytz.timezone('Europe/Paris'))) or ("new_start" not in evt and now > evt["start"].astimezone(pytz.timezone('Europe/Paris')))):
align += display_longtext(draw, align += display_longtext(draw,
(2 + fnt_R.getsize(evt["start"].astimezone(pytz.timezone('Europe/Paris')).strftime("%H:%M "))[0], align+line_height*0.6), (2 + fnt_R.getsize(evt["start"].astimezone(pytz.timezone('Europe/Paris')).strftime("%H:%M "))[0], align+line_height*0.6),
"Fin à " + (evt["new_end"] if "new_end" in evt else evt["end"]).astimezone(pytz.timezone('Europe/Paris')).strftime("%H:%M"), "Fin à " + (evt["new_end"] if "new_end" in evt else evt["end"]).astimezone(pytz.timezone('Europe/Paris')).strftime("%H:%M"),

5
modules/weather.py
View File

@ -224,12 +224,15 @@ class WeatherRainModule:
elif thisdayweather["avgvis_km"] < 10: elif thisdayweather["avgvis_km"] < 10:
gauge.add('Visibilité', [{'value': thisdayweather["avgvis_km"] * 10, 'color': '#999'}]) gauge.add('Visibilité', [{'value': thisdayweather["avgvis_km"] * 10, 'color': '#999'}])
icon_path = "wi-fog.png" icon_path = "wi-fog.png"
else: elif "air_quality" in thisdayweather:
gauge.add("Qualité de l'air", [{'value': thisdayweather["air_quality"]["gb-defra-index"] * 10}]) gauge.add("Qualité de l'air", [{'value': thisdayweather["air_quality"]["gb-defra-index"] * 10}])
if thisdayweather["air_quality"]["gb-defra-index"] >= 5: if thisdayweather["air_quality"]["gb-defra-index"] >= 5:
icon_path = "wi-smog.png" icon_path = "wi-smog.png"
else: else:
icon_path = "wi-smoke.png" icon_path = "wi-smoke.png"
else:
gauge.add('Vent', [{'value': thisdayweather["maxwind_kph"], 'color': '#999'}])
icon_path = "wi-wind-beaufort-1.png"
image = Image.open(io.BytesIO(gauge.render_to_png())) image = Image.open(io.BytesIO(gauge.render_to_png()))