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

Fall back on WEBOOB_WORKDIR if there is no WEBOOB_DATADIR

Browse source
This commit is contained in:
Laurent Bachelier 2015-07-17 16:39:25 +02:00
commit 97675879b0
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
contrib/plugin.video.videoobmc/resources/lib/base/weboobmc.py
View file

@ -50,7 +50,9 @@ class Weboobmc():
def get_backend_icon(self, module): def get_backend_icon(self, module):
if 'WEBOOB_DATADIR' in os.environ: if 'WEBOOB_DATADIR' in os.environ:
datadir = os.environ.get('WEBOOB_DATADIR') datadir = os.environ['WEBOOB_DATADIR']
elif 'WEBOOB_WORKDIR' in os.environ:
datadir = os.environ['WEBOOB_WORKDIR']
else: else:
datadir = os.path.join(os.environ.get('XDG_DATA_HOME', datadir = os.path.join(os.environ.get('XDG_DATA_HOME',
os.path.join(os.path.expanduser('~'), '.local', 'share') os.path.join(os.path.expanduser('~'), '.local', 'share')

6
weboob/core/ouiboube.py
View file

@ -339,7 +339,7 @@ class Weboob(WebNip):
# Create WORKDIR # Create WORKDIR
if workdir is None: if workdir is None:
if 'WEBOOB_WORKDIR' in os.environ: if 'WEBOOB_WORKDIR' in os.environ:
workdir = os.environ.get('WEBOOB_WORKDIR') workdir = os.environ['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')
@ -349,7 +349,9 @@ class Weboob(WebNip):
# Create DATADIR # Create DATADIR
if datadir is None: if datadir is None:
if 'WEBOOB_DATADIR' in os.environ: if 'WEBOOB_DATADIR' in os.environ:
datadir = os.environ.get('WEBOOB_DATADIR') datadir = os.environ['WEBOOB_DATADIR']
elif 'WEBOOB_WORKDIR' in os.environ:
datadir = os.environ['WEBOOB_WORKDIR']
else: else:
datadir = os.path.join(os.environ.get('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share')), 'weboob') datadir = os.path.join(os.environ.get('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share')), 'weboob')