Fix bug with handling of end_driving_delay config

Author: pnbruckner

custom_components/composite/config.py

@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from contextlib import suppress
+from datetime import timedelta
 import logging
 from pathlib import Path
 from typing import Any, cast
@@ -62,6 +63,17 @@ def _entities(entities: list[str | dict]) -> list[dict]:
     return result
 
 
+def _time_period_to_dict(delay: timedelta) -> dict[str, float]:
+    """Return timedelta as a dict."""
+    result: dict[str, float] = {}
+    if delay.days:
+        result["days"] = delay.days
+    result["hours"] = delay.seconds // 3600
+    result["minutes"] = (delay.seconds // 60) % 60
+    result["seconds"] = delay.seconds % 60
+    return result
+
+
 def _entity_picture(entity_picture: str) -> str:
     """Validate entity picture.
 
@@ -177,14 +189,15 @@ def _defaults(config: dict) -> dict:
     vol.Length(1),
     _entities,
 )
+_DELAY = vol.All(cv.positive_time_period, _time_period_to_dict)
 _TRACKER = {
     vol.Required(CONF_NAME): cv.string,
     vol.Optional(CONF_ID): cv.slugify,
     vol.Required(CONF_ENTITY_ID): _ENTITIES,
     vol.Optional(CONF_TIME_AS): cv.string,
     vol.Optional(CONF_REQ_MOVEMENT): cv.boolean,
     vol.Optional(CONF_DRIVING_SPEED): vol.Coerce(float),
-    vol.Optional(CONF_END_DRIVING_DELAY): cv.positive_time_period,
+    vol.Optional(CONF_END_DRIVING_DELAY): _DELAY,
     vol.Optional(CONF_ENTITY_PICTURE): vol.All(cv.string, _entity_picture),
 }
 _CONFIG_SCHEMA = vol.Schema(
@@ -201,8 +214,7 @@ def _defaults(config: dict) -> dict:
                                 CONF_REQ_MOVEMENT, default=DEF_REQ_MOVEMENT
                             ): cv.boolean,
                             vol.Optional(CONF_DRIVING_SPEED): vol.Coerce(float),
-                            vol.Optional(CONF_END_DRIVING_DELAY):
-                                cv.positive_time_period,
+                            vol.Optional(CONF_END_DRIVING_DELAY): _DELAY,
                         }
                     ),
                     vol.Required(CONF_TRACKERS, default=list): vol.All(

custom_components/composite/device_tracker.py

@@ -39,6 +39,7 @@
 )
 from homeassistant.core import Event, EventStateChangedData, HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
+import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_call_later, async_track_state_change_event
@@ -289,7 +290,10 @@ async def _process_config_options(self) -> None:
         options = cast(ConfigEntry, self.platform.config_entry).options
         self._req_movement = options[CONF_REQ_MOVEMENT]
         self._driving_speed = options.get(CONF_DRIVING_SPEED)
-        self._end_driving_delay = options.get(CONF_END_DRIVING_DELAY)
+        if (edd := options.get(CONF_END_DRIVING_DELAY)) is None:
+            self._end_driving_delay = None
+        else:
+            self._end_driving_delay = cast(timedelta, cv.time_period(edd))
         entity_cfgs = {
             entity_cfg[CONF_ENTITY]: entity_cfg
             for entity_cfg in options[CONF_ENTITY_ID]