Plumb report handler through dbus service

Author: jfhbrook

crystalfontz/dbus/interface.py

@@ -93,45 +93,54 @@
 DBUS_NAME = "org.jfhbrook.crystalfontz"
 
 
-async def load_client(config_file: Optional[str]) -> Client:
-    config: Config = Config.from_file(config_file)
-
-    client = await create_connection(config.port)
-
-    return client
-
-
 class DbusReportHandler(ReportHandler):
-    def __init__(self: Self, iface: "DbusInterface") -> None:
-        self.iface = iface
+    def __init__(self: Self) -> None:
+        self.iface: "Optional[DbusInterface]" = None
 
     async def on_key_activity(self: Self, report: KeyActivityReport) -> None:
-        """
-        This method is called on any new key activity report.
-        """
+        if not self.iface:
+            return
 
         self.iface.key_activity_reports.emit(KeyActivityReportM.pack(report))
 
     async def on_temperature(self: Self, report: TemperatureReport) -> None:
-        """
-        This method is called on any new temperature report.
-        """
+        if not self.iface:
+            return
 
         self.iface.temperature_reports.emit(TemperatureReportM.pack(report))
 
 
+async def load_client(
+    report_handler: Optional[DbusReportHandler], config_file: Optional[str]
+) -> Client:
+    config: Config = Config.from_file(config_file)
+
+    client = await create_connection(config.port, report_handler=report_handler)
+
+    return client
+
+
 class DbusInterface(  # type: ignore
     DbusInterfaceCommonAsync, interface_name=DBUS_NAME  # type: ignore
 ):
     """
     A DBus interface for controlling the Crystalfontz device.
     """
 
-    def __init__(self: Self, client: Client, config_file: Optional[str] = None) -> None:
+    def __init__(
+        self: Self,
+        client: Client,
+        report_handler: Optional[DbusReportHandler] = None,
+        config_file: Optional[str] = None,
+    ) -> None:
         super().__init__()
         self._config: Config = Config.from_file(config_file)
         self.client: Client = client
         self._client_lock: asyncio.Lock = asyncio.Lock()
+        self._report_handler = report_handler
+
+        if self._report_handler:
+            self._report_handler.iface = self
 
     @dbus_property_async(ConfigM.t)
     def config(self: Self) -> ConfigT:

crystalfontz/dbus/service/__init__.py

@@ -15,7 +15,12 @@
     select_system_bus,
 )
 from crystalfontz.dbus.error import handle_dbus_error
-from crystalfontz.dbus.interface import DBUS_NAME, DbusInterface, load_client
+from crystalfontz.dbus.interface import (
+    DBUS_NAME,
+    DbusInterface,
+    DbusReportHandler,
+    load_client,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -25,7 +30,9 @@ async def service(config_file: Optional[str] = None) -> DbusInterface:
     Create a configure DBus service with a supplied config file.
     """
 
-    client = await load_client(config_file)
+    client = await load_client(
+        report_handler=DbusReportHandler(), config_file=config_file
+    )
     iface = DbusInterface(client, config_file=config_file)
 
     logger.debug(f"Requesting bus name {DBUS_NAME}...")