Mercurial > libervia-backend
diff src/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py @ 2086:4633cfcbcccb
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
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Mon, 03 Oct 2016 21:15:39 +0200 |
| parents | da4097de5a95 |
| children | 8b37a62336c3 |
line wrap: on
line diff
--- a/src/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py Sun Oct 02 22:44:33 2016 +0200 +++ b/src/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py Mon Oct 03 21:15:39 2016 +0200 @@ -83,7 +83,7 @@ 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 @@ 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 @@ 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))