home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-08-10 08:05:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

add-template: address PR comments

Browse Source
This commit is contained in:
Giang Vo
2017-11-02 07:46:16 +11:00
parent 440eed31b2
commit 42944b2dd9
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
homeassistant/components/fan/template.py
View File

@@ -94,12 +94,12 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
if str(temp_ids) != MATCH_ALL: if str(temp_ids) != MATCH_ALL:
template_entity_ids |= set(temp_ids) template_entity_ids |= set(temp_ids)
if speed_template is not None: if speed_template:
temp_ids = speed_template.extract_entities() temp_ids = speed_template.extract_entities()
if str(temp_ids) != MATCH_ALL: if str(temp_ids) != MATCH_ALL:
template_entity_ids |= set(temp_ids) template_entity_ids |= set(temp_ids)
if oscillating_template is not None: if oscillating_template:
temp_ids = oscillating_template.extract_entities() temp_ids = oscillating_template.extract_entities()
if str(temp_ids) != MATCH_ALL: if str(temp_ids) != MATCH_ALL:
template_entity_ids |= set(temp_ids) template_entity_ids |= set(temp_ids)
@@ -118,10 +118,6 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
) )
) )
if not fans:
_LOGGER.error("No fans added")
return False
async_add_devices(fans) async_add_devices(fans)
return True return True
@@ -148,11 +144,11 @@ class TemplateFan(FanEntity):
self._off_script = Script(hass, off_action) self._off_script = Script(hass, off_action)
self._set_speed_script = None self._set_speed_script = None
if set_speed_action is not None: if set_speed_action:
self._set_speed_script = Script(hass, set_speed_action) self._set_speed_script = Script(hass, set_speed_action)
self._set_oscillating_script = None self._set_oscillating_script = None
if set_oscillating_action is not None: if set_oscillating_action:
self._set_oscillating_script = Script(hass, set_oscillating_action) self._set_oscillating_script = Script(hass, set_oscillating_action)
self._state = False self._state = False
@@ -160,10 +156,10 @@ class TemplateFan(FanEntity):
self._oscillating = None self._oscillating = None
self._template.hass = self.hass self._template.hass = self.hass
if self._speed_template is not None: if self._speed_template:
self._speed_template.hass = self.hass self._speed_template.hass = self.hass
self._supported_features |= SUPPORT_SET_SPEED self._supported_features |= SUPPORT_SET_SPEED
if self._oscillating_template is not None: if self._oscillating_template:
self._oscillating_template.hass = self.hass self._oscillating_template.hass = self.hass
self._supported_features |= SUPPORT_OSCILLATE self._supported_features |= SUPPORT_OSCILLATE
@@ -225,7 +221,7 @@ class TemplateFan(FanEntity):
This method is a coroutine. This method is a coroutine.
""" """
self._state = False self._state = False
self.hass.async_add_job(self._off_script.async_run()) yield from self.hass.async_add_job(self._off_script.async_run())
@asyncio.coroutine @asyncio.coroutine
def async_set_speed(self, speed: str) -> None: def async_set_speed(self, speed: str) -> None:
@@ -308,7 +304,7 @@ class TemplateFan(FanEntity):
self._state = None self._state = None
# Update speed if 'speed_template' is configured # Update speed if 'speed_template' is configured
if self._speed_template is not None: if self._speed_template:
try: try:
speed = self._speed_template.async_render().lower() speed = self._speed_template.async_render().lower()
except TemplateError as ex: except TemplateError as ex:
@@ -328,7 +324,7 @@ class TemplateFan(FanEntity):
self._speed = None self._speed = None
# Update oscillating if 'oscillating_template' is configured # Update oscillating if 'oscillating_template' is configured
if self._oscillating_template is not None: if self._oscillating_template:
try: try:
oscillating = self._oscillating_template.async_render().lower() oscillating = self._oscillating_template.async_render().lower()
except TemplateError as ex: except TemplateError as ex: