bridge (D-Bus): bad design fixes:

- renamed outputed module to dbus_bridge (to avoid uppercase and conflict with dbus module)
    - class name is now Bridge for both frontend and core (make discovery/import more easy)
    - register renamed to register_method in core, and register_signal in frontend
This commit is contained in:
Goffi 2016-10-03 21:15:39 +02:00
commit 372f54ec2a
3 changed files with 70 additions and 70 deletions

View file

@ -23,7 +23,7 @@ from sat.bridge.bridge_constructor import base_constructor
class DbusConstructor(base_constructor.Constructor):
NAME = "dbus"
CORE_TEMPLATE = "dbus_core_template.py"
CORE_DEST = "DBus.py"
CORE_DEST = "dbus_bridge.py"
CORE_FORMATS = {
'signals': """\
@dbus.service.signal(const_INT_PREFIX+const_{category}_SUFFIX,

View file

@ -83,7 +83,7 @@ class DbusObject(dbus.service.Object):
log.debug("Init DbusObject...")
self.cb = {}
def register(self, name, cb):
def register_method(self, name, cb):
self.cb[name] = cb
def _callback(self, name, *args, **kwargs):
@ -216,7 +216,7 @@ class DbusObject(dbus.service.Object):
func_table[function.__name__] = function # Needed for introspection
class DBusBridge(object):
class Bridge(object):
def __init__(self):
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
log.info("Init DBus...")
@ -230,17 +230,17 @@ class DBusBridge(object):
self.dbus_bridge = DbusObject(self.session_bus, const_OBJ_PATH)
##SIGNAL_DIRECT_CALLS_PART##
def register(self, name, callback):
def register_method(self, name, callback):
log.debug("registering DBus bridge method [%s]" % name)
self.dbus_bridge.register(name, callback)
self.dbus_bridge.register_method(name, callback)
def addMethod(self, name, int_suffix, in_sign, out_sign, method, async=False, doc={}):
"""Dynamically add a method to Dbus Bridge"""
#FIXME: doc parameter is kept only temporary, the time to remove it from calls
log.debug("Adding method [%s] to DBus bridge" % name)
self.dbus_bridge.addMethod(name, int_suffix, in_sign, out_sign, method, async)
self.register(name, method)
self.register_method(name, method)
def addSignal(self, name, int_suffix, signature, doc={}):
self.dbus_bridge.addSignal(name, int_suffix, signature, doc)
setattr(DBusBridge, name, getattr(self.dbus_bridge, name))
setattr(Bridge, name, getattr(self.dbus_bridge, name))

View file

@ -59,7 +59,7 @@ def dbus_to_bridge_exception(dbus_e):
return BridgeException(name, message, condition)
class DBusBridgeFrontend(BridgeFrontend):
class Bridge(BridgeFrontend):
def __init__(self):
try:
self.sessions_bus = dbus.SessionBus()
@ -80,7 +80,7 @@ class DBusBridgeFrontend(BridgeFrontend):
raise e
#props = self.db_core_iface.getProperties()
def register(self, functionName, handler, iface="core"):
def register_signal(self, functionName, handler, iface="core"):
if iface == "core":
self.db_core_iface.connect_to_signal(functionName, handler)
elif iface == "plugin":