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

Refactor child validation (#23482)

Browse source 
* Try to make the process more readable and paritioned.
* Validate child values using set message.
* Only validate using relevant schemas.
* Extract node validation.
* Rework const types and schemas.
* Rework child validator.
* Enhance warning logging message.
This commit is contained in:
Martin Hjelmare 2019-05-08 17:26:40 +02:00 • committed by Paulus Schoutsen
parent c384adeef4
commit c26af22edd
4 changed files with 214 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

21
homeassistant/components/mysensors/handler.py
View file

@ -7,26 +7,17 @@ from homeassistant.util import decorator
from .const import MYSENSORS_GATEWAY_READY, CHILD_CALLBACK, NODE_CALLBACK
from .device import get_mysensors_devices
from .helpers import discover_mysensors_platform, validate_child
from .helpers import discover_mysensors_platform, validate_set_msg
_LOGGER = logging.getLogger(__name__)
HANDLERS = decorator.Registry()
@HANDLERS.register('presentation')
async def handle_presentation(hass, hass_config, msg):
"""Handle a mysensors presentation message."""
# Handle both node and child presentation.
from mysensors.const import SYSTEM_CHILD_ID
if msg.child_id == SYSTEM_CHILD_ID:
return
_handle_child_update(hass, hass_config, msg)
@HANDLERS.register('set')
async def handle_set(hass, hass_config, msg):
"""Handle a mysensors set message."""
_handle_child_update(hass, hass_config, msg)
validated = validate_set_msg(msg)
_handle_child_update(hass, hass_config, validated)
@HANDLERS.register('internal')
@ -77,14 +68,12 @@ async def handle_gateway_ready(hass, hass_config, msg):
@callback
def _handle_child_update(hass, hass_config, msg):
def _handle_child_update(hass, hass_config, validated):
"""Handle a child update."""
child = msg.gateway.sensors[msg.node_id].children[msg.child_id]
signals = []
# Update all platforms for the device via dispatcher.
# Add/update entity if schema validates to true.
validated = validate_child(msg.gateway, msg.node_id, child)
# Add/update entity for validated children.
for platform, dev_ids in validated.items():
devices = get_mysensors_devices(hass, platform)
new_dev_ids = []