core, frontends: getProfilesList renamed to profilesGetList + behaviour change:

- profilesGetList now handles clients and components boolean arguments, to filter profiles
    - jp: added --clients and --components options to profile/list
    - profilesGetList now returns sorted profiles
This commit is contained in:
Goffi 2017-02-12 19:08:52 +01:00
commit 85f3bd5988
4 changed files with 79 additions and 48 deletions

View file

@ -197,12 +197,16 @@ doc=Get real profile name from profile key
doc_param_0=%(doc_profile_key)s
doc_return=Real profile name
[getProfilesList]
[profilesListGet]
type=method
category=core
sig_in=
sig_in=bb
sig_out=as
doc=Get all profiles
param_0_default=True
param_1_default=False
doc_param_0=clients: get clients profiles
doc_param_1=components: get components profiles
doc=Get list of profiles
[profileSetDefault]
type=method

View file

@ -323,12 +323,6 @@ class DbusObject(dbus.service.Object):
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='as',
async_callbacks=None)
def getProfilesList(self, ):
return self._callback("getProfilesList", )
@dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
in_signature='', out_signature='',
async_callbacks=('callback', 'errback'))
@ -425,6 +419,12 @@ class DbusObject(dbus.service.Object):
def profileStartSession(self, password='', profile_key="@DEFAULT@", callback=None, errback=None):
return self._callback("profileStartSession", unicode(password), unicode(profile_key), callback=callback, errback=errback)
@dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
in_signature='bb', out_signature='as',
async_callbacks=None)
def profilesListGet(self, clients=True, components=False):
return self._callback("profilesListGet", clients, components)
@dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
in_signature='ss', out_signature='a{ss}',
async_callbacks=None)

View file

@ -76,7 +76,7 @@ class SAT(service.Service):
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("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)
self.bridge.register_method("profileCreate", self.memory.createProfile)

View file

@ -430,8 +430,26 @@ class Memory(object):
except KeyError:
log.error(_(u"Trying to purge roster status cache for a profile not in memory: [%s]") % profile)
def getProfilesList(self):
return self.storage.getProfilesList()
def getProfilesList(self, clients=True, components=False):
"""retrieve profiles list
@param clients(bool): if True return clients profiles
@param components(bool): if True return components profiles
@return (list[unicode]): selected profiles
"""
if not clients and not components:
log.warning(_(u"requesting no profiles at all"))
return []
profiles = self.storage.getProfilesList()
if clients and components:
return sorted(profiles)
isComponent = self.storage.profileIsComponent
if clients:
p_filter = lambda p: not isComponent(p)
else:
p_filter = lambda p: isComponent(p)
return sorted(p for p in profiles if p_filter(p))
def getProfileName(self, profile_key, return_profile_keys=False):
"""Return name of profile from keyword