dbus2mqtt 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

dbus2mqtt/dbus/dbus_client.py

@@ -745,12 +745,13 @@ class DbusClient:
                 path = message.body[0]
                 await self._handle_interfaces_removed(bus_name, path)
 
-
     async def _on_mqtt_msg(self, msg: MqttMessage):
-        # self.queue.put({
-        #     "topic": topic,
-        #     "payload": payload
-        # })
+        """Executes dbus method calls or property updates on objects when messages have
+        1. a matching subscription configured
+        2. a matching method
+        3. a matching bus_name (if provided)
+        4. a matching path (if provided)
+        """
 
         found_matching_topic = False
         for subscription_configs in self.config.subscriptions:
@@ -766,6 +767,9 @@ class DbusClient:
         matched_method = False
         matched_property = False
 
+        payload_bus_name = msg.payload.get("bus_name") or "*"
+        payload_path = msg.payload.get("path") or "*"
+
         payload_method = msg.payload.get("method")
         payload_method_args = msg.payload.get("args") or []
 
@@ -773,47 +777,44 @@ class DbusClient:
         payload_value = msg.payload.get("value")
 
         if payload_method is None and (payload_property is None or payload_value is None):
-            logger.info(f"on_mqtt_msg: Unsupported payload, missing 'method' or 'property/value', got method={payload_method}, property={payload_property}, value={payload_value} from {msg.payload}")
+            if msg.payload:
+                logger.info(f"on_mqtt_msg: Unsupported payload, missing 'method' or 'property/value', got method={payload_method}, property={payload_property}, value={payload_value} from {msg.payload}")
             return
 
         for [bus_name, bus_name_subscription] in self.subscriptions.items():
-            for [path, proxy_object] in bus_name_subscription.path_objects.items():
-                for subscription_configs in self.config.get_subscription_configs(bus_name=bus_name, path=path):
-                    for interface_config in subscription_configs.interfaces:
-
-                        for method in interface_config.methods:
-
-                            # filter configured method, configured topic, ...
-                            if method.method == payload_method:
-                                interface = proxy_object.get_interface(name=interface_config.interface)
-                                matched_method = True
-
-                                try:
-                                    logger.info(f"on_mqtt_msg: method={method.method}, args={payload_method_args}, bus_name={bus_name}, path={path}, interface={interface_config.interface}")
-                                    await self.call_dbus_interface_method(interface, method.method, payload_method_args)
-                                except Exception as e:
-                                    logger.warning(f"on_mqtt_msg: method={method.method}, args={payload_method_args}, bus_name={bus_name} failed, exception={e}")
-
-                        for property in interface_config.properties:
-                            # filter configured property, configured topic, ...
-                            if property.property == payload_property:
-                                interface = proxy_object.get_interface(name=interface_config.interface)
-                                matched_property = True
-
-                                try:
-                                    logger.info(f"on_mqtt_msg: property={property.property}, value={payload_value}, bus_name={bus_name}, path={path}, interface={interface_config.interface}")
-                                    await self.set_dbus_interface_property(interface, property.property, payload_value)
-                                except Exception as e:
-                                    logger.warning(f"on_mqtt_msg: property={property.property}, value={payload_value}, bus_name={bus_name} failed, exception={e}")
+            if fnmatch.fnmatchcase(bus_name, payload_bus_name):
+                for [path, proxy_object] in bus_name_subscription.path_objects.items():
+                    if fnmatch.fnmatchcase(path, payload_path):
+                        for subscription_configs in self.config.get_subscription_configs(bus_name=bus_name, path=path):
+                            for interface_config in subscription_configs.interfaces:
+
+                                for method in interface_config.methods:
+
+                                    # filter configured method, configured topic, ...
+                                    if method.method == payload_method:
+                                        interface = proxy_object.get_interface(name=interface_config.interface)
+                                        matched_method = True
+
+                                        try:
+                                            logger.info(f"on_mqtt_msg: method={method.method}, args={payload_method_args}, bus_name={bus_name}, path={path}, interface={interface_config.interface}")
+                                            await self.call_dbus_interface_method(interface, method.method, payload_method_args)
+                                        except Exception as e:
+                                            logger.warning(f"on_mqtt_msg: method={method.method}, args={payload_method_args}, bus_name={bus_name} failed, exception={e}")
+
+                                for property in interface_config.properties:
+                                    # filter configured property, configured topic, ...
+                                    if property.property == payload_property:
+                                        interface = proxy_object.get_interface(name=interface_config.interface)
+                                        matched_property = True
+
+                                        try:
+                                            logger.info(f"on_mqtt_msg: property={property.property}, value={payload_value}, bus_name={bus_name}, path={path}, interface={interface_config.interface}")
+                                            await self.set_dbus_interface_property(interface, property.property, payload_value)
+                                        except Exception as e:
+                                            logger.warning(f"on_mqtt_msg: property={property.property}, value={payload_value}, bus_name={bus_name} failed, exception={e}")
 
         if not matched_method and not matched_property:
             if payload_method:
-                logger.info(f"No configured or active dbus subscriptions for topic={msg.topic}, method={payload_method}, active bus_names={list(self.subscriptions.keys())}")
+                logger.info(f"No configured or active dbus subscriptions for topic={msg.topic}, method={payload_method}, bus_name={payload_bus_name}, path={payload_path or '*'}, active bus_names={list(self.subscriptions.keys())}")
             if payload_property:
-                logger.info(f"No configured or active dbus subscriptions for topic={msg.topic}, property={payload_property}, active bus_names={list(self.subscriptions.keys())}")
-
-        # raw mode, payload contains: bus_name (specific or wildcard), path, interface_name
-        # topic: dbus2mqtt/raw (with allowlist check)
-
-        # predefined mode with topic matching from configuration
-        # topic: dbus2mqtt/MediaPlayer/command
+                logger.info(f"No configured or active dbus subscriptions for topic={msg.topic}, property={payload_property}, bus_name={payload_bus_name}, path={payload_path or '*'}, active bus_names={list(self.subscriptions.keys())}")

dbus2mqtt/mqtt/mqtt_client.py

@@ -117,7 +117,7 @@ class MqttClient:
             return
 
         try:
-            json_payload = json.loads(payload)
+            json_payload = json.loads(payload) if payload else {}
             logger.debug(f"on_message: msg.topic={msg.topic}, msg.payload={json.dumps(json_payload)}")
             self.event_broker.on_mqtt_receive(MqttMessage(msg.topic, json_payload))
         except json.JSONDecodeError as e:

{dbus2mqtt-0.4.0.dist-info → dbus2mqtt-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbus2mqtt
-Version: 0.4.0
+Version: 0.4.1
 Summary: A Python tool to expose Linux D-Bus signals, methods and properties over MQTT - featuring templating, payload enrichment and Home Assistant-ready examples 
 Project-URL: Repository, https://github.com/jwnmulder/dbus2mqtt.git
 Project-URL: Issues, https://github.com/jwnmulder/dbus2mqtt/issues
@@ -173,21 +173,31 @@ dbus:
 
 This configuration will expose 2 methods. Triggering methods can be done by publishing json messages to the `dbus2mqtt/org.mpris.MediaPlayer2/command` MQTT topic. Arguments can be passed along in `args`.
 
-Note that methods are called on **all** bus_names matching the configured pattern
+Some examples that call methods  on **all** bus_names matching the configured pattern
 
 ```json
 {
-    "method" : "Play",
+    "method": "Play",
 }
 ```
 
 ```json
 {
-    "method" : "OpenUri",
+    "method": "OpenUri",
     "args": []
 }
 ```
 
+To specifically target objects the properties `bus_name` and/or `path` can be used. Both properties support wildcards
+
+```json
+{
+    "method": "Play",
+    "bus_name": "*.firefox",
+    "path": "/org/mpris/MediaPlayer2"
+}
+```
+
 ### Exposing dbus signals
 
 Publishing signals to MQTT topics works by subscribing to the relevant signal and using flows for publishing

{dbus2mqtt-0.4.0.dist-info → dbus2mqtt-0.4.1.dist-info}/RECORD

@@ -4,7 +4,7 @@ dbus2mqtt/event_broker.py,sha256=Hp5yurhP8FkAO-y0l2grygHxR2e37ZQ7QScjcQDA2UU,133
 dbus2mqtt/main.py,sha256=Kr2LRVxWcPDtNwCj8Eqz9TxtGLAVrV4q0nizKh1pLXc,4539
 dbus2mqtt/config/__init__.py,sha256=LXQg2cZ_vMvhAl7_cC6G3gxCaLCq9uaTfZqw7OEXkPQ,5104
 dbus2mqtt/config/jsonarparse.py,sha256=VJGFeyQJcOE6bRXlSRr3FClvN_HnmiIlEGmOgNM0oCc,1214
-dbus2mqtt/dbus/dbus_client.py,sha256=0XneV3wulj6d_l4Jq9KIwROC19DLF853u6weCdyxpwA,39222
+dbus2mqtt/dbus/dbus_client.py,sha256=zWz9V0lbGzbb3AifqWrwkOaC9OdZtQbfHhkSSJfXMi8,39690
 dbus2mqtt/dbus/dbus_types.py,sha256=NmPD9um499e49Pk8DWH4IrIPQh1BinHYQgoXllCNiDw,777
 dbus2mqtt/dbus/dbus_util.py,sha256=h-1Y8Mvz9bj9X7mPZ8LghkvXDrujdJHK0__AOW373hE,697
 dbus2mqtt/dbus/introspection_patches/mpris_playerctl.py,sha256=q93d_Yp93u3Y-9q0dRdKW5hrij9GK3CFqKhUWVE8uw4,5883
@@ -13,11 +13,11 @@ dbus2mqtt/flow/__init__.py,sha256=tAL-CjXQHq_tGTKctIdOZ5teVKBtcJs6Astq_RdruV8,15
 dbus2mqtt/flow/flow_processor.py,sha256=-fJ5JPFcFqz1RokKaqjdHoU-EPg5McAERKYFwIkMzgU,8749
 dbus2mqtt/flow/actions/context_set.py,sha256=dIT39MJJVb0wuRI_ZM3ssnXYfa-iyB4o_UZD-1BZL2g,1087
 dbus2mqtt/flow/actions/mqtt_publish.py,sha256=psNkTvaR3JZwAwpM4AqiZTDnA5UQX9r4CUZ1LA7iRW4,2366
-dbus2mqtt/mqtt/mqtt_client.py,sha256=0d8XSe4-WxrUBxcUprukwxgzIhnCn1G0fCPnLqPp9ko,5148
+dbus2mqtt/mqtt/mqtt_client.py,sha256=R0ZNUmOr8Lg8s2TuUcjH3BvEPPlNK731tzO0tNVvqqs,5167
 dbus2mqtt/template/dbus_template_functions.py,sha256=UEoXK2PqDKF6jR4vTFHQwq58f5APnOJr7B1_I1zW8yM,2449
 dbus2mqtt/template/templating.py,sha256=ZLp1A8PFAs_-Bndx4yGqyppaDfh8marHlK7P3bFInu4,4144
-dbus2mqtt-0.4.0.dist-info/METADATA,sha256=enb7xSlQVzVTVxCLshavr5HoV8tNamfd2AOJzgel_Sg,7887
-dbus2mqtt-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dbus2mqtt-0.4.0.dist-info/entry_points.txt,sha256=pmmacoHCsvTTUB5dIPaY4i0H9gX7BQlpd3rBU-Jbv3A,50
-dbus2mqtt-0.4.0.dist-info/licenses/LICENSE,sha256=a4bIEgyA9rrnAfUN90CgbgZ6BQIFHeABkk0JihiBaxM,1074
-dbus2mqtt-0.4.0.dist-info/RECORD,,
+dbus2mqtt-0.4.1.dist-info/METADATA,sha256=LR9PxxTxJ6TcxHpa8YKg9E6uWRDWYRBbpQ5-o5QGTxQ,8114
+dbus2mqtt-0.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dbus2mqtt-0.4.1.dist-info/entry_points.txt,sha256=pmmacoHCsvTTUB5dIPaY4i0H9gX7BQlpd3rBU-Jbv3A,50
+dbus2mqtt-0.4.1.dist-info/licenses/LICENSE,sha256=a4bIEgyA9rrnAfUN90CgbgZ6BQIFHeABkk0JihiBaxM,1074
+dbus2mqtt-0.4.1.dist-info/RECORD,,