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

MQTT: add support for + wildcard in subscribe

Browse Source
This commit is contained in:
Paulus Schoutsen 2015-08-10 21:49:19 -07:00
parent 969fe1f3b9
commit f79567f7db
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/mqtt.py
View File

@ -94,7 +94,8 @@ def subscribe(hass, topic, callback, qos=0):
def mqtt_topic_subscriber(event): def mqtt_topic_subscriber(event):
""" Match subscribed MQTT topic. """ """ Match subscribed MQTT topic. """
if _match_topic(topic, event.data[ATTR_TOPIC]): if _match_topic(topic, event.data[ATTR_TOPIC]):
callback(topic, event.data[ATTR_PAYLOAD], event.data[ATTR_QOS]) callback(event.data[ATTR_TOPIC], event.data[ATTR_PAYLOAD],
event.data[ATTR_QOS])
hass.bus.listen(EVENT_MQTT_MESSAGE_RECEIVED, mqtt_topic_subscriber) hass.bus.listen(EVENT_MQTT_MESSAGE_RECEIVED, mqtt_topic_subscriber)
@ -244,7 +245,12 @@ def _raise_on_error(result):
def _match_topic(subscription, topic): def _match_topic(subscription, topic):
""" Returns if topic matches subscription. """ """ Returns if topic matches subscription. """
if not subscription.endswith('#'): if subscription.endswith('#'):
return subscription == topic return (subscription[:-2] == topic or
topic.startswith(subscription[:-1]))
return subscription[:-2] == topic or topic.startswith(subscription[:-1]) sub_parts = subscription.split('/')
topic_parts = topic.split('/')
return (len(sub_parts) == len(topic_parts) and
all(a == b for a, b in zip(sub_parts, topic_parts) if a != '+'))