Update the calendar trigger based on PR feedback (#90017)

This commit is contained in:
Allen Porter 2023-03-21 01:21:14 -07:00 committed by GitHub
parent d865440012
commit 43ce6f843c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -64,7 +64,7 @@ class Timespan:
"""Return a new interval shifted by the specified offset.""" """Return a new interval shifted by the specified offset."""
return Timespan(self.start + offset, self.end + offset) return Timespan(self.start + offset, self.end + offset)
def contains(self, trigger: datetime.datetime) -> bool: def __contains__(self, trigger: datetime.datetime) -> bool:
"""Return true if the trigger time is within the time span.""" """Return true if the trigger time is within the time span."""
return self.start <= trigger < self.end return self.start <= trigger < self.end
@ -83,7 +83,7 @@ class Timespan:
return Timespan(self.end, max(self.end, now) + interval) return Timespan(self.end, max(self.end, now) + interval)
def __str__(self) -> str: def __str__(self) -> str:
"""Return a compact string representation.""" """Return a string representing the half open interval timespan."""
return f"[{self.start}, {self.end})" return f"[{self.start}, {self.end})"
@ -125,9 +125,10 @@ def queued_event_fetcher(
for trigger_time, event in zip( for trigger_time, event in zip(
map(get_trigger_time, active_events), active_events map(get_trigger_time, active_events), active_events
): ):
if not offset_timespan.contains(trigger_time): if trigger_time not in offset_timespan:
continue continue
results.append(QueuedCalendarEvent(trigger_time + offset, event)) results.append(QueuedCalendarEvent(trigger_time + offset, event))
_LOGGER.debug( _LOGGER.debug(
"Scan events @ %s%s found %s eligble of %s active", "Scan events @ %s%s found %s eligble of %s active",
offset_timespan, offset_timespan,