Add native Python types support to templates (#41227)
Co-authored-by: Paulus Schoutsen <balloob@gmail.com>
This commit is contained in:
1 parent
cbb4324c84
commit
ee914366a8
29 files changed
+349
-282
No files matched your search
@@ -258,7 +258,7 @@ class CoverTemplate(TemplateEntity, CoverEntity):
|
||||
self._position = None
|
||||
return
|
||||
|
||||
state = result.lower()
|
||||
state = str(result).lower()
|
||||
if state in _VALID_STATES:
|
||||
if state in ("true", STATE_OPEN):
|
||||
self._position = 100
|
||||
|
||||
@@ -367,6 +367,7 @@ class TemplateFan(TemplateEntity, FanEntity):
|
||||
@callback
|
||||
def _update_speed(self, speed):
|
||||
# Validate speed
|
||||
speed = str(speed)
|
||||
if speed in self._speed_list:
|
||||
self._speed = speed
|
||||
elif speed in [STATE_UNAVAILABLE, STATE_UNKNOWN]:
|
||||
|
||||
@@ -412,7 +412,7 @@ class LightTemplate(TemplateEntity, LightEntity):
|
||||
self._available = True
|
||||
return
|
||||
|
||||
state = result.lower()
|
||||
state = str(result).lower()
|
||||
if state in _VALID_STATES:
|
||||
self._state = state in ("true", STATE_ON)
|
||||
else:
|
||||
@@ -451,12 +451,17 @@ class LightTemplate(TemplateEntity, LightEntity):
|
||||
@callback
|
||||
def _update_color(self, render):
|
||||
"""Update the hs_color from the template."""
|
||||
if render in ("None", ""):
|
||||
self._color = None
|
||||
return
|
||||
h_str, s_str = map(
|
||||
float, render.replace("(", "").replace(")", "").split(",", 1)
|
||||
)
|
||||
h_str = s_str = None
|
||||
if isinstance(render, str):
|
||||
if render in ("None", ""):
|
||||
self._color = None
|
||||
return
|
||||
h_str, s_str = map(
|
||||
float, render.replace("(", "").replace(")", "").split(",", 1)
|
||||
)
|
||||
elif isinstance(render, (list, tuple)) and len(render) == 2:
|
||||
h_str, s_str = render
|
||||
|
||||
if (
|
||||
h_str is not None
|
||||
and s_str is not None
|
||||
|
||||
@@ -120,7 +120,16 @@ class TemplateLock(TemplateEntity, LockEntity):
|
||||
if isinstance(result, TemplateError):
|
||||
self._state = None
|
||||
return
|
||||
self._state = result.lower() in ("true", STATE_ON, STATE_LOCKED)
|
||||
|
||||
if isinstance(result, bool):
|
||||
self._state = result
|
||||
return
|
||||
|
||||
if isinstance(result, str):
|
||||
self._state = result.lower() in ("true", STATE_ON, STATE_LOCKED)
|
||||
return
|
||||
|
||||
self._state = False
|
||||
|
||||
async def async_added_to_hass(self):
|
||||
"""Register callbacks."""
|
||||
|
||||
@@ -136,7 +136,16 @@ class SwitchTemplate(TemplateEntity, SwitchEntity, RestoreEntity):
|
||||
if isinstance(result, TemplateError):
|
||||
self._state = None
|
||||
return
|
||||
self._state = result.lower() in ("true", STATE_ON)
|
||||
|
||||
if isinstance(result, bool):
|
||||
self._state = result
|
||||
return
|
||||
|
||||
if isinstance(result, str):
|
||||
self._state = result.lower() in ("true", STATE_ON)
|
||||
return
|
||||
|
||||
self._state = False
|
||||
|
||||
async def async_added_to_hass(self):
|
||||
"""Register callbacks."""
|
||||
|
||||
Reference in new issue
Block a user