From 085ed041e7c28b6a54cb05e6a84ea868df903289 Mon Sep 17 00:00:00 2001 From: Goffi Date: Sun, 5 Mar 2017 21:36:01 +0100 Subject: [PATCH] core, bridge: renamed getProfileName to profileNameGet according to new conventions --- frontends/src/bridge/dbus_bridge.py | 28 +++++++++---------- frontends/src/jp/base.py | 2 +- frontends/src/jp/cmd_profile.py | 2 +- .../quick_frontend/quick_profile_manager.py | 2 +- .../bridge_constructor/bridge_template.ini | 2 +- .../dbus/dbus_frontend_template.py | 4 +-- src/bridge/dbus_bridge.py | 12 ++++---- src/core/sat_main.py | 2 +- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/frontends/src/bridge/dbus_bridge.py b/frontends/src/bridge/dbus_bridge.py index 2c9b8c82..ecf2c012 100644 --- a/frontends/src/bridge/dbus_bridge.py +++ b/frontends/src/bridge/dbus_bridge.py @@ -375,20 +375,6 @@ class Bridge(object): kwargs['error_handler'] = error_handler return self.db_core_iface.getPresenceStatuses(profile_key, **kwargs) - def getProfileName(self, profile_key="@DEFAULT@", callback=None, errback=None): - if callback is None: - error_handler = None - else: - if errback is None: - errback = log.error - error_handler = lambda err:errback(dbus_to_bridge_exception(err)) - kwargs={} - if callback is not None: - kwargs['timeout'] = const_TIMEOUT - kwargs['reply_handler'] = callback - kwargs['error_handler'] = error_handler - return unicode(self.db_core_iface.getProfileName(profile_key, **kwargs)) - def getReady(self, callback=None, errback=None): if callback is None: error_handler = None @@ -555,6 +541,20 @@ class Bridge(object): kwargs['error_handler'] = error_handler return self.db_core_iface.profileIsSessionStarted(profile_key, **kwargs) + def profileNameGet(self, profile_key="@DEFAULT@", callback=None, errback=None): + if callback is None: + error_handler = None + else: + if errback is None: + errback = log.error + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} + if callback is not None: + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler + return unicode(self.db_core_iface.profileNameGet(profile_key, **kwargs)) + def profileSetDefault(self, profile, callback=None, errback=None): if callback is None: error_handler = None diff --git a/frontends/src/jp/base.py b/frontends/src/jp/base.py index 0204b065..b04dde80 100644 --- a/frontends/src/jp/base.py +++ b/frontends/src/jp/base.py @@ -465,7 +465,7 @@ class Jp(object): log.error(_(u"Can't start {profile}'s session: {reason}").format(profile=self.profile, reason=failure)) self.quit(1) - self.profile = self.bridge.getProfileName(self.args.profile) + self.profile = self.bridge.profileNameGet(self.args.profile) if not self.profile: log.error(_("The profile [{profile}] doesn't exist").format(profile=self.args.profile)) diff --git a/frontends/src/jp/cmd_profile.py b/frontends/src/jp/cmd_profile.py index c55362fa..64e428f9 100644 --- a/frontends/src/jp/cmd_profile.py +++ b/frontends/src/jp/cmd_profile.py @@ -50,7 +50,7 @@ class ProfileDefault(base.CommandBase): pass def start(self): - print self.host.bridge.getProfileName('@DEFAULT@') + print self.host.bridge.profileNameGet('@DEFAULT@') class ProfileDelete(base.CommandBase): diff --git a/frontends/src/quick_frontend/quick_profile_manager.py b/frontends/src/quick_frontend/quick_profile_manager.py index 5b260f8c..003fbaa3 100644 --- a/frontends/src/quick_frontend/quick_profile_manager.py +++ b/frontends/src/quick_frontend/quick_profile_manager.py @@ -123,7 +123,7 @@ class QuickProfileManager(object): log.error(u"Can't retrieve profile name: {}".format(failure)) for profile_key in profile_keys: - self.host.bridge.getProfileName(profile_key, callback=getProfileNameCb, errback=getProfileNameEb) + self.host.bridge.profileNameGet(profile_key, callback=getProfileNameCb, errback=getProfileNameEb) def getParamError(self, dummy): diff --git a/src/bridge/bridge_constructor/bridge_template.ini b/src/bridge/bridge_constructor/bridge_template.ini index 441ea0f3..091b62f6 100644 --- a/src/bridge/bridge_constructor/bridge_template.ini +++ b/src/bridge/bridge_constructor/bridge_template.ini @@ -187,7 +187,7 @@ doc_return=dictionary of available features: plugin import name is used as key, data is an other dict managed by the plugin async= -[getProfileName] +[profileNameGet] type=method category=core sig_in=s diff --git a/src/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py b/src/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py index d7b55700..a8832683 100644 --- a/src/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py +++ b/src/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py @@ -18,7 +18,7 @@ # along with this program. If not, see . from sat.core.i18n import _ -from bridge_frontend import BridgeFrontend, BridgeException +from bridge_frontend import BridgeException import dbus from sat.core.log import getLogger log = getLogger(__name__) @@ -59,7 +59,7 @@ def dbus_to_bridge_exception(dbus_e): return BridgeException(name, message, condition) -class Bridge(BridgeFrontend): +class Bridge(object): def bridgeConnect(self, callback, errback): try: diff --git a/src/bridge/dbus_bridge.py b/src/bridge/dbus_bridge.py index 1c6c81c1..77380468 100755 --- a/src/bridge/dbus_bridge.py +++ b/src/bridge/dbus_bridge.py @@ -317,12 +317,6 @@ class DbusObject(dbus.service.Object): def getPresenceStatuses(self, profile_key="@DEFAULT@"): return self._callback("getPresenceStatuses", unicode(profile_key)) - @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, - in_signature='s', out_signature='s', - async_callbacks=None) - def getProfileName(self, profile_key="@DEFAULT@"): - return self._callback("getProfileName", unicode(profile_key)) - @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, in_signature='', out_signature='', async_callbacks=('callback', 'errback')) @@ -407,6 +401,12 @@ class DbusObject(dbus.service.Object): def profileIsSessionStarted(self, profile_key="@DEFAULT@"): return self._callback("profileIsSessionStarted", unicode(profile_key)) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='s', + async_callbacks=None) + def profileNameGet(self, profile_key="@DEFAULT@"): + return self._callback("profileNameGet", unicode(profile_key)) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, in_signature='s', out_signature='', async_callbacks=None) diff --git a/src/core/sat_main.py b/src/core/sat_main.py index 22c709dc..eb34b7e2 100644 --- a/src/core/sat_main.py +++ b/src/core/sat_main.py @@ -74,7 +74,7 @@ class SAT(service.Service): 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("profileNameGet", self.memory.getProfileName) self.bridge.register_method("profilesListGet", 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)