Move caldav coordinator to its own file (#102976)
* Move caldav coordinator to its own file. * Remove unused offset.
This commit is contained in:
parent
82688d2a33
commit
4e22958486
2 changed files with 239 additions and 231 deletions
|
@ -1,10 +1,8 @@
|
|||
"""Support for WebDav Calendar."""
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import date, datetime, time, timedelta
|
||||
from functools import partial
|
||||
from datetime import datetime
|
||||
import logging
|
||||
import re
|
||||
|
||||
import caldav
|
||||
import voluptuous as vol
|
||||
|
@ -14,7 +12,6 @@ from homeassistant.components.calendar import (
|
|||
PLATFORM_SCHEMA,
|
||||
CalendarEntity,
|
||||
CalendarEvent,
|
||||
extract_offset,
|
||||
is_offset_reached,
|
||||
)
|
||||
from homeassistant.const import (
|
||||
|
@ -29,11 +26,9 @@ import homeassistant.helpers.config_validation as cv
|
|||
from homeassistant.helpers.entity import generate_entity_id
|
||||
from homeassistant.helpers.entity_platform import AddEntitiesCallback
|
||||
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
|
||||
from homeassistant.helpers.update_coordinator import (
|
||||
CoordinatorEntity,
|
||||
DataUpdateCoordinator,
|
||||
)
|
||||
from homeassistant.util import dt as dt_util
|
||||
from homeassistant.helpers.update_coordinator import CoordinatorEntity
|
||||
|
||||
from .coordinator import CalDavUpdateCoordinator
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
|
@ -43,7 +38,6 @@ CONF_CALENDAR = "calendar"
|
|||
CONF_SEARCH = "search"
|
||||
CONF_DAYS = "days"
|
||||
|
||||
OFFSET = "!!"
|
||||
|
||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
||||
{
|
||||
|
@ -68,8 +62,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
|||
}
|
||||
)
|
||||
|
||||
MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=15)
|
||||
|
||||
|
||||
def setup_platform(
|
||||
hass: HomeAssistant,
|
||||
|
@ -144,9 +136,7 @@ def setup_platform(
|
|||
add_entities(calendar_devices, True)
|
||||
|
||||
|
||||
class WebDavCalendarEntity(
|
||||
CoordinatorEntity["CalDavUpdateCoordinator"], CalendarEntity
|
||||
):
|
||||
class WebDavCalendarEntity(CoordinatorEntity[CalDavUpdateCoordinator], CalendarEntity):
|
||||
"""A device for getting the next Task from a WebDav Calendar."""
|
||||
|
||||
def __init__(self, name, entity_id, coordinator):
|
||||
|
@ -184,219 +174,3 @@ class WebDavCalendarEntity(
|
|||
"""When entity is added to hass update state from existing coordinator data."""
|
||||
await super().async_added_to_hass()
|
||||
self._handle_coordinator_update()
|
||||
|
||||
|
||||
class CalDavUpdateCoordinator(DataUpdateCoordinator[CalendarEvent | None]):
|
||||
"""Class to utilize the calendar dav client object to get next event."""
|
||||
|
||||
def __init__(self, hass, calendar, days, include_all_day, search):
|
||||
"""Set up how we are going to search the WebDav calendar."""
|
||||
super().__init__(
|
||||
hass,
|
||||
_LOGGER,
|
||||
name=f"CalDAV {calendar.name}",
|
||||
update_interval=MIN_TIME_BETWEEN_UPDATES,
|
||||
)
|
||||
self.calendar = calendar
|
||||
self.days = days
|
||||
self.include_all_day = include_all_day
|
||||
self.search = search
|
||||
self.offset = None
|
||||
|
||||
async def async_get_events(
|
||||
self, hass: HomeAssistant, start_date: datetime, end_date: datetime
|
||||
) -> list[CalendarEvent]:
|
||||
"""Get all events in a specific time frame."""
|
||||
# Get event list from the current calendar
|
||||
vevent_list = await hass.async_add_executor_job(
|
||||
partial(
|
||||
self.calendar.search,
|
||||
start=start_date,
|
||||
end=end_date,
|
||||
event=True,
|
||||
expand=True,
|
||||
)
|
||||
)
|
||||
event_list = []
|
||||
for event in vevent_list:
|
||||
if not hasattr(event.instance, "vevent"):
|
||||
_LOGGER.warning("Skipped event with missing 'vevent' property")
|
||||
continue
|
||||
vevent = event.instance.vevent
|
||||
if not self.is_matching(vevent, self.search):
|
||||
continue
|
||||
event_list.append(
|
||||
CalendarEvent(
|
||||
summary=self.get_attr_value(vevent, "summary") or "",
|
||||
start=self.to_local(vevent.dtstart.value),
|
||||
end=self.to_local(self.get_end_date(vevent)),
|
||||
location=self.get_attr_value(vevent, "location"),
|
||||
description=self.get_attr_value(vevent, "description"),
|
||||
)
|
||||
)
|
||||
|
||||
return event_list
|
||||
|
||||
async def _async_update_data(self) -> CalendarEvent | None:
|
||||
"""Get the latest data."""
|
||||
start_of_today = dt_util.start_of_local_day()
|
||||
start_of_tomorrow = dt_util.start_of_local_day() + timedelta(days=self.days)
|
||||
|
||||
# We have to retrieve the results for the whole day as the server
|
||||
# won't return events that have already started
|
||||
results = await self.hass.async_add_executor_job(
|
||||
partial(
|
||||
self.calendar.search,
|
||||
start=start_of_today,
|
||||
end=start_of_tomorrow,
|
||||
event=True,
|
||||
expand=True,
|
||||
),
|
||||
)
|
||||
|
||||
# Create new events for each recurrence of an event that happens today.
|
||||
# For recurring events, some servers return the original event with recurrence rules
|
||||
# and they would not be properly parsed using their original start/end dates.
|
||||
new_events = []
|
||||
for event in results:
|
||||
if not hasattr(event.instance, "vevent"):
|
||||
_LOGGER.warning("Skipped event with missing 'vevent' property")
|
||||
continue
|
||||
vevent = event.instance.vevent
|
||||
for start_dt in vevent.getrruleset() or []:
|
||||
_start_of_today: date | datetime
|
||||
_start_of_tomorrow: datetime | date
|
||||
if self.is_all_day(vevent):
|
||||
start_dt = start_dt.date()
|
||||
_start_of_today = start_of_today.date()
|
||||
_start_of_tomorrow = start_of_tomorrow.date()
|
||||
else:
|
||||
_start_of_today = start_of_today
|
||||
_start_of_tomorrow = start_of_tomorrow
|
||||
if _start_of_today <= start_dt < _start_of_tomorrow:
|
||||
new_event = event.copy()
|
||||
new_vevent = new_event.instance.vevent
|
||||
if hasattr(new_vevent, "dtend"):
|
||||
dur = new_vevent.dtend.value - new_vevent.dtstart.value
|
||||
new_vevent.dtend.value = start_dt + dur
|
||||
new_vevent.dtstart.value = start_dt
|
||||
new_events.append(new_event)
|
||||
elif _start_of_tomorrow <= start_dt:
|
||||
break
|
||||
vevents = [
|
||||
event.instance.vevent
|
||||
for event in results + new_events
|
||||
if hasattr(event.instance, "vevent")
|
||||
]
|
||||
|
||||
# dtstart can be a date or datetime depending if the event lasts a
|
||||
# whole day. Convert everything to datetime to be able to sort it
|
||||
vevents.sort(key=lambda x: self.to_datetime(x.dtstart.value))
|
||||
|
||||
vevent = next(
|
||||
(
|
||||
vevent
|
||||
for vevent in vevents
|
||||
if (
|
||||
self.is_matching(vevent, self.search)
|
||||
and (not self.is_all_day(vevent) or self.include_all_day)
|
||||
and not self.is_over(vevent)
|
||||
)
|
||||
),
|
||||
None,
|
||||
)
|
||||
|
||||
# If no matching event could be found
|
||||
if vevent is None:
|
||||
_LOGGER.debug(
|
||||
"No matching event found in the %d results for %s",
|
||||
len(vevents),
|
||||
self.calendar.name,
|
||||
)
|
||||
self.offset = None
|
||||
return None
|
||||
|
||||
# Populate the entity attributes with the event values
|
||||
(summary, offset) = extract_offset(
|
||||
self.get_attr_value(vevent, "summary") or "", OFFSET
|
||||
)
|
||||
self.offset = offset
|
||||
return CalendarEvent(
|
||||
summary=summary,
|
||||
start=self.to_local(vevent.dtstart.value),
|
||||
end=self.to_local(self.get_end_date(vevent)),
|
||||
location=self.get_attr_value(vevent, "location"),
|
||||
description=self.get_attr_value(vevent, "description"),
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def is_matching(vevent, search):
|
||||
"""Return if the event matches the filter criteria."""
|
||||
if search is None:
|
||||
return True
|
||||
|
||||
pattern = re.compile(search)
|
||||
return (
|
||||
hasattr(vevent, "summary")
|
||||
and pattern.match(vevent.summary.value)
|
||||
or hasattr(vevent, "location")
|
||||
and pattern.match(vevent.location.value)
|
||||
or hasattr(vevent, "description")
|
||||
and pattern.match(vevent.description.value)
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def is_all_day(vevent):
|
||||
"""Return if the event last the whole day."""
|
||||
return not isinstance(vevent.dtstart.value, datetime)
|
||||
|
||||
@staticmethod
|
||||
def is_over(vevent):
|
||||
"""Return if the event is over."""
|
||||
return dt_util.now() >= CalDavUpdateCoordinator.to_datetime(
|
||||
CalDavUpdateCoordinator.get_end_date(vevent)
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def to_datetime(obj):
|
||||
"""Return a datetime."""
|
||||
if isinstance(obj, datetime):
|
||||
return CalDavUpdateCoordinator.to_local(obj)
|
||||
return datetime.combine(obj, time.min).replace(tzinfo=dt_util.DEFAULT_TIME_ZONE)
|
||||
|
||||
@staticmethod
|
||||
def to_local(obj: datetime | date) -> datetime | date:
|
||||
"""Return a datetime as a local datetime, leaving dates unchanged.
|
||||
|
||||
This handles giving floating times a timezone for comparison
|
||||
with all day events and dropping the custom timezone object
|
||||
used by the caldav client and dateutil so the datetime can be copied.
|
||||
"""
|
||||
if isinstance(obj, datetime):
|
||||
return dt_util.as_local(obj)
|
||||
return obj
|
||||
|
||||
@staticmethod
|
||||
def get_attr_value(obj, attribute):
|
||||
"""Return the value of the attribute if defined."""
|
||||
if hasattr(obj, attribute):
|
||||
return getattr(obj, attribute).value
|
||||
return None
|
||||
|
||||
@staticmethod
|
||||
def get_end_date(obj):
|
||||
"""Return the end datetime as determined by dtend or duration."""
|
||||
if hasattr(obj, "dtend"):
|
||||
enddate = obj.dtend.value
|
||||
elif hasattr(obj, "duration"):
|
||||
enddate = obj.dtstart.value + obj.duration.value
|
||||
else:
|
||||
enddate = obj.dtstart.value + timedelta(days=1)
|
||||
|
||||
# End date for an all day event is exclusive. This fixes the case where
|
||||
# an all day event has a start and end values are the same, or the event
|
||||
# has a zero duration.
|
||||
if not isinstance(enddate, datetime) and obj.dtstart.value == enddate:
|
||||
enddate += timedelta(days=1)
|
||||
|
||||
return enddate
|
||||
|
|
234
homeassistant/components/caldav/coordinator.py
Normal file
234
homeassistant/components/caldav/coordinator.py
Normal file
|
@ -0,0 +1,234 @@
|
|||
"""Data update coordinator for caldav."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import date, datetime, time, timedelta
|
||||
from functools import partial
|
||||
import logging
|
||||
import re
|
||||
|
||||
from homeassistant.components.calendar import CalendarEvent, extract_offset
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
|
||||
from homeassistant.util import dt as dt_util
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=15)
|
||||
OFFSET = "!!"
|
||||
|
||||
|
||||
class CalDavUpdateCoordinator(DataUpdateCoordinator[CalendarEvent | None]):
|
||||
"""Class to utilize the calendar dav client object to get next event."""
|
||||
|
||||
def __init__(self, hass, calendar, days, include_all_day, search):
|
||||
"""Set up how we are going to search the WebDav calendar."""
|
||||
super().__init__(
|
||||
hass,
|
||||
_LOGGER,
|
||||
name=f"CalDAV {calendar.name}",
|
||||
update_interval=MIN_TIME_BETWEEN_UPDATES,
|
||||
)
|
||||
self.calendar = calendar
|
||||
self.days = days
|
||||
self.include_all_day = include_all_day
|
||||
self.search = search
|
||||
self.offset = None
|
||||
|
||||
async def async_get_events(
|
||||
self, hass: HomeAssistant, start_date: datetime, end_date: datetime
|
||||
) -> list[CalendarEvent]:
|
||||
"""Get all events in a specific time frame."""
|
||||
# Get event list from the current calendar
|
||||
vevent_list = await hass.async_add_executor_job(
|
||||
partial(
|
||||
self.calendar.search,
|
||||
start=start_date,
|
||||
end=end_date,
|
||||
event=True,
|
||||
expand=True,
|
||||
)
|
||||
)
|
||||
event_list = []
|
||||
for event in vevent_list:
|
||||
if not hasattr(event.instance, "vevent"):
|
||||
_LOGGER.warning("Skipped event with missing 'vevent' property")
|
||||
continue
|
||||
vevent = event.instance.vevent
|
||||
if not self.is_matching(vevent, self.search):
|
||||
continue
|
||||
event_list.append(
|
||||
CalendarEvent(
|
||||
summary=self.get_attr_value(vevent, "summary") or "",
|
||||
start=self.to_local(vevent.dtstart.value),
|
||||
end=self.to_local(self.get_end_date(vevent)),
|
||||
location=self.get_attr_value(vevent, "location"),
|
||||
description=self.get_attr_value(vevent, "description"),
|
||||
)
|
||||
)
|
||||
|
||||
return event_list
|
||||
|
||||
async def _async_update_data(self) -> CalendarEvent | None:
|
||||
"""Get the latest data."""
|
||||
start_of_today = dt_util.start_of_local_day()
|
||||
start_of_tomorrow = dt_util.start_of_local_day() + timedelta(days=self.days)
|
||||
|
||||
# We have to retrieve the results for the whole day as the server
|
||||
# won't return events that have already started
|
||||
results = await self.hass.async_add_executor_job(
|
||||
partial(
|
||||
self.calendar.search,
|
||||
start=start_of_today,
|
||||
end=start_of_tomorrow,
|
||||
event=True,
|
||||
expand=True,
|
||||
),
|
||||
)
|
||||
|
||||
# Create new events for each recurrence of an event that happens today.
|
||||
# For recurring events, some servers return the original event with recurrence rules
|
||||
# and they would not be properly parsed using their original start/end dates.
|
||||
new_events = []
|
||||
for event in results:
|
||||
if not hasattr(event.instance, "vevent"):
|
||||
_LOGGER.warning("Skipped event with missing 'vevent' property")
|
||||
continue
|
||||
vevent = event.instance.vevent
|
||||
for start_dt in vevent.getrruleset() or []:
|
||||
_start_of_today: date | datetime
|
||||
_start_of_tomorrow: datetime | date
|
||||
if self.is_all_day(vevent):
|
||||
start_dt = start_dt.date()
|
||||
_start_of_today = start_of_today.date()
|
||||
_start_of_tomorrow = start_of_tomorrow.date()
|
||||
else:
|
||||
_start_of_today = start_of_today
|
||||
_start_of_tomorrow = start_of_tomorrow
|
||||
if _start_of_today <= start_dt < _start_of_tomorrow:
|
||||
new_event = event.copy()
|
||||
new_vevent = new_event.instance.vevent
|
||||
if hasattr(new_vevent, "dtend"):
|
||||
dur = new_vevent.dtend.value - new_vevent.dtstart.value
|
||||
new_vevent.dtend.value = start_dt + dur
|
||||
new_vevent.dtstart.value = start_dt
|
||||
new_events.append(new_event)
|
||||
elif _start_of_tomorrow <= start_dt:
|
||||
break
|
||||
vevents = [
|
||||
event.instance.vevent
|
||||
for event in results + new_events
|
||||
if hasattr(event.instance, "vevent")
|
||||
]
|
||||
|
||||
# dtstart can be a date or datetime depending if the event lasts a
|
||||
# whole day. Convert everything to datetime to be able to sort it
|
||||
vevents.sort(key=lambda x: self.to_datetime(x.dtstart.value))
|
||||
|
||||
vevent = next(
|
||||
(
|
||||
vevent
|
||||
for vevent in vevents
|
||||
if (
|
||||
self.is_matching(vevent, self.search)
|
||||
and (not self.is_all_day(vevent) or self.include_all_day)
|
||||
and not self.is_over(vevent)
|
||||
)
|
||||
),
|
||||
None,
|
||||
)
|
||||
|
||||
# If no matching event could be found
|
||||
if vevent is None:
|
||||
_LOGGER.debug(
|
||||
"No matching event found in the %d results for %s",
|
||||
len(vevents),
|
||||
self.calendar.name,
|
||||
)
|
||||
self.offset = None
|
||||
return None
|
||||
|
||||
# Populate the entity attributes with the event values
|
||||
(summary, offset) = extract_offset(
|
||||
self.get_attr_value(vevent, "summary") or "", OFFSET
|
||||
)
|
||||
self.offset = offset
|
||||
return CalendarEvent(
|
||||
summary=summary,
|
||||
start=self.to_local(vevent.dtstart.value),
|
||||
end=self.to_local(self.get_end_date(vevent)),
|
||||
location=self.get_attr_value(vevent, "location"),
|
||||
description=self.get_attr_value(vevent, "description"),
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def is_matching(vevent, search):
|
||||
"""Return if the event matches the filter criteria."""
|
||||
if search is None:
|
||||
return True
|
||||
|
||||
pattern = re.compile(search)
|
||||
return (
|
||||
hasattr(vevent, "summary")
|
||||
and pattern.match(vevent.summary.value)
|
||||
or hasattr(vevent, "location")
|
||||
and pattern.match(vevent.location.value)
|
||||
or hasattr(vevent, "description")
|
||||
and pattern.match(vevent.description.value)
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def is_all_day(vevent):
|
||||
"""Return if the event last the whole day."""
|
||||
return not isinstance(vevent.dtstart.value, datetime)
|
||||
|
||||
@staticmethod
|
||||
def is_over(vevent):
|
||||
"""Return if the event is over."""
|
||||
return dt_util.now() >= CalDavUpdateCoordinator.to_datetime(
|
||||
CalDavUpdateCoordinator.get_end_date(vevent)
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def to_datetime(obj):
|
||||
"""Return a datetime."""
|
||||
if isinstance(obj, datetime):
|
||||
return CalDavUpdateCoordinator.to_local(obj)
|
||||
return datetime.combine(obj, time.min).replace(tzinfo=dt_util.DEFAULT_TIME_ZONE)
|
||||
|
||||
@staticmethod
|
||||
def to_local(obj: datetime | date) -> datetime | date:
|
||||
"""Return a datetime as a local datetime, leaving dates unchanged.
|
||||
|
||||
This handles giving floating times a timezone for comparison
|
||||
with all day events and dropping the custom timezone object
|
||||
used by the caldav client and dateutil so the datetime can be copied.
|
||||
"""
|
||||
if isinstance(obj, datetime):
|
||||
return dt_util.as_local(obj)
|
||||
return obj
|
||||
|
||||
@staticmethod
|
||||
def get_attr_value(obj, attribute):
|
||||
"""Return the value of the attribute if defined."""
|
||||
if hasattr(obj, attribute):
|
||||
return getattr(obj, attribute).value
|
||||
return None
|
||||
|
||||
@staticmethod
|
||||
def get_end_date(obj):
|
||||
"""Return the end datetime as determined by dtend or duration."""
|
||||
if hasattr(obj, "dtend"):
|
||||
enddate = obj.dtend.value
|
||||
elif hasattr(obj, "duration"):
|
||||
enddate = obj.dtstart.value + obj.duration.value
|
||||
else:
|
||||
enddate = obj.dtstart.value + timedelta(days=1)
|
||||
|
||||
# End date for an all day event is exclusive. This fixes the case where
|
||||
# an all day event has a start and end values are the same, or the event
|
||||
# has a zero duration.
|
||||
if not isinstance(enddate, datetime) and obj.dtstart.value == enddate:
|
||||
enddate += timedelta(days=1)
|
||||
|
||||
return enddate
|
Loading…
Add table
Reference in a new issue