From df51c07a8817e5cf9c65ae439a1e5832fd6228f5 Mon Sep 17 00:00:00 2001 From: Aaron Bach Date: Wed, 24 Jul 2019 00:26:25 -0600 Subject: [PATCH] Add area support to timer service schemas (#25440) * Add area support to timer service schemas * Base * Remove unnecessary TIMER_SERVICE_SCHEMA --- homeassistant/components/timer/__init__.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/homeassistant/components/timer/__init__.py b/homeassistant/components/timer/__init__.py index 04d9acc06af..ad3b365c37d 100644 --- a/homeassistant/components/timer/__init__.py +++ b/homeassistant/components/timer/__init__.py @@ -4,8 +4,9 @@ import logging import voluptuous as vol -from homeassistant.const import ATTR_ENTITY_ID, CONF_ICON, CONF_NAME +from homeassistant.const import CONF_ICON, CONF_NAME import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.config_validation import ENTITY_SERVICE_SCHEMA from homeassistant.helpers.entity_component import EntityComponent from homeassistant.helpers.event import async_track_point_in_utc_time from homeassistant.helpers.restore_state import RestoreEntity @@ -36,12 +37,7 @@ SERVICE_PAUSE = 'pause' SERVICE_CANCEL = 'cancel' SERVICE_FINISH = 'finish' -SERVICE_SCHEMA = vol.Schema({ - vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids, -}) - -SERVICE_SCHEMA_DURATION = vol.Schema({ - vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids, +SERVICE_SCHEMA_DURATION = ENTITY_SERVICE_SCHEMA.extend({ vol.Optional(ATTR_DURATION, default=timedelta(DEFAULT_DURATION)): cv.time_period, }) @@ -81,13 +77,13 @@ async def async_setup(hass, config): SERVICE_START, SERVICE_SCHEMA_DURATION, 'async_start') component.async_register_entity_service( - SERVICE_PAUSE, SERVICE_SCHEMA, + SERVICE_PAUSE, ENTITY_SERVICE_SCHEMA, 'async_pause') component.async_register_entity_service( - SERVICE_CANCEL, SERVICE_SCHEMA, + SERVICE_CANCEL, ENTITY_SERVICE_SCHEMA, 'async_cancel') component.async_register_entity_service( - SERVICE_FINISH, SERVICE_SCHEMA, + SERVICE_FINISH, ENTITY_SERVICE_SCHEMA, 'async_finish') await component.async_add_entities(entities)