erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core, bridge: renamed getProfileName to profileNameGet according to new conventions

Browse source
This commit is contained in:
Goffi 2017-03-05 21:36:01 +01:00
commit 085ed041e7
8 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

28
frontends/src/bridge/dbus_bridge.py
View file

@ -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

2
frontends/src/jp/base.py
View file

@ -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))

2
frontends/src/jp/cmd_profile.py
View file

@ -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):

2
frontends/src/quick_frontend/quick_profile_manager.py
View file

@ -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):

2
src/bridge/bridge_constructor/bridge_template.ini
View file

@ -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

4
src/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py
View file

@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
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:

12
src/bridge/dbus_bridge.py
View file

@ -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)

2
src/core/sat_main.py
View file

@ -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)