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

[core] add a datadir option to weboob init and handle WEBOOB_DATADIR

Browse source
This commit is contained in:
Bezleputh 2015-04-21 18:48:20 +02:00
commit e93d724ed1
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
weboob/core/ouiboube.py
View file

@ -323,6 +323,8 @@ class Weboob(WebNip):
:param workdir: optional parameter to set path of the working directory :param workdir: optional parameter to set path of the working directory
:type workdir: str :type workdir: str
:param datadir: optional parameter to set path of the data directory
:type datadir: str
:param backends_filename: name of the *backends* file, where configuration of :param backends_filename: name of the *backends* file, where configuration of
backends is stored backends is stored
:type backends_filename: str :type backends_filename: str
@ -331,23 +333,31 @@ class Weboob(WebNip):
""" """
BACKENDS_FILENAME = 'backends' BACKENDS_FILENAME = 'backends'
def __init__(self, workdir=None, backends_filename=None, scheduler=None, storage=None): def __init__(self, workdir=None, datadir=None, backends_filename=None, scheduler=None, storage=None):
super(Weboob, self).__init__(modules_path=False, scheduler=scheduler, storage=storage) super(Weboob, self).__init__(modules_path=False, scheduler=scheduler, storage=storage)
# Create WORKDIR # Create WORKDIR
if workdir is not None: if workdir is None:
datadir = workdir if 'WEBOOB_WORKDIR' in os.environ:
elif 'WEBOOB_WORKDIR' in os.environ: workdir = os.environ.get('WEBOOB_WORKDIR')
datadir = workdir = os.environ.get('WEBOOB_WORKDIR') else:
else: workdir = os.path.join(os.environ.get('XDG_CONFIG_HOME', os.path.join(os.path.expanduser('~'), '.config')), 'weboob')
workdir = os.path.join(os.environ.get('XDG_CONFIG_HOME', os.path.join(os.path.expanduser('~'), '.config')), 'weboob')
datadir = os.path.join(os.environ.get('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share')), 'weboob')
self.workdir = os.path.realpath(workdir) self.workdir = os.path.realpath(workdir)
self._create_dir(workdir) self._create_dir(workdir)
# Create DATADIR
if datadir is None:
if 'WEBOOB_DATADIR' in os.environ:
datadir = os.environ.get('WEBOOB_DATADIR')
else:
datadir = os.path.join(os.environ.get('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share')), 'weboob')
_datadir = os.path.realpath(datadir)
self._create_dir(_datadir)
# Modules management # Modules management
self.repositories = Repositories(workdir, datadir, self.VERSION) self.repositories = Repositories(workdir, _datadir, self.VERSION)
self.modules_loader = RepositoryModulesLoader(self.repositories) self.modules_loader = RepositoryModulesLoader(self.repositories)
# Backend instances config # Backend instances config