nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more precise vocabulary, s/_type/backend/

Browse source
This commit is contained in:
Christophe Benz 2010-07-12 13:58:48 +02:00
commit 14f8e8e816
1 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

66
weboob/core/backends.py
View file

@ -83,9 +83,9 @@ class Backend(object):
return True return True
return False return False
def create_instance(self, weboob, name, config, storage): def create_instance(self, weboob, instance_name, config, storage):
backend_instance = self.klass(weboob, name, config, storage) backend_instance = self.klass(weboob, instance_name, config, storage)
debug('Created backend instance "%s"' % name) debug(u'Created backend instance "%s" for backend "%s"' % (instance_name, self.name))
return backend_instance return backend_instance
@ -107,47 +107,47 @@ class BackendsConfig(object):
def iter_backends(self): def iter_backends(self):
config = SafeConfigParser() config = SafeConfigParser()
config.read(self.confpath) config.read(self.confpath)
for name in config.sections(): for instance_name in config.sections():
params = dict(config.items(name, raw=True)) params = dict(config.items(instance_name, raw=True))
try: try:
yield name, params.pop('_type'), params yield instance_name, params.pop('backend'), params
except KeyError: except KeyError:
warning('Missing field "_type" for backend "%s"', name) warning('Missing field "backend" for configured backend "%s"', instance_name)
continue continue
def add_backend(self, name, _type, params, edit=False): def add_backend(self, instance_name, backend_name, params, edit=False):
if not name: if not instance_name:
raise ValueError(u'Please give a name to the backend.') raise ValueError(u'Please give a name to the configured backend.')
config = SafeConfigParser() config = SafeConfigParser()
config.read(self.confpath) config.read(self.confpath)
if not edit: if not edit:
config.add_section(name) config.add_section(instance_name)
config.set(name, '_type', _type) config.set(instance_name, 'backend', backend_name)
for key, value in params.iteritems(): for key, value in params.iteritems():
config.set(name, key, value) config.set(instance_name, key, value)
with open(self.confpath, 'wb') as f: with open(self.confpath, 'wb') as f:
config.write(f) config.write(f)
def edit_backend(self, name, _type, params): def edit_backend(self, instance_name, backend_name, params):
return self.add_backend(name, _type, params, True) return self.add_backend(instance_name, backend_name, params, True)
def get_backend(self, name): def get_backend(self, instance_name):
config = SafeConfigParser() config = SafeConfigParser()
config.read(self.confpath) config.read(self.confpath)
if not config.has_section(name): if not config.has_section(instance_name):
raise KeyError(u'Backend instance "%s" not found' % name) raise KeyError(u'Configured backend "%s" not found' % instance_name)
items = dict(config.items(name, raw=True)) items = dict(config.items(instance_name, raw=True))
try: try:
return items.pop('_type'), items return items.pop('backend'), items
except KeyError: except KeyError:
warning('Missing field "_type" for backend "%s"', name) warning('Missing field "backend" for backend "%s"', instance_name)
raise KeyError(u'Backend "%s" not found' % name) raise KeyError(u'Configured backend "%s" not found' % instance_name)
def remove_backend(self, name): def remove_backend(self, instance_name):
config = SafeConfigParser() config = SafeConfigParser()
config.read(self.confpath) config.read(self.confpath)
config.remove_section(name) config.remove_section(instance_name)
with open(self.confpath, 'w') as f: with open(self.confpath, 'w') as f:
config.write(f) config.write(f)
@ -156,10 +156,10 @@ class BackendsLoader(object):
def __init__(self): def __init__(self):
self.loaded = {} self.loaded = {}
def get_or_load_backend(self, name): def get_or_load_backend(self, backend_name):
if name not in self.loaded: if backend_name not in self.loaded:
self.load_backend(name) self.load_backend(backend_name)
return self.loaded[name] return self.loaded[backend_name]
def iter_existing_backend_names(self): def iter_existing_backend_names(self):
for path in weboob.backends.__path__: for path in weboob.backends.__path__:
@ -173,12 +173,12 @@ class BackendsLoader(object):
for existing_backend_name in self.iter_existing_backend_names(): for existing_backend_name in self.iter_existing_backend_names():
self.load_backend(existing_backend_name) self.load_backend(existing_backend_name)
def load_backend(self, name): def load_backend(self, backend_name):
try: try:
package_name = 'weboob.backends.%s' % name package_name = 'weboob.backends.%s' % backend_name
backend = Backend(__import__(package_name, fromlist=[str(package_name)])) backend = Backend(__import__(package_name, fromlist=[str(package_name)]))
except ImportError, e: except ImportError, e:
msg = u'Unable to load backend "%s": %s' % (name, e) msg = u'Unable to load backend "%s": %s' % (backend_name, e)
if logging.root.level == logging.DEBUG: if logging.root.level == logging.DEBUG:
exception(msg) exception(msg)
return return
@ -186,7 +186,7 @@ class BackendsLoader(object):
error(msg) error(msg)
return return
if backend.name in self.loaded: if backend.name in self.loaded:
debug('Backend "%s" is already loaded from %s' % (name, backend.package.__path__[0])) debug('Backend "%s" is already loaded from %s' % (backend_name, backend.package.__path__[0]))
return return
self.loaded[backend.name] = backend self.loaded[backend.name] = backend
debug('Loaded backend "%s" from %s' % (name, backend.package.__path__[0])) debug('Loaded backend "%s" from %s' % (backend_name, backend.package.__path__[0]))