dbus2mqtt 0.1.2__tar.gz → 0.2.0__tar.gz

dbus2mqtt-0.2.0/.github/release-drafter.yml

@@ -0,0 +1,51 @@
+name-template: 'v$RESOLVED_VERSION 🌈'
+tag-template: 'v$RESOLVED_VERSION'
+exclude-labels:
+  - dependencies
+categories:
+  - title: 💥 Breaking changes
+    labels:
+      - breaking-change
+  - title: 🚀 Features
+    labels:
+      - feature
+      - enhancement
+  - title: 🐛 Bug Fixes
+    labels:
+      - fix
+      - bugfix
+      - bug
+  - title: 🧰 Maintenance
+    labels:
+      - chore
+      - documentation
+exclude-contributors:
+  - jwnmulder
+autolabeler:
+  - label: enhancement
+    branch:
+      - '/feature\/.+/'
+  - label: fix
+    branch:
+      - '/fix\/.+/'
+    title:
+      - '/fix/i'
+version-resolver:
+  major:
+    labels:
+      - major
+  minor:
+    labels:
+      - minor
+      - feature
+      - enhancement
+      - breaking-change  # minor until we are on 1.x
+  patch:
+    labels:
+      - patch
+  default: patch
+change-template: '* $TITLE (#$NUMBER)'
+template: |
+  ## Changes
+
+  $CHANGES

dbus2mqtt-0.2.0/.github/scripts/release-versions.py

@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+import json
+import subprocess
+import sys
+
+from packaging import version
+
+
+def get_versions_from_git_tags() -> list[version.Version]:
+    result = subprocess.run(
+        ["git", "tag"],
+        capture_output=True, text=True, check=True
+    )
+    tags = result.stdout.strip().splitlines()
+    versions = [t.lstrip("v") for t in tags if t.startswith("v")]
+
+    parsed_versions = []
+    for v in versions:
+        try:
+            parsed = version.parse(v)
+            parsed_versions.append(parsed)
+        except Exception as e:
+            print(f"Error parsing version {v}: {e}")
+
+    return parsed_versions
+
+def latest_version_by_cycle(versions: list[version.Version], cycles: list[str]) -> dict[str, version.Version]:
+    res = {}
+    for cycle in cycles:
+        parsed_cycle = version.parse(cycle)
+
+        for v in versions:
+            # check if version is in cycle range
+            # cycle can be major or major.minor or major.minor.patch
+            if len(v.release) > len(parsed_cycle.release):
+                # update if version is later within cycle
+                if cycle not in cycles or v > parsed_cycle:
+                    res[cycle] = v
+    return res
+
+def main():
+    args = sys.argv[1:]
+    if not args:
+        print("Usage: release-versions.py 0.1 0.2 1.0 ...")
+        sys.exit(1)
+
+    versions = get_versions_from_git_tags()
+    cycles = latest_version_by_cycle(versions, args)
+
+    # Detect the overall latest version
+    overall_latest = max(versions) if versions else None
+
+    cycle_details = []
+    for cycle in args:
+        latest = cycles.get(cycle)
+        if latest:
+            cycle_details.append({
+                "cycle": cycle,
+                "latestVersion": latest.base_version,
+                "isLatestStable": latest == overall_latest
+            })
+
+    print(json.dumps(cycle_details))
+
+if __name__ == "__main__":
+    main()

dbus2mqtt-0.1.2/.github/workflows/docker-latest.yml → dbus2mqtt-0.2.0/.github/workflows/docker-dev.yml

@@ -1,4 +1,4 @@
-name: Build and Push Docker latest
+name: docker-dev
 
 "on":
   push:
@@ -37,7 +37,7 @@ jobs:
             jwnmulder/dbus2mqtt
             ghcr.io/jwnmulder/dbus2mqtt
           tags: |
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=dev,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
           labels: |
             org.opencontainers.image.source=https://github.com/jwnmulder/dbus2mqtt
 

dbus2mqtt-0.1.2/.github/workflows/docker-publish-pypi-release.yml → dbus2mqtt-0.2.0/.github/workflows/docker-stable.yml

@@ -1,20 +1,46 @@
-name: Build and Push Docker Images for Released Versions
+name: docker-stable releases
 
 "on":
-  # push:
-  #   branches:
-  #     - main
+  push:
+    branches:
+      - main
+    paths:
+      - "docker/**"
+  release:
+    types: [published]
   workflow_dispatch:
 
 jobs:
+  setup:
+    runs-on: ubuntu-latest
+    outputs:
+      versions_matrix: ${{ steps.supported_release_versions.outputs.versions_matrix }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Determine supported release versions
+        id: supported_release_versions
+        run: |
+          SUPPORTED_CYCLES=("0.1" "0.2" "0.3" "0.4" "0.5" "0.6" "0.7" "0.8" "0.9" "1.0" "2.0")
+
+          VERSIONS_JSON=$(python3 .github/scripts/release-versions.py "${SUPPORTED_CYCLES[@]}")
+
+          # Wrap the output into matrix include
+          VERSIONS_MATRIX=$(echo "$VERSIONS_JSON" | jq -c '{include: [.[] | {cycle: .cycle, version: .latestVersion, isLatestStable: .isLatestStable}]}')
+
+          echo "VERSIONS_MATRIX=$VERSIONS_MATRIX"
+          echo "versions_matrix=$VERSIONS_MATRIX" >> $GITHUB_OUTPUT
   docker:
     runs-on: ubuntu-latest
+    needs: setup
     permissions:
       packages: write
     strategy:
-      matrix:
-        version:
-          - 0.1
+      fail-fast: false
+      matrix: ${{ fromJson(needs.setup.outputs.versions_matrix) }}
 
     steps:
       - name: Checkout
@@ -28,8 +54,10 @@ jobs:
             jwnmulder/dbus2mqtt
             ghcr.io/jwnmulder/dbus2mqtt
           tags: |
+            type=raw,value=latest,enable=${{ matrix.isLatestStable }}
             type=pep440,pattern={{major}},value=${{ matrix.version }},enable=${{ !startsWith(matrix.version, '0.') }}
             type=pep440,pattern={{major}}.{{minor}},value=${{ matrix.version }}
+            type=pep440,pattern={{major}}.{{minor}}.{{patch}},value=${{ matrix.version }}
           # type=ref,event=branch
           # type=ref,event=pr
           # type=semver,pattern={{version}},value=${{ matrix.version }}

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/.pre-commit-config.yaml

@@ -42,7 +42,7 @@ repos:
           - I
 
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.6.14
+    rev: 0.6.16
     hooks:
       - id: uv-lock
 

dbus2mqtt-0.2.0/.python-version

@@ -0,0 +1 @@
+3.10

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbus2mqtt
-Version: 0.1.2
+Version: 0.2.0
 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
@@ -51,12 +51,6 @@ This makes it easy to integrate Linux desktop services or system signals into MQ
 
 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
-
-* 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
-
 ## Getting started with dbus2mqtt
 
 Create a `config.yaml` file with the contents shown below. This configuration will expose all bus properties from the `org.mpris.MediaPlayer2.Player` interface to MQTT on the `dbus2mqtt/org.mpris.MediaPlayer2/state` topic. Have a look at [docs/examples](docs/examples.md) for more examples
@@ -86,7 +80,7 @@ dbus:
               topic: dbus2mqtt/org.mpris.MediaPlayer2/state
               payload_type: json
               payload_template: |
-                {{ dbus_call(mpris_bus_name, path, 'org.freedesktop.DBus.Properties', 'GetAll', ['org.mpris.MediaPlayer2.Player']) | to_yaml }}
+                {{ dbus_call(mpris_bus_name, path, 'org.freedesktop.DBus.Properties', 'GetAll', ['org.mpris.MediaPlayer2.Player']) }}
 ```
 
 MQTT connection details can be configured in that same `config.yaml` file or via environment variables. For now create a `.env` file with the following contents.
@@ -117,6 +111,7 @@ cp docs/examples/home_assistant_media_player.yaml $HOME/.config/dbus2mqtt/config
 cp .env.example $HOME/.config/dbus2mqtt/.env
 
 # run image and automatically start on reboot
+sudo docker pull jwnmulder/dbus2mqtt
 docker run --detach --name dbus2mqtt \
   --volume "$HOME"/.config/dbus2mqtt:"$HOME"/.config/dbus2mqtt \
   --volume /run/user:/run/user \
@@ -170,7 +165,7 @@ dbus:
       path: /org/mpris/MediaPlayer2
       interfaces:
         - interface: org.mpris.MediaPlayer2.Player
-          mqtt_call_method_topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+          mqtt_command_topic: dbus2mqtt/org.mpris.MediaPlayer2/command
           methods:
             - method: Pause
             - method: Play

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/README.md

@@ -19,12 +19,6 @@ This makes it easy to integrate Linux desktop services or system signals into MQ
 
 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
-
-* 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
-
 ## Getting started with dbus2mqtt
 
 Create a `config.yaml` file with the contents shown below. This configuration will expose all bus properties from the `org.mpris.MediaPlayer2.Player` interface to MQTT on the `dbus2mqtt/org.mpris.MediaPlayer2/state` topic. Have a look at [docs/examples](docs/examples.md) for more examples
@@ -54,7 +48,7 @@ dbus:
               topic: dbus2mqtt/org.mpris.MediaPlayer2/state
               payload_type: json
               payload_template: |
-                {{ dbus_call(mpris_bus_name, path, 'org.freedesktop.DBus.Properties', 'GetAll', ['org.mpris.MediaPlayer2.Player']) | to_yaml }}
+                {{ dbus_call(mpris_bus_name, path, 'org.freedesktop.DBus.Properties', 'GetAll', ['org.mpris.MediaPlayer2.Player']) }}
 ```
 
 MQTT connection details can be configured in that same `config.yaml` file or via environment variables. For now create a `.env` file with the following contents.
@@ -85,6 +79,7 @@ cp docs/examples/home_assistant_media_player.yaml $HOME/.config/dbus2mqtt/config
 cp .env.example $HOME/.config/dbus2mqtt/.env
 
 # run image and automatically start on reboot
+sudo docker pull jwnmulder/dbus2mqtt
 docker run --detach --name dbus2mqtt \
   --volume "$HOME"/.config/dbus2mqtt:"$HOME"/.config/dbus2mqtt \
   --volume /run/user:/run/user \
@@ -138,7 +133,7 @@ dbus:
       path: /org/mpris/MediaPlayer2
       interfaces:
         - interface: org.mpris.MediaPlayer2.Player
-          mqtt_call_method_topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+          mqtt_command_topic: dbus2mqtt/org.mpris.MediaPlayer2/command
           methods:
             - method: Pause
             - method: Play

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/docker/Dockerfile.latest

@@ -20,7 +20,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
     uv sync --frozen --no-install-project --no-dev
 
-ADD src/ pyproject.toml uv.lock .python-version README.md /app
+ADD src/ pyproject.toml uv.lock README.md /app
 RUN --mount=type=cache,target=/root/.cache/uv \
     uv sync --frozen --no-dev
 

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/docker/Dockerfile.pypi

@@ -7,4 +7,6 @@ ARG DBUS2MQTT_VERSION=latest
 RUN pip install --no-cache-dir dbus2mqtt=="$DBUS2MQTT_VERSION"
 
 ENTRYPOINT ["python", "-m", "dbus2mqtt"]
+
+# show help message by default
 CMD ["--help"]

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/docs/examples/home_assistant_media_player.yaml

@@ -13,18 +13,17 @@ dbus:
         - interface: org.freedesktop.DBus.Properties
           signals:
             - signal: PropertiesChanged
-              # TODO: Determine if we should filter here or in flows? The only consumers right now are the flows
               filter: "{{ args[0] == 'org.mpris.MediaPlayer2.Player' }}"
           methods:
             - method: GetAll
 
         - interface: org.mpris.MediaPlayer2
-          mqtt_call_method_topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+          mqtt_command_topic: dbus2mqtt/org.mpris.MediaPlayer2/command
           methods:
             - method: Quit
 
         - interface: org.mpris.MediaPlayer2.Player
-          mqtt_call_method_topic: dbus2mqtt/org.mpris.MediaPlayer2/command
+          mqtt_command_topic: dbus2mqtt/org.mpris.MediaPlayer2/command
           methods:
             - method: Pause
             - method: Play
@@ -35,6 +34,8 @@ dbus:
             - method: SetPosition
             - method: PlayPause
             - method: OpenUri
+          properties:
+            - property: Volume
 
       flows:
         - name: "MPRIS publish player state"
@@ -45,22 +46,27 @@ dbus:
             - type: dbus_signal
               interface: org.freedesktop.DBus.Properties
               signal: PropertiesChanged
-              #   filter: "{{ args[0] == 'org.mpris.MediaPlayer2.Player' }}"
+              # filter: "{{ args[0] == 'org.mpris.MediaPlayer2.Player' }}"
           actions:
             - type: context_set
               context:
                 mpris_bus_name: '{{ dbus_list("org.mpris.MediaPlayer2.*") | first }}'
-                # TODO: This would be a nice addition to avoid repetition
-                #   player_properties: |
-                #     {{ dbus_call(mpris_bus_name, path, 'org.freedesktop.DBus.Properties', 'GetAll', ['org.mpris.MediaPlayer2.Player']) | to_yaml }}
                 path: /org/mpris/MediaPlayer2
+            - type: context_set
+              context:
+                player_properties: |
+                  {{ dbus_call(mpris_bus_name, path, 'org.freedesktop.DBus.Properties', 'GetAll', ['org.mpris.MediaPlayer2.Player']) }}
+                volume: |
+                  {{ dbus_property_get(mpris_bus_name, path, 'org.mpris.MediaPlayer2.Player', 'Volume', 0) }}
             - type: mqtt_publish
               topic: dbus2mqtt/org.mpris.MediaPlayer2/state
               payload_type: json
               payload_template: |
-                bus_name: {{ mpris_bus_name }}
-                {{ dbus_call(mpris_bus_name, path, 'org.freedesktop.DBus.Properties', 'GetAll', ['org.mpris.MediaPlayer2.Player']) | to_yaml }}
-                Volume: {{ dbus_property_get(mpris_bus_name, path, 'org.mpris.MediaPlayer2.Player', 'Volume', 0) }}
+                {{
+                    { 'bus_name': mpris_bus_name }
+                    | combine(player_properties)
+                    | combine({ 'Volume': volume })
+                }}
         - name: "MPRIS player removed"
           triggers:
             - type: bus_name_removed

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/docs/examples/linux_desktop.yaml

@@ -17,19 +17,20 @@ dbus:
             - method: GetAll
 
         - interface: org.gnome.SessionManager
-          mqtt_call_method_topic: dbus2mqtt/SessionManager/command
+          mqtt_command_topic: dbus2mqtt/SessionManager/command
           methods:
             - method: Logout
             - method: Reboot  # reboot dialog
 
       flows:
-        - name: "publish state on schedule"
+        - name: "publish state at startup and schedule"
           triggers:
+            - type: bus_name_added
             - type: schedule
               interval: {seconds: 5}
           actions:
             - type: mqtt_publish
               topic: dbus2mqtt/SessionManager
               payload_type: json
-              payload_template: |
-                clients: {{ dbus_call('org.gnome.SessionManager', '/org/gnome/SessionManager', 'org.gnome.SessionManager', 'GetClients') }}
+              payload_template:
+                clients: "{{ dbus_call('org.gnome.SessionManager', '/org/gnome/SessionManager', 'org.gnome.SessionManager', 'GetClients') }}"

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/renovate.json

@@ -12,6 +12,11 @@
       "matchUpdateTypes": ["minor", "patch"],
       "automerge": true,
       "addLabels": ["automerge"]
+    },
+    {
+      "description": "Disable Renovate for .python-version",
+      "matchFileNames": [".python-version"],
+      "enabled": false
     }
   ]
 }

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/src/dbus2mqtt/config.py

@@ -15,8 +15,9 @@ class SignalConfig:
     filter: str | None = None
 
     def matches_filter(self, template_engine: TemplateEngine, *args) -> bool:
-        res = template_engine.render_template(self.filter, str, { "args": args })
-        return res == "True"
+        if self.filter:
+            return template_engine.render_template(self.filter, bool, { "args": args })
+        return True
 
 @dataclass
 class MethodConfig:
@@ -29,13 +30,15 @@ class PropertyConfig:
 @dataclass
 class InterfaceConfig:
     interface: str
-    mqtt_call_method_topic: str | None = None
+    mqtt_command_topic: str | None = None
     signals: list[SignalConfig] = field(default_factory=list)
     methods: list[MethodConfig] = field(default_factory=list)
     properties: list[PropertyConfig] = field(default_factory=list)
 
-    def render_mqtt_call_method_topic(self, template_engine: TemplateEngine, context: dict[str, Any]) -> Any:
-        return template_engine.render_template(self.mqtt_call_method_topic, str, context)
+    def render_mqtt_command_topic(self, template_engine: TemplateEngine, context: dict[str, Any]) -> Any:
+        if self.mqtt_command_topic:
+            return template_engine.render_template(self.mqtt_command_topic, str, context)
+        return None
 
 @dataclass
 class FlowTriggerMqttConfig:
@@ -84,8 +87,6 @@ class FlowActionContextSetConfig:
 class FlowActionMqttPublishConfig:
     topic: str
     payload_template: str | dict[str, Any]
-    """should be a dict if payload_type is json/yaml
-    or a string if payload_type is text"""
     type: Literal["mqtt_publish"] = "mqtt_publish"
     payload_type: Literal["json", "yaml", "text"] = "json"
 

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/src/dbus2mqtt/dbus/dbus_client.py

@@ -389,7 +389,7 @@ class DbusClient:
         for subscription_configs in self.config.subscriptions:
             for interface_config in subscription_configs.interfaces:
                 # TODO, performance improvement
-                mqtt_topic = interface_config.render_mqtt_call_method_topic(self.templating, {})
+                mqtt_topic = interface_config.render_mqtt_command_topic(self.templating, {})
                 found_matching_topic |= mqtt_topic == msg.topic
 
         if not found_matching_topic:

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/src/dbus2mqtt/flow/__init__.py

@@ -6,15 +6,34 @@ class FlowExecutionContext:
 
     def __init__(self, name: str | None, global_flows_context: dict[str, Any], flow_context: dict[str, Any]):
         self.name = name
+
         self.global_flows_context = global_flows_context
+        """
+        Global flows context which is shared across all flows.
+        Modifiable by user.
+        **Not** cleaned up after flow execution.
+        """
+
         self.flow_context = flow_context
+        """
+        Flow context which contains flow specific context like 'subscription_bus_name'.
+        **Not** modifiable by user.
+        **Not** cleaned up after flow execution.
+        """
 
-        # per flow execution context
         self.context: dict[str, Any] = {}
+        """
+        Per flow execution context.
+        Modifiable by user.
+        Cleaned up after each flow execution
+        """
 
     def get_aggregated_context(self) -> dict[str, Any]:
-        """Get the aggregated context for the flow execution."""
-        # Merge global flows context, flow context, and local context
+        """
+        Get the aggregated context for the flow execution.
+        Merges global flows context, flow context, and local context
+        """
+
         context = {}
         if self.global_flows_context:
             context.update(self.global_flows_context)

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/src/dbus2mqtt/flow/actions/context_set.py

@@ -15,12 +15,14 @@ class ContextSetAction(FlowAction):
     async def execute(self, context: FlowExecutionContext):
 
         aggregated_context = context.get_aggregated_context()
+
         if self.config.global_context:
             context_new = await self.templating.async_render_template(self.config.global_context, dict, aggregated_context)
             logger.debug(f"Update global_context with: {context_new}")
             context.global_flows_context.update(context_new)
 
         if self.config.context:
+
             context_new = await self.templating.async_render_template(self.config.context, dict, aggregated_context)
             logger.debug(f"Update context with: {context_new}")
             context.context.update(context_new)

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/src/dbus2mqtt/flow/actions/mqtt_publish.py

@@ -1,7 +1,7 @@
 
 import logging
 
-from jinja2.exceptions import TemplateRuntimeError
+from jinja2.exceptions import TemplateError
 
 from dbus2mqtt import AppContext
 from dbus2mqtt.config import FlowActionMqttPublishConfig
@@ -24,14 +24,20 @@ class MqttPublishAction(FlowAction):
         try:
             mqtt_topic = await self.templating.async_render_template(self.config.topic, str, render_context)
 
-            payload_res_type = str if self.config.payload_type == "text" else dict
-            payload = await self.templating.async_render_template(self.config.payload_template, payload_res_type, render_context)
+            if self.config.payload_type == "text":
+                res_type = str
+            else:
+                res_type = dict
 
-        except TemplateRuntimeError as e:
-            logger.warning(f"Error rendering jinja template, flow: '{context.name}', error: {str(e)}. render_context={render_context}", exc_info=True)
+            payload = await self.templating.async_render_template(self.config.payload_template, res_type, render_context)
+
+        except TemplateError as e:
+            logger.warning(f"Error rendering jinja template, flow: '{context.name or ''}', msg={e}, payload_template={self.config.payload_template}, render_context={render_context}", exc_info=True)
             return
         except Exception as e:
-            logger.warning(f"Error rendering jinja template, flow: '{context.name}', error: {str(e)}. render_context={render_context}", exc_info=False)
+            # Dont log full exception info to avoid log spamming on dbus errors
+            # due to clients disconnecting
+            logger.warning(f"Error rendering jinja template, flow: '{context.name or ''}', msg={e} payload_template={self.config.payload_template}, render_context={render_context}")
             return
 
         logger.debug(f"public_mqtt: flow={context.name}, payload={payload}")

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/src/dbus2mqtt/main.py

@@ -121,15 +121,6 @@ def main():
         apscheduler_logger = logging.getLogger("apscheduler")
         apscheduler_logger.setLevel(logging.WARNING)
 
-
-    # handler.setFormatter(colorlog.ColoredFormatter('%(log_color)s%(levelname)s:%(name)s:%(message)s'))
-
-    # logger = colorlog.getLogger('')
-    # for handler in logger.handlers:
-    #     print(handler.st)
-    #     if isinstance(handler, colorlog.StreamHandler):
-    #         handler.setFormatter(colorlog.ColoredFormatter('%(log_color)s%(levelname)s:%(name)s:%(message)s'))
-
     logger.debug(f"config: {config}")
 
     asyncio.run(run(config))

{dbus2mqtt-0.1.2 → dbus2mqtt-0.2.0}/src/dbus2mqtt/mqtt/mqtt_client.py

@@ -43,15 +43,14 @@ class MqttClient:
             port=self.config.port
         )
 
-    # def on_dbus_signal(self, bus_name: str, path: str, interface: str, signal: str, topic, msg: dict[str, Any]):
-    #     payload = json.dumps(msg)
-    #     logger.debug(f"on_dbus_signal: payload={payload}")
-    #     self.client.publish(topic=topic, payload=payload)
-
     async def mqtt_publish_queue_processor_task(self):
+
+        first_message = True
+
         """Continuously processes messages from the async queue."""
         while True:
             msg = await self.event_broker.mqtt_publish_queue.async_q.get()  # Wait for a message
+
             try:
                 payload = msg.payload
                 type = msg.payload_serialization_type
@@ -65,6 +64,11 @@ class MqttClient:
 
                 logger.debug(f"mqtt_publish_queue_processor_task: payload={payload}")
                 self.client.publish(topic=msg.topic, payload=payload)
+
+                if first_message:
+                    logger.info(f"First message published: topic={msg.topic}, payload={payload}")
+                    first_message = False
+
             except Exception as e:
                 logger.warning(f"mqtt_publish_queue_processor_task: Exception {e}", exc_info=True)
             finally: