allow wildcards in subscription (#12247)
* allow wildcards in subscription * remove whitespaces * make function public * also implement for mqtt_json * avoid mqtt-outside topic matching * add wildcard tests * add not matching wildcard tests * fix not-matching tests
This commit is contained in:
1 parent
1db4df6d3a
commit
cad9e9a4cb
4 files changed
+175
-34
No files matched your search
@@ -31,17 +31,14 @@ def async_setup_scanner(hass, config, async_see, discovery_info=None):
|
||||
devices = config[CONF_DEVICES]
|
||||
qos = config[CONF_QOS]
|
||||
|
||||
dev_id_lookup = {}
|
||||
|
||||
@callback
|
||||
def async_tracker_message_received(topic, payload, qos):
|
||||
"""Handle received MQTT message."""
|
||||
hass.async_add_job(
|
||||
async_see(dev_id=dev_id_lookup[topic], location_name=payload))
|
||||
|
||||
for dev_id, topic in devices.items():
|
||||
dev_id_lookup[topic] = dev_id
|
||||
@callback
|
||||
def async_message_received(topic, payload, qos, dev_id=dev_id):
|
||||
"""Handle received MQTT message."""
|
||||
hass.async_add_job(
|
||||
async_see(dev_id=dev_id, location_name=payload))
|
||||
|
||||
yield from mqtt.async_subscribe(
|
||||
hass, topic, async_tracker_message_received, qos)
|
||||
hass, topic, async_message_received, qos)
|
||||
|
||||
return True
|
||||
@@ -41,32 +41,26 @@ def async_setup_scanner(hass, config, async_see, discovery_info=None):
|
||||
devices = config[CONF_DEVICES]
|
||||
qos = config[CONF_QOS]
|
||||
|
||||
dev_id_lookup = {}
|
||||
|
||||
@callback
|
||||
def async_tracker_message_received(topic, payload, qos):
|
||||
"""Handle received MQTT message."""
|
||||
dev_id = dev_id_lookup[topic]
|
||||
|
||||
try:
|
||||
data = GPS_JSON_PAYLOAD_SCHEMA(json.loads(payload))
|
||||
except vol.MultipleInvalid:
|
||||
_LOGGER.error("Skipping update for following data "
|
||||
"because of missing or malformatted data: %s",
|
||||
payload)
|
||||
return
|
||||
except ValueError:
|
||||
_LOGGER.error("Error parsing JSON payload: %s", payload)
|
||||
return
|
||||
|
||||
kwargs = _parse_see_args(dev_id, data)
|
||||
hass.async_add_job(
|
||||
async_see(**kwargs))
|
||||
|
||||
for dev_id, topic in devices.items():
|
||||
dev_id_lookup[topic] = dev_id
|
||||
@callback
|
||||
def async_message_received(topic, payload, qos, dev_id=dev_id):
|
||||
"""Handle received MQTT message."""
|
||||
try:
|
||||
data = GPS_JSON_PAYLOAD_SCHEMA(json.loads(payload))
|
||||
except vol.MultipleInvalid:
|
||||
_LOGGER.error("Skipping update for following data "
|
||||
"because of missing or malformatted data: %s",
|
||||
payload)
|
||||
return
|
||||
except ValueError:
|
||||
_LOGGER.error("Error parsing JSON payload: %s", payload)
|
||||
return
|
||||
|
||||
kwargs = _parse_see_args(dev_id, data)
|
||||
hass.async_add_job(async_see(**kwargs))
|
||||
|
||||
yield from mqtt.async_subscribe(
|
||||
hass, topic, async_tracker_message_received, qos)
|
||||
hass, topic, async_message_received, qos)
|
||||
|
||||
return True
|
||||
|
||||
|
||||
Reference in new issue
Block a user