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

Compare commits

base: nemunaire:aeacc05bd30dd42c1f81fca2e1790cc02780ce0d
Branches Tags
nemunaire:master
...
compare: nemunaire:54a757e20da6f697211249e849a3f3d57e92c734
Branches Tags
nemunaire:master

2 Commits
aeacc05bd3 ... 54a757e20d

Author SHA1 Message Date
Pierre-Olivier Mercier
54a757e20d ical: Don't consider events after max coming date 2023-01-19 15:00:49 +01:00
Pierre-Olivier Mercier
14273995b7 alerts: don't append exception based alert, just draw it 2023-01-19 14:59:50 +01:00
2 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

4
modules/__init__.py
View File

@ -161,11 +161,11 @@ class AlertsModule:
align = self.draw_alert(alert, width, image, draw, fnt_R, fnt_B, align, font_size) align = self.draw_alert(alert, width, image, draw, fnt_R, fnt_B, align, font_size)
except BaseException as e: except BaseException as e:
logging.exception(e) logging.exception(e)
self.alerts.append({ align = self.draw_alert({
"title": "Impossible de générer les alertes de " + alert.__name__, "title": "Impossible de générer les alertes de " + alert.__name__,
"description": type(e).__name__ + ": " + (e.message if hasattr(e, 'message') else str(e)), "description": type(e).__name__ + ": " + (e.message if hasattr(e, 'message') else str(e)),
"icon": "wi-earthquake.png", "icon": "wi-earthquake.png",
}) }, width, image, draw, fnt_R, fnt_B, align, font_size)
else: else:
align = self.draw_alert(alert, width, image, draw, fnt_R, fnt_B, align, font_size) align = self.draw_alert(alert, width, image, draw, fnt_R, fnt_B, align, font_size)

6
modules/ical.py
View File

@ -245,7 +245,7 @@ class IcalModule:
now = time.mktime(datetime.now(tz=pytz.timezone('Europe/Paris')).timetuple()) now = time.mktime(datetime.now(tz=pytz.timezone('Europe/Paris')).timetuple())
coming = time.mktime((datetime.now(tz=pytz.timezone('Europe/Paris')) + timedelta(minutes=self.delayed_departure)).timetuple()) coming = time.mktime((datetime.now(tz=pytz.timezone('Europe/Paris')) + timedelta(minutes=self.delayed_departure)).timetuple())
for evt in self.get_events(config): for evt in self.get_events(config, toofar=datetime.fromtimestamp(coming, tz=pytz.timezone('Europe/Paris'))):
# Looking only the first event # Looking only the first event
start = time.mktime(evt["start"].timetuple()) start = time.mktime(evt["start"].timetuple())
return now < start and start < coming return now < start and start < coming
@ -255,7 +255,7 @@ class IcalModule:
now = time.mktime(datetime.now(tz=pytz.timezone('Europe/Paris')).timetuple()) now = time.mktime(datetime.now(tz=pytz.timezone('Europe/Paris')).timetuple())
coming = time.mktime((datetime.now(tz=pytz.timezone('Europe/Paris')) + timedelta(minutes=self.delayed_departure)).timetuple()) coming = time.mktime((datetime.now(tz=pytz.timezone('Europe/Paris')) + timedelta(minutes=self.delayed_departure)).timetuple())
for evt in self.get_events(config): for evt in self.get_events(config, toofar=datetime.fromtimestamp(coming, tz=pytz.timezone('Europe/Paris'))):
if "location" in evt and ( if "location" in evt and (
evt["location"].lower().startswith("http") or evt["location"].lower().startswith("http") or
evt["location"].lower().startswith("ici") or evt["location"].lower().startswith("ici") or
@ -273,7 +273,7 @@ class IcalModule:
now = time.mktime((datetime.now(tz=pytz.timezone('Europe/Paris')) + timedelta(minutes=self.delayed_departure/3)).timetuple()) now = time.mktime((datetime.now(tz=pytz.timezone('Europe/Paris')) + timedelta(minutes=self.delayed_departure/3)).timetuple())
coming = time.mktime((datetime.now(tz=pytz.timezone('Europe/Paris')) + timedelta(minutes=self.delayed_departure/3)).timetuple()) coming = time.mktime((datetime.now(tz=pytz.timezone('Europe/Paris')) + timedelta(minutes=self.delayed_departure/3)).timetuple())
for evt in self.get_events(config): for evt in self.get_events(config, toofar=datetime.fromtimestamp(coming, tz=pytz.timezone('Europe/Paris'))):
if not("location" in evt and evt["location"].lower().startswith("ici")): if not("location" in evt and evt["location"].lower().startswith("ici")):
continue continue