github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-03 19:46:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address review comments: add typing, pre-lowercase effect name

Browse Source
This commit is contained in:
J. Nick Koston
2026-02-25 15:05:24 -07:00
parent 427940f626
commit 1e806301bd
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/light/automation.py
+7 -5
View File
@@ -28,6 +28,7 @@ from esphome.const import (
) )
from esphome.core import CORE, Lambda from esphome.core import CORE, Lambda
from esphome.cpp_generator import LambdaExpression from esphome.cpp_generator import LambdaExpression
from esphome.types import ConfigType
from .types import ( from .types import (
COLOR_MODES, COLOR_MODES,
@@ -114,23 +115,24 @@ LIGHT_TURN_ON_ACTION_SCHEMA = automation.maybe_simple_id(
) )
def _resolve_effect_index(config): def _resolve_effect_index(config: ConfigType) -> int:
"""Resolve a static effect name to its 1-based index at codegen time. """Resolve a static effect name to its 1-based index at codegen time.
Effect index 0 means "None" (no effect). Effects are 1-indexed matching Effect index 0 means "None" (no effect). Effects are 1-indexed matching
the C++ convention in LightState. the C++ convention in LightState.
""" """
effect_name = config[CONF_EFFECT] original_name = config[CONF_EFFECT]
if effect_name.lower() == "none": effect_name = original_name.lower()
if effect_name == "none":
return 0 return 0
light_id = config[CONF_ID] light_id = config[CONF_ID]
light_path = CORE.config.get_path_for_id(light_id)[:-1] light_path = CORE.config.get_path_for_id(light_id)[:-1]
light_config = CORE.config.get_config_for_path(light_path) light_config = CORE.config.get_config_for_path(light_path)
for i, effect_conf in enumerate(light_config.get(CONF_EFFECTS, [])): for i, effect_conf in enumerate(light_config.get(CONF_EFFECTS, [])):
key = next(iter(effect_conf)) key = next(iter(effect_conf))
if effect_conf[key][CONF_NAME].lower() == effect_name.lower(): if effect_conf[key][CONF_NAME].lower() == effect_name:
return i + 1 return i + 1
raise ValueError(f"Effect '{effect_name}' not found in light '{light_id}'") raise ValueError(f"Effect '{original_name}' not found in light '{light_id}'")
@automation.register_action( @automation.register_action(