mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-16 07:11:10 +00:00
Code Activity

handle toml config file for #356

Browse Source
This commit is contained in:
deadc0de6
2022-06-25 14:57:51 +02:00
parent e0eb12bbd5
commit da272553e0
1 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
dotdrop/options.py
View File

@@ -36,7 +36,8 @@ if ENV_PROFILE in os.environ:
PROFILE = os.environ[ENV_PROFILE] PROFILE = os.environ[ENV_PROFILE]
NAME = 'dotdrop' NAME = 'dotdrop'
CONFIG = 'config.yaml' CONFIGFILEYAML = 'config.yaml'
CONFIGFILETOML = 'config.toml'
HOMECFG = '~/.config/{}'.format(NAME) HOMECFG = '~/.config/{}'.format(NAME)
ETCXDGCFG = '/etc/xdg/{}'.format(NAME) ETCXDGCFG = '/etc/xdg/{}'.format(NAME)
ETCCFG = '/etc/{}'.format(NAME) ETCCFG = '/etc/{}'.format(NAME)
@@ -157,6 +158,9 @@ class Options(AttrMonitor):
self.confpath = self._get_config_path() self.confpath = self._get_config_path()
if not self.confpath: if not self.confpath:
raise YamlException('no config file found') raise YamlException('no config file found')
if not os.path.exists(self.confpath):
err = 'bad config file path: {}'.format(self.confpath)
raise YamlException(err)
self.log.dbg('#################################################') self.log.dbg('#################################################')
self.log.dbg('#################### DOTDROP ####################') self.log.dbg('#################### DOTDROP ####################')
self.log.dbg('#################################################') self.log.dbg('#################################################')
@@ -176,21 +180,31 @@ class Options(AttrMonitor):
self._set_attr_err = True self._set_attr_err = True
@classmethod @classmethod
def _get_config_from_fs(cls): def _get_config_from_env(cls, name):
# look in XDG_CONFIG_HOME
if ENV_XDG in os.environ:
cfg = os.path.expanduser(os.environ[ENV_XDG])
path = os.path.join(cfg, NAME, name)
if os.path.exists(path):
return path
return ''
@classmethod
def _get_config_from_fs(cls, name):
"""get config from filesystem""" """get config from filesystem"""
# look in ~/.config/dotdrop # look in ~/.config/dotdrop
cfg = os.path.expanduser(HOMECFG) cfg = os.path.expanduser(HOMECFG)
path = os.path.join(cfg, CONFIG) path = os.path.join(cfg, name)
if os.path.exists(path): if os.path.exists(path):
return path return path
# look in /etc/xdg/dotdrop # look in /etc/xdg/dotdrop
path = os.path.join(ETCXDGCFG, CONFIG) path = os.path.join(ETCXDGCFG, name)
if os.path.exists(path): if os.path.exists(path):
return path return path
# look in /etc/dotdrop # look in /etc/dotdrop
path = os.path.join(ETCCFG, CONFIG) path = os.path.join(ETCCFG, name)
if os.path.exists(path): if os.path.exists(path):
return path return path
@@ -207,17 +221,30 @@ class Options(AttrMonitor):
return os.path.expanduser(os.environ[ENV_CONFIG]) return os.path.expanduser(os.environ[ENV_CONFIG])
# look in current directory # look in current directory
if os.path.exists(CONFIG): if os.path.exists(CONFIGFILEYAML):
return CONFIG return CONFIGFILEYAML
# look in XDG_CONFIG_HOME # look in current directory
if ENV_XDG in os.environ: if os.path.exists(CONFIGFILETOML):
cfg = os.path.expanduser(os.environ[ENV_XDG]) return CONFIGFILETOML
path = os.path.join(cfg, NAME, CONFIG)
if os.path.exists(path): path = self._get_config_from_env(CONFIGFILEYAML)
if path:
return path return path
return self._get_config_from_fs() path = self._get_config_from_env(CONFIGFILETOML)
if path:
return path
path = self._get_config_from_fs(CONFIGFILEYAML)
if path:
return path
path = self._get_config_from_fs(CONFIGFILETOML)
if path:
return path
return None
def _header(self): def _header(self):
"""display the header""" """display the header"""