Mercurial > libervia-backend
diff src/core/sat_main.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 | 046449cc2bff |
| children | c02f96756d5c |
line wrap: on
line diff
--- a/src/core/sat_main.py Sun Oct 02 22:44:33 2016 +0200 +++ b/src/core/sat_main.py Mon Oct 03 21:15:39 2016 +0200 @@ -25,7 +25,7 @@ from twisted.words.xish import domish from twisted.internet import reactor from wokkel.xmppim import RosterItem -from sat.bridge.DBus import DBusBridge +from sat.bridge.dbus_bridge import Bridge from sat.core import xmpp from sat.core import exceptions from sat.core.log import getLogger @@ -61,55 +61,55 @@ self.trigger = trigger.TriggerManager() # trigger are used to change SàT behaviour try: - self.bridge = DBusBridge() + self.bridge = Bridge() except exceptions.BridgeInitError: log.error(u"Bridge can't be initialised, can't start SàT core") sys.exit(1) - self.bridge.register("getReady", lambda: self.initialised) - self.bridge.register("getVersion", lambda: self.full_version) - self.bridge.register("getFeatures", self.getFeatures) - self.bridge.register("getProfileName", self.memory.getProfileName) - self.bridge.register("getProfilesList", self.memory.getProfilesList) - self.bridge.register("getEntityData", lambda jid_, keys, profile: self.memory.getEntityData(jid.JID(jid_), keys, profile)) - self.bridge.register("getEntitiesData", self.memory._getEntitiesData) - self.bridge.register("asyncCreateProfile", self.memory.asyncCreateProfile) - self.bridge.register("asyncDeleteProfile", self.memory.asyncDeleteProfile) - self.bridge.register("profileStartSession", self.memory.startSession) - self.bridge.register("profileIsSessionStarted", self.memory._isSessionStarted) - self.bridge.register("profileSetDefault", self.memory.profileSetDefault) - self.bridge.register("asyncConnect", self._asyncConnect) - self.bridge.register("disconnect", self.disconnect) - self.bridge.register("getContacts", self.getContacts) - self.bridge.register("getContactsFromGroup", self.getContactsFromGroup) - self.bridge.register("getMainResource", self.memory._getMainResource) - self.bridge.register("getPresenceStatuses", self.memory._getPresenceStatuses) - self.bridge.register("getWaitingSub", self.memory.getWaitingSub) - self.bridge.register("messageSend", self._messageSend) - self.bridge.register("getConfig", self._getConfig) - self.bridge.register("setParam", self.setParam) - self.bridge.register("getParamA", self.memory.getStringParamA) - self.bridge.register("asyncGetParamA", self.memory.asyncGetStringParamA) - self.bridge.register("asyncGetParamsValuesFromCategory", self.memory.asyncGetParamsValuesFromCategory) - self.bridge.register("getParamsUI", self.memory.getParamsUI) - self.bridge.register("getParamsCategories", self.memory.getParamsCategories) - self.bridge.register("paramsRegisterApp", self.memory.paramsRegisterApp) - self.bridge.register("historyGet", self.memory._historyGet) - self.bridge.register("setPresence", self._setPresence) - self.bridge.register("subscription", self.subscription) - self.bridge.register("addContact", self._addContact) - self.bridge.register("updateContact", self._updateContact) - self.bridge.register("delContact", self._delContact) - self.bridge.register("isConnected", self.isConnected) - self.bridge.register("launchAction", self.launchCallback) - self.bridge.register("actionsGet", self.actionsGet) - self.bridge.register("progressGet", self._progressGet) - self.bridge.register("progressGetAll", self._progressGetAll) - self.bridge.register("getMenus", self.getMenus) - self.bridge.register("getMenuHelp", self.getMenuHelp) - self.bridge.register("discoInfos", self.memory.disco._discoInfos) - self.bridge.register("discoItems", self.memory.disco._discoItems) - self.bridge.register("saveParamsTemplate", self.memory.save_xml) - self.bridge.register("loadParamsTemplate", self.memory.load_xml) + self.bridge.register_method("getReady", lambda: self.initialised) + self.bridge.register_method("getVersion", lambda: self.full_version) + self.bridge.register_method("getFeatures", self.getFeatures) + self.bridge.register_method("getProfileName", self.memory.getProfileName) + self.bridge.register_method("getProfilesList", self.memory.getProfilesList) + self.bridge.register_method("getEntityData", lambda jid_, keys, profile: self.memory.getEntityData(jid.JID(jid_), keys, profile)) + self.bridge.register_method("getEntitiesData", self.memory._getEntitiesData) + self.bridge.register_method("asyncCreateProfile", self.memory.asyncCreateProfile) + self.bridge.register_method("asyncDeleteProfile", self.memory.asyncDeleteProfile) + self.bridge.register_method("profileStartSession", self.memory.startSession) + self.bridge.register_method("profileIsSessionStarted", self.memory._isSessionStarted) + self.bridge.register_method("profileSetDefault", self.memory.profileSetDefault) + self.bridge.register_method("asyncConnect", self._asyncConnect) + self.bridge.register_method("disconnect", self.disconnect) + self.bridge.register_method("getContacts", self.getContacts) + self.bridge.register_method("getContactsFromGroup", self.getContactsFromGroup) + self.bridge.register_method("getMainResource", self.memory._getMainResource) + self.bridge.register_method("getPresenceStatuses", self.memory._getPresenceStatuses) + self.bridge.register_method("getWaitingSub", self.memory.getWaitingSub) + self.bridge.register_method("messageSend", self._messageSend) + self.bridge.register_method("getConfig", self._getConfig) + self.bridge.register_method("setParam", self.setParam) + self.bridge.register_method("getParamA", self.memory.getStringParamA) + self.bridge.register_method("asyncGetParamA", self.memory.asyncGetStringParamA) + self.bridge.register_method("asyncGetParamsValuesFromCategory", self.memory.asyncGetParamsValuesFromCategory) + self.bridge.register_method("getParamsUI", self.memory.getParamsUI) + self.bridge.register_method("getParamsCategories", self.memory.getParamsCategories) + self.bridge.register_method("paramsRegisterApp", self.memory.paramsRegisterApp) + self.bridge.register_method("historyGet", self.memory._historyGet) + self.bridge.register_method("setPresence", self._setPresence) + self.bridge.register_method("subscription", self.subscription) + self.bridge.register_method("addContact", self._addContact) + self.bridge.register_method("updateContact", self._updateContact) + self.bridge.register_method("delContact", self._delContact) + self.bridge.register_method("isConnected", self.isConnected) + self.bridge.register_method("launchAction", self.launchCallback) + self.bridge.register_method("actionsGet", self.actionsGet) + self.bridge.register_method("progressGet", self._progressGet) + self.bridge.register_method("progressGetAll", self._progressGetAll) + self.bridge.register_method("getMenus", self.getMenus) + self.bridge.register_method("getMenuHelp", self.getMenuHelp) + self.bridge.register_method("discoInfos", self.memory.disco._discoInfos) + self.bridge.register_method("discoItems", self.memory.disco._discoItems) + self.bridge.register_method("saveParamsTemplate", self.memory.save_xml) + self.bridge.register_method("loadParamsTemplate", self.memory.load_xml) self.memory.initialized.addCallback(self._postMemoryInit)