Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix multi-day spanning events detection #10

Merged
merged 2 commits into from
Jul 13, 2024
Merged

Fix multi-day spanning events detection #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7e2d8b
fix: wrong logic for getting next outage
denysdovhan Jul 13, 2024
84fc2f7
fix: multi-day spanning events
denysdovhan Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 30 additions & 24 deletions custom_components/yasno_outages/coordinator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

LOGGER = logging.getLogger(__name__)

TIMEFRAME_TO_CHECK = datetime.timedelta(hours=24)


class YasnoOutagesCoordinator(DataUpdateCoordinator):
"""Class to manage fetching Yasno outages data."""
Expand Down Expand Up @@ -91,23 +93,37 @@ async def async_fetch_translations(self) -> None:
)
LOGGER.debug("Translations loaded: %s", self.translations)

def _get_next_event_of_type(self, state_type: str) -> CalendarEvent | None:
"""Get the next event of a specific type."""
now = dt_utils.now()
# Sort events to handle multi-day spanning events correctly
next_events = sorted(
self.get_events_between(
now,
now + TIMEFRAME_TO_CHECK,
translate=False,
),
key=lambda event: event.start,
)
LOGGER.debug("Next events: %s", next_events)
for event in next_events:
if self._event_to_state(event) == state_type and event.start > now:
return event
return None

@property
def next_outage(self) -> datetime.datetime | None:
"""Get the next outage time."""
next_events = self.get_next_events()
for event in next_events:
if self._event_to_state(event) == STATE_OFF:
return event.start
return None
event = self._get_next_event_of_type(STATE_OFF)
LOGGER.debug("Next outage: %s", event)
return event.start if event else None

@property
def next_possible_outage(self) -> datetime.datetime | None:
"""Get the next outage time."""
next_events = self.get_next_events()
for event in next_events:
if self._event_to_state(event) == STATE_MAYBE:
return event.start
return None
"""Get the next possible outage time."""
event = self._get_next_event_of_type(STATE_MAYBE)
LOGGER.debug("Next possible outage: %s", event)
return event.start if event else None

@property
def next_connectivity(self) -> datetime.datetime | None:
Expand All @@ -119,11 +135,9 @@ def next_connectivity(self) -> datetime.datetime | None:
return current_event.end

# Otherwise, return the next maybe event's end
next_events = self.get_next_events()
for event in next_events:
if self._event_to_state(event) == STATE_MAYBE:
return event.end
return None
event = self._get_next_event_of_type(STATE_MAYBE)
LOGGER.debug("Next connectivity: %s", event)
return event.end if event else None

@property
def current_state(self) -> str:
Expand All @@ -150,14 +164,6 @@ def get_events_between(
self._get_calendar_event(event, translate=translate) for event in events
]

def get_next_events(self) -> CalendarEvent:
"""Get the next event of a specific type."""
now = dt_utils.now()
current_event = self.get_event_at(now)
start = current_event.end if current_event else now
end = start + datetime.timedelta(days=1)
return self.get_events_between(start, end, translate=False)

def _get_calendar_event(
self,
event: dict | None,
Expand Down