rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle auto-config location properly with --basedir

Browse Source
This commit is contained in:
Florian Bruhin 2017-09-13 18:30:10 +02:00
parent 70a9a7e5c8
commit 718dd21573
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qutebrowser/utils/standarddir.py
View File

@ -32,7 +32,8 @@ from qutebrowser.utils import log, qtutils, debug, usertypes, message
_locations = {} _locations = {}
Location = usertypes.enum('Location', ['config', 'data', 'system_data', Location = usertypes.enum('Location', ['config', 'auto_config',
'data', 'system_data',
'cache', 'download', 'runtime']) 'cache', 'download', 'runtime'])
@ -58,10 +59,17 @@ def _init_config(args):
# https://bugreports.qt.io/browse/QTBUG-38872 # https://bugreports.qt.io/browse/QTBUG-38872
path = os.path.join(path, appname) path = os.path.join(path, appname)
_create(path) _create(path)
if sys.platform == 'darwin': # pragma: no cover
_create(os.path.expanduser('~/.qutebrowser'))
_locations[Location.config] = path _locations[Location.config] = path
# auto config
if sys.platform == 'darwin':
overridden, path = _from_args(typ, args)
_locations.pop(Location.auto_config, None) # Remove old state
if not overridden:
path = os.path.expanduser('~/.qutebrowser')
_create(path)
_locations[Location.auto_config] = path
def config(auto=False): def config(auto=False):
"""Get the location for the config directory. """Get the location for the config directory.
@ -69,8 +77,11 @@ def config(auto=False):
If auto=True is given, get the location for the autoconfig.yml directory, If auto=True is given, get the location for the autoconfig.yml directory,
which is different on macOS. which is different on macOS.
""" """
if auto and sys.platform == 'darwin': if auto:
return os.path.expanduser('~/.qutebrowser') try:
return _locations[Location.auto_config]
except KeyError:
pass
return _locations[Location.config] return _locations[Location.config]