From 4cb56362ec3f79dec9bf993f0ac98b1058e4e6f2 Mon Sep 17 00:00:00 2001 From: Goffi Date: Wed, 29 Jan 2020 18:54:40 +0100 Subject: [PATCH] bridge (dbus): new `bridge_dbus_int_prefix` option (in `[DEFAULT]` settings) to change interface prefix --- .../constructors/dbus/dbus_core_template.py | 16 +++++++++++----- .../constructors/dbus/dbus_frontend_template.py | 14 ++++++++++---- sat/bridge/dbus_bridge.py | 16 +++++++++++----- sat_frontends/bridge/dbus_bridge.py | 14 ++++++++++---- 4 files changed, 42 insertions(+), 18 deletions(-) diff --git a/sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py b/sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py index 03af64d2..df6b432d 100644 --- a/sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py +++ b/sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 - -# SAT: a jabber client +# SàT communication bridge # Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify @@ -23,12 +22,19 @@ import dbus.service import dbus.mainloop.glib import inspect from sat.core.log import getLogger - -log = getLogger(__name__) +from sat.tools import config from twisted.internet.defer import Deferred from sat.core.exceptions import BridgeInitError -const_INT_PREFIX = "org.salutatoi.SAT" # Interface prefix + +log = getLogger(__name__) + +# Interface prefix +const_INT_PREFIX = config.getConfig( + config.parseMainConf(), + "", + "bridge_dbus_int_prefix", + "org.salutatoi.SAT") const_ERROR_PREFIX = const_INT_PREFIX + ".error" const_OBJ_PATH = "/org/salutatoi/SAT/bridge" const_CORE_SUFFIX = ".core" diff --git a/sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py b/sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py index cf3bd8c3..f5a059bd 100644 --- a/sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py +++ b/sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 -#-*- coding: utf-8 -*- -# SAT communication bridge +# SàT communication bridge # Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify @@ -21,16 +20,23 @@ import asyncio import dbus import ast from sat.core.i18n import _ -from .bridge_frontend import BridgeException +from sat.tools import config from sat.core.log import getLogger from sat.core.exceptions import BridgeExceptionNoService, BridgeInitError from dbus.mainloop.glib import DBusGMainLoop +from .bridge_frontend import BridgeException + DBusGMainLoop(set_as_default=True) log = getLogger(__name__) -const_INT_PREFIX = "org.salutatoi.SAT" # Interface prefix +# Interface prefix +const_INT_PREFIX = config.getConfig( + config.parseMainConf(), + "", + "bridge_dbus_int_prefix", + "org.salutatoi.SAT") const_ERROR_PREFIX = const_INT_PREFIX + ".error" const_OBJ_PATH = '/org/salutatoi/SAT/bridge' const_CORE_SUFFIX = ".core" diff --git a/sat/bridge/dbus_bridge.py b/sat/bridge/dbus_bridge.py index 5e38c914..29191bfc 100644 --- a/sat/bridge/dbus_bridge.py +++ b/sat/bridge/dbus_bridge.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 - -# SAT: a jabber client +# SàT communication bridge # Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify @@ -23,12 +22,19 @@ import dbus.service import dbus.mainloop.glib import inspect from sat.core.log import getLogger - -log = getLogger(__name__) +from sat.tools import config from twisted.internet.defer import Deferred from sat.core.exceptions import BridgeInitError -const_INT_PREFIX = "org.salutatoi.SAT" # Interface prefix + +log = getLogger(__name__) + +# Interface prefix +const_INT_PREFIX = config.getConfig( + config.parseMainConf(), + "", + "bridge_dbus_int_prefix", + "org.salutatoi.SAT") const_ERROR_PREFIX = const_INT_PREFIX + ".error" const_OBJ_PATH = "/org/salutatoi/SAT/bridge" const_CORE_SUFFIX = ".core" diff --git a/sat_frontends/bridge/dbus_bridge.py b/sat_frontends/bridge/dbus_bridge.py index c18811d0..09c2f4bf 100644 --- a/sat_frontends/bridge/dbus_bridge.py +++ b/sat_frontends/bridge/dbus_bridge.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 -#-*- coding: utf-8 -*- -# SAT communication bridge +# SàT communication bridge # Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify @@ -21,16 +20,23 @@ import asyncio import dbus import ast from sat.core.i18n import _ -from .bridge_frontend import BridgeException +from sat.tools import config from sat.core.log import getLogger from sat.core.exceptions import BridgeExceptionNoService, BridgeInitError from dbus.mainloop.glib import DBusGMainLoop +from .bridge_frontend import BridgeException + DBusGMainLoop(set_as_default=True) log = getLogger(__name__) -const_INT_PREFIX = "org.salutatoi.SAT" # Interface prefix +# Interface prefix +const_INT_PREFIX = config.getConfig( + config.parseMainConf(), + "", + "bridge_dbus_int_prefix", + "org.salutatoi.SAT") const_ERROR_PREFIX = const_INT_PREFIX + ".error" const_OBJ_PATH = '/org/salutatoi/SAT/bridge' const_CORE_SUFFIX = ".core"