ical: Don't consider events after max coming date

This commit is contained in:
nemunaire 2023-01-19 15:00:49 +01:00
parent 14273995b7
commit 54a757e20d

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