evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MQTT Light - Do not throw if property is missing from templated MQTT message (#16720)

Browse source 
* Do not throw if property is missing

* Render template once, add debug prints
This commit is contained in:
emontnemery 2018-09-27 11:48:52 +02:00 • committed by Paulus Schoutsen
parent da3342f1aa
commit ad79dc673d
1 changed files with 44 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

52
homeassistant/components/light/mqtt.py
View file

@ -243,6 +243,10 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
def state_received(topic, payload, qos): def state_received(topic, payload, qos):
"""Handle new MQTT messages.""" """Handle new MQTT messages."""
payload = templates[CONF_STATE](payload) payload = templates[CONF_STATE](payload)
if not payload:
_LOGGER.debug("Ignoring empty state message from '%s'", topic)
return
if payload == self._payload['on']: if payload == self._payload['on']:
self._state = True self._state = True
elif payload == self._payload['off']: elif payload == self._payload['off']:
@ -259,7 +263,13 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
@callback @callback
def brightness_received(topic, payload, qos): def brightness_received(topic, payload, qos):
"""Handle new MQTT messages for the brightness.""" """Handle new MQTT messages for the brightness."""
device_value = float(templates[CONF_BRIGHTNESS](payload)) payload = templates[CONF_BRIGHTNESS](payload)
if not payload:
_LOGGER.debug("Ignoring empty brightness message from '%s'",
topic)
return
device_value = float(payload)
percent_bright = device_value / self._brightness_scale percent_bright = device_value / self._brightness_scale
self._brightness = int(percent_bright * 255) self._brightness = int(percent_bright * 255)
self.async_schedule_update_ha_state() self.async_schedule_update_ha_state()
@ -280,8 +290,12 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
@callback @callback
def rgb_received(topic, payload, qos): def rgb_received(topic, payload, qos):
"""Handle new MQTT messages for RGB.""" """Handle new MQTT messages for RGB."""
rgb = [int(val) for val in payload = templates[CONF_RGB](payload)
templates[CONF_RGB](payload).split(',')] if not payload:
_LOGGER.debug("Ignoring empty rgb message from '%s'", topic)
return
rgb = [int(val) for val in payload.split(',')]
self._hs = color_util.color_RGB_to_hs(*rgb) self._hs = color_util.color_RGB_to_hs(*rgb)
self.async_schedule_update_ha_state() self.async_schedule_update_ha_state()
@ -299,7 +313,13 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
@callback @callback
def color_temp_received(topic, payload, qos): def color_temp_received(topic, payload, qos):
"""Handle new MQTT messages for color temperature.""" """Handle new MQTT messages for color temperature."""
self._color_temp = int(templates[CONF_COLOR_TEMP](payload)) payload = templates[CONF_COLOR_TEMP](payload)
if not payload:
_LOGGER.debug("Ignoring empty color temp message from '%s'",
topic)
return
self._color_temp = int(payload)
self.async_schedule_update_ha_state() self.async_schedule_update_ha_state()
if self._topic[CONF_COLOR_TEMP_STATE_TOPIC] is not None: if self._topic[CONF_COLOR_TEMP_STATE_TOPIC] is not None:
@ -318,7 +338,12 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
@callback @callback
def effect_received(topic, payload, qos): def effect_received(topic, payload, qos):
"""Handle new MQTT messages for effect.""" """Handle new MQTT messages for effect."""
self._effect = templates[CONF_EFFECT](payload) payload = templates[CONF_EFFECT](payload)
if not payload:
_LOGGER.debug("Ignoring empty effect message from '%s'", topic)
return
self._effect = payload
self.async_schedule_update_ha_state() self.async_schedule_update_ha_state()
if self._topic[CONF_EFFECT_STATE_TOPIC] is not None: if self._topic[CONF_EFFECT_STATE_TOPIC] is not None:
@ -337,7 +362,13 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
@callback @callback
def white_value_received(topic, payload, qos): def white_value_received(topic, payload, qos):
"""Handle new MQTT messages for white value.""" """Handle new MQTT messages for white value."""
device_value = float(templates[CONF_WHITE_VALUE](payload)) payload = templates[CONF_WHITE_VALUE](payload)
if not payload:
_LOGGER.debug("Ignoring empty white value message from '%s'",
topic)
return
device_value = float(payload)
percent_white = device_value / self._white_value_scale percent_white = device_value / self._white_value_scale
self._white_value = int(percent_white * 255) self._white_value = int(percent_white * 255)
self.async_schedule_update_ha_state() self.async_schedule_update_ha_state()
@ -358,8 +389,13 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light):
@callback @callback
def xy_received(topic, payload, qos): def xy_received(topic, payload, qos):
"""Handle new MQTT messages for color.""" """Handle new MQTT messages for color."""
xy_color = [float(val) for val in payload = templates[CONF_XY](payload)
templates[CONF_XY](payload).split(',')] if not payload:
_LOGGER.debug("Ignoring empty xy-color message from '%s'",
topic)
return
xy_color = [float(val) for val in payload.split(',')]
self._hs = color_util.color_xy_to_hs(*xy_color) self._hs = color_util.color_xy_to_hs(*xy_color)
self.async_schedule_update_ha_state() self.async_schedule_update_ha_state()