From fdaf7b3ac603a2564adef7ea6e0095c3dff2be17 Mon Sep 17 00:00:00 2001 From: Sven Sager Date: Fri, 6 Feb 2026 18:17:00 +0100 Subject: [PATCH] refactor: Restructure and rename bus provider modules and classes Renamed and moved `BusProvider` and `BusProviderIo` to `BusProviderMiddleware1` and `BusProviderIos1` respectively for better clarity and modular organization. Updated all related imports and references accordingly. Signed-off-by: Sven Sager --- src/revpi_middleware/daemon.py | 8 ++++---- src/revpi_middleware/{ios1 => dbus_ios1}/__init__.py | 2 ++ .../bus_provider_ios1.py} | 12 ++++++------ .../{ios1 => dbus_ios1}/interface_devices.py | 0 .../{ios1 => dbus_ios1}/interface_ios.py | 0 .../{ios1 => dbus_ios1}/ios1_helper.py | 0 src/revpi_middleware/dbus_middleware1/__init__.py | 2 +- .../{bus_provider.py => bus_provider_middleware1.py} | 12 ++++++------ 8 files changed, 19 insertions(+), 17 deletions(-) rename src/revpi_middleware/{ios1 => dbus_ios1}/__init__.py (82%) rename src/revpi_middleware/{ios1/bus_provider_io.py => dbus_ios1/bus_provider_ios1.py} (91%) rename src/revpi_middleware/{ios1 => dbus_ios1}/interface_devices.py (100%) rename src/revpi_middleware/{ios1 => dbus_ios1}/interface_ios.py (100%) rename src/revpi_middleware/{ios1 => dbus_ios1}/ios1_helper.py (100%) rename src/revpi_middleware/dbus_middleware1/{bus_provider.py => bus_provider_middleware1.py} (86%) diff --git a/src/revpi_middleware/daemon.py b/src/revpi_middleware/daemon.py index 94c5bf7..202090b 100644 --- a/src/revpi_middleware/daemon.py +++ b/src/revpi_middleware/daemon.py @@ -11,9 +11,9 @@ from typing import Union, List from dbus import SystemBus, SessionBus from . import proginit as pi -from .dbus_middleware1.bus_provider import BusProvider +from .dbus_ios1 import BusProviderIos1 +from .dbus_middleware1 import BusProviderMiddleware1 from .helper import get_new_session_dbus_connection, get_new_system_dbus_connection -from .ios1.bus_provider_io import BusProviderIo log = getLogger(__name__) @@ -55,12 +55,12 @@ class MiddlewareDaemon: dbus_middleware1_running = self.bp_middleware1 and self.bp_middleware1.is_alive() if not dbus_middleware1_running: - self.bp_middleware1 = BusProvider(self._get_bus()) + self.bp_middleware1 = BusProviderMiddleware1(self._get_bus()) self.bp_middleware1.start() dbus_ios1_running = self.bp_ios1 and self.bp_ios1.is_alive() if not dbus_ios1_running: - self.bp_ios1 = BusProviderIo(self._get_bus()) + self.bp_ios1 = BusProviderIos1(self._get_bus()) self.bp_ios1.start() log.debug("leave MiddlewareDaemon.dbus_start") diff --git a/src/revpi_middleware/ios1/__init__.py b/src/revpi_middleware/dbus_ios1/__init__.py similarity index 82% rename from src/revpi_middleware/ios1/__init__.py rename to src/revpi_middleware/dbus_ios1/__init__.py index 7f85762..ad1e942 100644 --- a/src/revpi_middleware/ios1/__init__.py +++ b/src/revpi_middleware/dbus_ios1/__init__.py @@ -4,3 +4,5 @@ """D-Bus ios version 1 of revpi_middleware.""" from .ios1_helper import REVPI_DBUS_BASE_PATH, REVPI_DBUS_NAME + +from .bus_provider_ios1 import BusProviderIos1 diff --git a/src/revpi_middleware/ios1/bus_provider_io.py b/src/revpi_middleware/dbus_ios1/bus_provider_ios1.py similarity index 91% rename from src/revpi_middleware/ios1/bus_provider_io.py rename to src/revpi_middleware/dbus_ios1/bus_provider_ios1.py index b312c3c..a3052fe 100644 --- a/src/revpi_middleware/ios1/bus_provider_io.py +++ b/src/revpi_middleware/dbus_ios1/bus_provider_ios1.py @@ -25,7 +25,7 @@ from .interface_ios import ( log = getLogger(__name__) -class BusProviderIo(Thread): +class BusProviderIos1(Thread): def __init__( self, @@ -33,7 +33,7 @@ class BusProviderIo(Thread): picontrol_device="/dev/piControl0", config_rsc="/etc/revpi/config.rsc", ): - log.debug("enter BusProviderIo.__init__") + log.debug("enter BusProviderIos1.__init__") super().__init__() self._bus = dbus @@ -50,7 +50,7 @@ class BusProviderIo(Thread): self.config_rsc = config_rsc def run(self): - log.debug("enter BusProviderIo.run") + log.debug("enter BusProviderIos1.run") self._lst_device_interfaces.clear() self._lst_io_interfaces.clear() @@ -100,12 +100,12 @@ class BusProviderIo(Thread): self._modio.cleanup() - log.debug("leave BusProviderIo.run") + log.debug("leave BusProviderIos1.run") def stop(self): - log.debug("enter BusProviderIo.stop") + log.debug("enter BusProviderIos1.stop") self._loop.quit() - log.debug("leave BusProviderIo.stop") + log.debug("leave BusProviderIos1.stop") @property def bus(self) -> Union[SystemBus, SessionBus]: diff --git a/src/revpi_middleware/ios1/interface_devices.py b/src/revpi_middleware/dbus_ios1/interface_devices.py similarity index 100% rename from src/revpi_middleware/ios1/interface_devices.py rename to src/revpi_middleware/dbus_ios1/interface_devices.py diff --git a/src/revpi_middleware/ios1/interface_ios.py b/src/revpi_middleware/dbus_ios1/interface_ios.py similarity index 100% rename from src/revpi_middleware/ios1/interface_ios.py rename to src/revpi_middleware/dbus_ios1/interface_ios.py diff --git a/src/revpi_middleware/ios1/ios1_helper.py b/src/revpi_middleware/dbus_ios1/ios1_helper.py similarity index 100% rename from src/revpi_middleware/ios1/ios1_helper.py rename to src/revpi_middleware/dbus_ios1/ios1_helper.py diff --git a/src/revpi_middleware/dbus_middleware1/__init__.py b/src/revpi_middleware/dbus_middleware1/__init__.py index d032591..497c022 100644 --- a/src/revpi_middleware/dbus_middleware1/__init__.py +++ b/src/revpi_middleware/dbus_middleware1/__init__.py @@ -6,4 +6,4 @@ from .dbus_helper import REVPI_DBUS_BASE_PATH, REVPI_DBUS_NAME from .dbus_helper import extend_interface -from .bus_provider import BusProvider +from .bus_provider_middleware1 import BusProviderMiddleware1 diff --git a/src/revpi_middleware/dbus_middleware1/bus_provider.py b/src/revpi_middleware/dbus_middleware1/bus_provider_middleware1.py similarity index 86% rename from src/revpi_middleware/dbus_middleware1/bus_provider.py rename to src/revpi_middleware/dbus_middleware1/bus_provider_middleware1.py index 2165d75..9f98f7e 100644 --- a/src/revpi_middleware/dbus_middleware1/bus_provider.py +++ b/src/revpi_middleware/dbus_middleware1/bus_provider_middleware1.py @@ -17,7 +17,7 @@ from .system_config import InterfaceRevpiConfig, InterfaceSoftwareServices log = getLogger(__name__) -class BusProvider(Thread): +class BusProviderMiddleware1(Thread): def __init__( self, @@ -25,7 +25,7 @@ class BusProvider(Thread): picontrol_device="/dev/piControl0", config_rsc="/etc/revpi/config.rsc", ): - log.debug("enter BusProvider.__init__") + log.debug("enter BusProviderMiddleware1.__init__") super().__init__() self._bus = dbus @@ -35,7 +35,7 @@ class BusProvider(Thread): self.config_rsc = config_rsc def run(self): - log.debug("enter BusProvider.run") + log.debug("enter BusProviderMiddleware1.run") # The 2nd, 3rd, ... arguments can be objects or tuples of a path and an object # Example(), @@ -67,12 +67,12 @@ class BusProvider(Thread): _, interface = interface interface.cleanup() - log.debug("leave BusProvider.run") + log.debug("leave BusProviderMiddleware1.run") def stop(self): - log.debug("enter BusProvider.stop") + log.debug("enter BusProviderMiddleware1.stop") self._loop.quit() - log.debug("leave BusProvider.stop") + log.debug("leave BusProviderMiddleware1.stop") @property def bus(self) -> Union[SystemBus, SessionBus]: