dbus2mqtt 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

dbus2mqtt/config.py

@@ -125,7 +125,7 @@ class DbusConfig:
     def get_subscription_configs(self, bus_name: str, path: str) -> list[SubscriptionConfig]:
         res: list[SubscriptionConfig] = []
         for subscription in self.subscriptions:
-            if fnmatch.fnmatchcase(bus_name, subscription.bus_name) and fnmatch.fnmatchcase(path, subscription.path):
+            if fnmatch.fnmatchcase(bus_name, subscription.bus_name) and path == subscription.path:
                 res.append(subscription)
         return res
 

dbus2mqtt/dbus/dbus_client.py

@@ -124,7 +124,7 @@ class DbusClient:
 
                 on_signal_method_name = "on_" + camel_to_snake(signal_config.signal)
                 dbus_signal_state = {
-                    "bus_name_subscriptions": bus_name_subscriptions,
+                    "bus_name": bus_name,
                     "path": path,
                     "interface_name": interface.name,
                     "subscription_config": subscription_config,
@@ -354,6 +354,8 @@ class DbusClient:
 
     async def _handle_on_dbus_signal(self, signal: DbusSignalWithState):
 
+        logger.debug(f"dbus_signal: signal={signal.signal_config.signal}, args={signal.args}, bus_name={signal.bus_name}, path={signal.path}, interface={signal.interface_name}")
+
         for flow in signal.subscription_config.flows:
             for trigger in flow.triggers:
                 if trigger.type == "dbus_signal" and signal.signal_config.signal == trigger.signal:
@@ -366,7 +368,7 @@ class DbusClient:
 
                         if matches_filter:
                             context = {
-                                "bus_name": signal.bus_name_subscriptions.bus_name,
+                                "bus_name": signal.bus_name,
                                 "path": signal.path,
                                 "interface": signal.interface_name,
                                 "args": signal.args
@@ -394,8 +396,8 @@ class DbusClient:
             return
 
         logger.debug(f"on_mqtt_msg: topic={msg.topic}, payload={json.dumps(msg.payload)}")
-        calls_done: list[str] = []
-        properties_set: list[str] = []
+        matched_method = False
+        matched_property = False
 
         payload_method = msg.payload.get("method")
         payload_method_args = msg.payload.get("args") or []
@@ -417,27 +419,27 @@ class DbusClient:
                             # 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)
-                                    calls_done.append(method.method)
                                 except Exception as e:
-                                    logger.warning(f"on_mqtt_msg: method={method.method}, bus_name={bus_name} failed, exception={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)
-                                    properties_set.append(property.property)
                                 except Exception as e:
-                                    logger.warning(f"on_mqtt_msg: property={property.property}, bus_name={bus_name} failed, exception={e}")
+                                    logger.warning(f"on_mqtt_msg: property={property.property}, value={payload_value}, bus_name={bus_name} failed, exception={e}")
 
-        if len(calls_done) == 0 and len(properties_set) == 0:
+        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())}")
             if payload_property:

dbus2mqtt/dbus/dbus_util.py

@@ -15,7 +15,7 @@ def unwrap_dbus_object(o):
     json_obj = json.loads(res)
     return json_obj
 
-def unwrap_dbus_objects(*args):
+def unwrap_dbus_objects(args):
     res = [unwrap_dbus_object(o) for o in args]
     return res
 

dbus2mqtt/event_broker.py

@@ -13,7 +13,6 @@ from dbus2mqtt.config import (
     SignalConfig,
     SubscriptionConfig,
 )
-from dbus2mqtt.dbus.dbus_types import BusNameSubscriptions
 
 logger = logging.getLogger(__name__)
 
@@ -26,7 +25,7 @@ class MqttMessage:
 
 @dataclass
 class DbusSignalWithState:
-    bus_name_subscriptions: BusNameSubscriptions
+    bus_name: str
     path: str
     interface_name: str
     subscription_config: SubscriptionConfig

{dbus2mqtt-0.1.1.dist-info → dbus2mqtt-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbus2mqtt
-Version: 0.1.1
+Version: 0.1.2
 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
@@ -9,6 +9,7 @@ License-File: LICENSE
 Keywords: dbus,home-assistant,mpris,mqtt,python
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -31,8 +32,6 @@ Description-Content-Type: text/markdown
 
 # dbus2mqtt
 
-> **⚠️ Warning:** This project has no releases yet. Running from source works. Docker images and Python packages are planned but not yet available.
-
 **dbus2mqtt** is a Python application that bridges **Linux D-Bus** with **MQTT**.
 It lets you forward D-Bus signals and properties to MQTT topics, call D-Bus methods via MQTT messages, and shape payloads using flexible **Jinja2 templating**.
 
@@ -46,10 +45,15 @@ This makes it easy to integrate Linux desktop services or system signals into MQ
 * 📡 Expose **D-Bus methods** for remote control via MQTT messages.
 * 🏠 Includes example configurations for **MPRIS** and **Home Assistant Media Player** integration.
 
+## Project status
+
+**dbus2mqtt** is considered stable for the use-cases it has been tested against, and is actively being developed. Documentation is continuously being improved.
+
+Initial testing has focused on MPRIS integration. A table of tested MPRIS players and their supported methods can be found here: [home_assistant_media_player.md](https://github.com/jwnmulder/dbus2mqtt/blob/main/docs/examples/home_assistant_media_player.md)
+
+
 TODO list
 
-* Create a release on PyPI
-* Release a docker image
 * Improve error handling when deleting message with 'retain' set. WARNING:dbus2mqtt.mqtt_client:on_message: Unexpected payload, expecting json, topic=dbus2mqtt/org.mpris.MediaPlayer2/command, payload=, error=Expecting value: line 1 column 1 (char 0)
 * Property set only works the first time, need to restart after which the first set will work again
 
@@ -94,17 +98,17 @@ MQTT__USERNAME=
 MQTT__PASSWORD=
 ```
 
-### Running from source
-
-To run dbus2mqtt from source (requires uv to be installed)
+### Install and run dbus2mqtt
 
 ```bash
-uv run main.py --config config.yaml
+python -m pip install dbus2mqtt
+dbus2mqtt --config config.yaml
 ```
 
+
 ### Run using docker with auto start behavior
 
-To build and run dbus2mqtt using Docker with the [home_assistant_media_player.yaml](docs/examples/home_assistant_media_player.yaml) example from this repository
+To build and run dbus2mqtt using Docker with the [home_assistant_media_player.yaml](https://github.com/jwnmulder/dbus2mqtt/blob/main/docs/examples/home_assistant_media_player.yaml) example from this repository.
 
 ```bash
 # setup configuration
@@ -112,9 +116,6 @@ mkdir -p $HOME/.config/dbus2mqtt
 cp docs/examples/home_assistant_media_player.yaml $HOME/.config/dbus2mqtt/config.yaml
 cp .env.example $HOME/.config/dbus2mqtt/.env
 
-# build image
-docker build -t jwnmulder/dbus2mqtt:latest .
-
 # run image and automatically start on reboot
 docker run --detach --name dbus2mqtt \
   --volume "$HOME"/.config/dbus2mqtt:"$HOME"/.config/dbus2mqtt \
@@ -133,7 +134,7 @@ sudo docker logs dbus2mqtt -f
 
 ## Examples
 
-This repository contains some examples under [docs/examples](docs/examples.md). The most complete one being [MPRIS to Home Assistant Media Player integration](docs/examples/home_assistant_media_player.md)
+This repository contains examples under [docs/examples](https://github.com/jwnmulder/dbus2mqtt/blob/main//docs/examples.md). The most complete one being [MPRIS to Home Assistant Media Player integration](https://github.com/jwnmulder/dbus2mqtt/blob/main/docs/examples/home_assistant_media_player.md)
 
 ## Configuration reference
 
@@ -216,8 +217,8 @@ dbus:
 
 ## Flows
 
-TODO: Document flows, for now see the [MPRIS to Home Assistant Media Player integration](docs/examples/home_assistant_media_player.md) example
+TODO: Document flows, for now see the [MPRIS to Home Assistant Media Player integration](https://github.com/jwnmulder/dbus2mqtt/blob/main/docs/examples/home_assistant_media_player.md) example
 
 ## Jinja templating
 
-TODO: Document Jinja templating, for now see the [MPRIS to Home Assistant Media Player integration](docs/examples/home_assistant_media_player.md) example
+TODO: Document Jinja templating, for now see the [MPRIS to Home Assistant Media Player integration](https://github.com/jwnmulder/dbus2mqtt/blob/main/docs/examples/home_assistant_media_player.md) example

{dbus2mqtt-0.1.1.dist-info → dbus2mqtt-0.1.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 dbus2mqtt/__init__.py,sha256=VunubKEH4_lne9Ttd2YRpyXjZMIAzyD2eiJ2sfvvTFU,362
 dbus2mqtt/__main__.py,sha256=NAoa3nwgBSQI22eWzzRx61SIDThDwXmUofWWZU3_4-Q,71
-dbus2mqtt/config.py,sha256=zcRP0Q_PHz4ypOhSvvxwlJyT6C3BE1vpjcbiUqXcXDw,4198
-dbus2mqtt/event_broker.py,sha256=bFxjrQae87XFWmV6OrYcxpiDPrVQEJv0DJucnI7HZFY,1926
+dbus2mqtt/config.py,sha256=wRXT_qYCVRFLioE8H-1sNQiSCRCcE4imGohudZvMEW0,4179
+dbus2mqtt/event_broker.py,sha256=GG7vZZHu08vJgCH5cA-yw3yWU3I2wWHhiEFNMHA4oJk,1836
 dbus2mqtt/main.py,sha256=3-2rorUesggZ9Gv3FksqZw_wapfjNRvjibaX51mVadA,4281
-dbus2mqtt/dbus/dbus_client.py,sha256=Hoa7p9zUyFCPKQtl90gCG8eBuQ8annrQoAsvjAekEMI,21882
+dbus2mqtt/dbus/dbus_client.py,sha256=3falwDADq9SoLiaQFGGRH6pcm8eD23tujrL2x-CBoyw,22009
 dbus2mqtt/dbus/dbus_types.py,sha256=bUik8LWPnLLJhhJExPuvyn1_MmkUjTn4jxXh3EkYgzI,495
-dbus2mqtt/dbus/dbus_util.py,sha256=Lk8w57j8TQxUs8d-DnTcB8wLx-cwkzzHtJY3RbTcXbo,570
+dbus2mqtt/dbus/dbus_util.py,sha256=kAqA9SPR1N45fzXeXmBXlhulFEIFKrOIvr_LeygO928,569
 dbus2mqtt/flow/__init__.py,sha256=oatdVeBUjAJkUwM9DZsj67Z2rptOHWUn_QFVJrRu2DA,1063
 dbus2mqtt/flow/flow_processor.py,sha256=v5LvcNe-IpEXkWgBW0mK76khrqb5aFkZF0Nw2IvxIEs,7834
 dbus2mqtt/flow/actions/context_set.py,sha256=_XWJ-xHx6nhRYVrd8pBKE3rePc1KL0VU1W0q1pqYRBE,1085
@@ -13,8 +13,8 @@ dbus2mqtt/flow/actions/mqtt_publish.py,sha256=CmW-CPIYjJ0VldcLjbK6uYDkyE65btQzT1
 dbus2mqtt/mqtt/mqtt_client.py,sha256=FxP82_P5mIbiFk5LOYBPRZN7zYp8XQY7xed2HCVXQoo,4071
 dbus2mqtt/template/dbus_template_functions.py,sha256=mSZr4s7XzmMCYnJYV1MlBWOBz71MGEBj6mLJzIapNf8,2427
 dbus2mqtt/template/templating.py,sha256=aBDLW6RaqiivvWjzu3jhTDdZvtZCWMtxGxm_VCaZDKs,4202
-dbus2mqtt-0.1.1.dist-info/METADATA,sha256=7dImzxIO65xyS3sJ6qyku2LjbkYNUVHgxNc33MjTwJE,7649
-dbus2mqtt-0.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dbus2mqtt-0.1.1.dist-info/entry_points.txt,sha256=pmmacoHCsvTTUB5dIPaY4i0H9gX7BQlpd3rBU-Jbv3A,50
-dbus2mqtt-0.1.1.dist-info/licenses/LICENSE,sha256=a4bIEgyA9rrnAfUN90CgbgZ6BQIFHeABkk0JihiBaxM,1074
-dbus2mqtt-0.1.1.dist-info/RECORD,,
+dbus2mqtt-0.1.2.dist-info/METADATA,sha256=syl_84CzV7dH7XUI2fqt-vtQn3w2Dania2gdN989voQ,8090
+dbus2mqtt-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dbus2mqtt-0.1.2.dist-info/entry_points.txt,sha256=pmmacoHCsvTTUB5dIPaY4i0H9gX7BQlpd3rBU-Jbv3A,50
+dbus2mqtt-0.1.2.dist-info/licenses/LICENSE,sha256=a4bIEgyA9rrnAfUN90CgbgZ6BQIFHeABkk0JihiBaxM,1074
+dbus2mqtt-0.1.2.dist-info/RECORD,,