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

MQTT Light: Use flash attribute in async_turn_off (#47919)

Browse Source
This commit is contained in:
Drzony 2021-03-15 11:24:07 +01:00 committed by GitHub
parent 7fe3c472e9
commit 99d1e3e71d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
homeassistant/components/mqtt/light/schema_json.py
View File

@ -341,6 +341,18 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
"""Flag supported features.""" """Flag supported features."""
return self._supported_features return self._supported_features
def _set_flash_and_transition(self, message, **kwargs):
if ATTR_TRANSITION in kwargs:
message["transition"] = kwargs[ATTR_TRANSITION]
if ATTR_FLASH in kwargs:
flash = kwargs.get(ATTR_FLASH)
if flash == FLASH_LONG:
message["flash"] = self._flash_times[CONF_FLASH_TIME_LONG]
elif flash == FLASH_SHORT:
message["flash"] = self._flash_times[CONF_FLASH_TIME_SHORT]
async def async_turn_on(self, **kwargs): async def async_turn_on(self, **kwargs):
"""Turn the device on. """Turn the device on.
@ -380,16 +392,7 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
self._hs = kwargs[ATTR_HS_COLOR] self._hs = kwargs[ATTR_HS_COLOR]
should_update = True should_update = True
if ATTR_FLASH in kwargs: self._set_flash_and_transition(message, **kwargs)
flash = kwargs.get(ATTR_FLASH)
if flash == FLASH_LONG:
message["flash"] = self._flash_times[CONF_FLASH_TIME_LONG]
elif flash == FLASH_SHORT:
message["flash"] = self._flash_times[CONF_FLASH_TIME_SHORT]
if ATTR_TRANSITION in kwargs:
message["transition"] = kwargs[ATTR_TRANSITION]
if ATTR_BRIGHTNESS in kwargs and self._config[CONF_BRIGHTNESS]: if ATTR_BRIGHTNESS in kwargs and self._config[CONF_BRIGHTNESS]:
brightness_normalized = kwargs[ATTR_BRIGHTNESS] / DEFAULT_BRIGHTNESS_SCALE brightness_normalized = kwargs[ATTR_BRIGHTNESS] / DEFAULT_BRIGHTNESS_SCALE
@ -449,8 +452,7 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
""" """
message = {"state": "OFF"} message = {"state": "OFF"}
if ATTR_TRANSITION in kwargs: self._set_flash_and_transition(message, **kwargs)
message["transition"] = kwargs[ATTR_TRANSITION]
mqtt.async_publish( mqtt.async_publish(
self.hass, self.hass,

12
tests/components/light/common.py
View File

@ -111,16 +111,20 @@ async def async_turn_on(
@bind_hass @bind_hass
def turn_off(hass, entity_id=ENTITY_MATCH_ALL, transition=None): def turn_off(hass, entity_id=ENTITY_MATCH_ALL, transition=None, flash=None):
"""Turn all or specified light off.""" """Turn all or specified light off."""
hass.add_job(async_turn_off, hass, entity_id, transition) hass.add_job(async_turn_off, hass, entity_id, transition, flash)
async def async_turn_off(hass, entity_id=ENTITY_MATCH_ALL, transition=None): async def async_turn_off(hass, entity_id=ENTITY_MATCH_ALL, transition=None, flash=None):
"""Turn all or specified light off.""" """Turn all or specified light off."""
data = { data = {
key: value key: value
for key, value in [(ATTR_ENTITY_ID, entity_id), (ATTR_TRANSITION, transition)] for key, value in [
(ATTR_ENTITY_ID, entity_id),
(ATTR_TRANSITION, transition),
(ATTR_FLASH, flash),
]
if value is not None if value is not None
} }

18
tests/components/mqtt/test_light_json.py
View File

@ -876,6 +876,24 @@ async def test_flash_short_and_long(hass, mqtt_mock):
state = hass.states.get("light.test") state = hass.states.get("light.test")
assert state.state == STATE_ON assert state.state == STATE_ON
await common.async_turn_off(hass, "light.test", flash="short")
mqtt_mock.async_publish.assert_called_once_with(
"test_light_rgb/set", JsonValidator('{"state": "OFF", "flash": 5}'), 0, False
)
mqtt_mock.async_publish.reset_mock()
state = hass.states.get("light.test")
assert state.state == STATE_OFF
await common.async_turn_off(hass, "light.test", flash="long")
mqtt_mock.async_publish.assert_called_once_with(
"test_light_rgb/set", JsonValidator('{"state": "OFF", "flash": 15}'), 0, False
)
mqtt_mock.async_publish.reset_mock()
state = hass.states.get("light.test")
assert state.state == STATE_OFF
async def test_transition(hass, mqtt_mock): async def test_transition(hass, mqtt_mock):
"""Test for transition time being sent when included.""" """Test for transition time being sent when included."""