Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-02-18 01:03:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

template: select: fix initial_value cannot be used with lambda (#2244)

Browse source
This commit is contained in:
Kamil Trzciński 2021-09-06 22:00:08 +02:00 • committed by GitHub
parent 4a6f1f150a
commit 2d91e6b977
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
esphome/components/template/select/__init__.py
View file

@ -19,17 +19,6 @@ TemplateSelect = template_ns.class_(
CONF_SET_ACTION = "set_action" CONF_SET_ACTION = "set_action"
def validate_initial_value_in_options(config):
if CONF_INITIAL_OPTION in config:
if config[CONF_INITIAL_OPTION] not in config[CONF_OPTIONS]:
raise cv.Invalid(
f"initial_option '{config[CONF_INITIAL_OPTION]}' is not a valid option [{', '.join(config[CONF_OPTIONS])}]"
)
else:
config[CONF_INITIAL_OPTION] = config[CONF_OPTIONS][0]
return config
def validate(config): def validate(config):
if CONF_LAMBDA in config: if CONF_LAMBDA in config:
if config[CONF_OPTIMISTIC]: if config[CONF_OPTIMISTIC]:
@ -38,6 +27,14 @@ def validate(config):
raise cv.Invalid("initial_value cannot be used with lambda") raise cv.Invalid("initial_value cannot be used with lambda")
if CONF_RESTORE_VALUE in config: if CONF_RESTORE_VALUE in config:
raise cv.Invalid("restore_value cannot be used with lambda") raise cv.Invalid("restore_value cannot be used with lambda")
elif CONF_INITIAL_OPTION in config:
if config[CONF_INITIAL_OPTION] not in config[CONF_OPTIONS]:
raise cv.Invalid(
f"initial_option '{config[CONF_INITIAL_OPTION]}' is not a valid option [{', '.join(config[CONF_OPTIONS])}]"
)
else:
config[CONF_INITIAL_OPTION] = config[CONF_OPTIONS][0]
if not config[CONF_OPTIMISTIC] and CONF_SET_ACTION not in config: if not config[CONF_OPTIMISTIC] and CONF_SET_ACTION not in config:
raise cv.Invalid( raise cv.Invalid(
"Either optimistic mode must be enabled, or set_action must be set, to handle the option being set." "Either optimistic mode must be enabled, or set_action must be set, to handle the option being set."
@ -59,7 +56,6 @@ CONFIG_SCHEMA = cv.All(
cv.Optional(CONF_RESTORE_VALUE): cv.boolean, cv.Optional(CONF_RESTORE_VALUE): cv.boolean,
} }
).extend(cv.polling_component_schema("60s")), ).extend(cv.polling_component_schema("60s")),
validate_initial_value_in_options,
validate, validate,
) )