return loaded backends / modules
This commit is contained in:
parent
cdc58a0afc
commit
eb2c25758d
2 changed files with 13 additions and 8 deletions
|
|
@ -62,11 +62,12 @@ class Weboob(object):
|
||||||
self.backends_config = BackendsConfig(backends_filename)
|
self.backends_config = BackendsConfig(backends_filename)
|
||||||
|
|
||||||
def load_backends(self, caps=None, names=None, storage=None):
|
def load_backends(self, caps=None, names=None, storage=None):
|
||||||
|
loaded_backends = {}
|
||||||
for name, _type, params in self.backends_config.iter_backends():
|
for name, _type, params in self.backends_config.iter_backends():
|
||||||
try:
|
try:
|
||||||
module = self.modules_loader.get_or_load_module(_type)
|
module = self.modules_loader.get_or_load_module(_type)
|
||||||
except KeyError:
|
except KeyError:
|
||||||
warning('Unable to find module "%s" for backend "%s"' % (_type, name))
|
warning(u'Unable to find module "%s" for backend "%s"' % (_type, name))
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Check conditions
|
# Check conditions
|
||||||
|
|
@ -76,21 +77,25 @@ class Weboob(object):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.backends[name] = module.create_backend(self, name, params, storage)
|
self.backends[name] = module.create_backend(self, name, params, storage)
|
||||||
|
loaded_backends[name] = self.backends[name]
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
warning('Unable to load "%s" backend: %s. filename=%s' % (name, e, self.backends_config.confpath))
|
warning(u'Unable to load "%s" backend: %s. filename=%s' % (name, e, self.backends_config.confpath))
|
||||||
|
|
||||||
return self.backends
|
return loaded_backends
|
||||||
|
|
||||||
def load_modules(self, caps=None, names=None, storage=None):
|
def load_modules(self, caps=None, names=None, storage=None):
|
||||||
|
loaded_backends = {}
|
||||||
self.modules_loader.load()
|
self.modules_loader.load()
|
||||||
for name, module in self.modules_loader.modules.iteritems():
|
for name, module in self.modules_loader.modules.iteritems():
|
||||||
if (caps is None or module.has_caps(caps)) and \
|
if (caps is None or module.has_caps(caps)) and \
|
||||||
(names is None or module.get_name() in names):
|
(names is None or module.get_name() in names):
|
||||||
try:
|
try:
|
||||||
self.backends[module.get_name()] = module.create_backend(self, module.get_name(), {}, storage)
|
name = module.get_name()
|
||||||
|
self.backends[name] = module.create_backend(self, name, {}, storage)
|
||||||
|
loaded_backends[name] = self.backends[name]
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
warning('Unable to load "%s" module as backend with no config: %s' % (name, e))
|
warning(u'Unable to load "%s" module as backend with no config: %s' % (name, e))
|
||||||
return self.backends
|
return loaded_backends
|
||||||
|
|
||||||
def iter_backends(self, caps=None):
|
def iter_backends(self, caps=None):
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
|
|
@ -117,12 +117,12 @@ class BaseApplication(object):
|
||||||
def load_backends(self, caps=None, names=None, *args, **kwargs):
|
def load_backends(self, caps=None, names=None, *args, **kwargs):
|
||||||
if names is None:
|
if names is None:
|
||||||
names = self._enabled_backends
|
names = self._enabled_backends
|
||||||
self.weboob.load_backends(caps, names, *args, **kwargs)
|
return self.weboob.load_backends(caps, names, *args, **kwargs)
|
||||||
|
|
||||||
def load_modules(self, caps=None, names=None, *args, **kwargs):
|
def load_modules(self, caps=None, names=None, *args, **kwargs):
|
||||||
if names is None:
|
if names is None:
|
||||||
names = self._enabled_backends
|
names = self._enabled_backends
|
||||||
self.weboob.load_modules(caps, names, *args, **kwargs)
|
return self.weboob.load_modules(caps, names, *args, **kwargs)
|
||||||
|
|
||||||
def _get_completions(self):
|
def _get_completions(self):
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue