mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-05 15:33:54 +00:00
Code Activity

add func_file and filter_file for the config (for #210)

Browse Source
This commit is contained in:
deadc0de6
2020-02-15 13:05:17 +01:00
parent b56e8ea00b
commit fb071321e9
3 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dotdrop/cfg_yaml.py
View File

@@ -23,7 +23,7 @@ from dotdrop.exceptions import YamlException
class CfgYaml:
# global entries
key_settings = 'config'
key_settings = Settings.key_yaml
key_dotfiles = 'dotfiles'
key_profiles = 'profiles'
key_actions = 'actions'
@@ -61,12 +61,12 @@ class CfgYaml:
key_import_ignore_key = 'optional'
# settings
key_settings_dotpath = 'dotpath'
key_settings_workdir = 'workdir'
key_settings_link_dotfile_default = 'link_dotfile_default'
key_settings_noempty = 'ignoreempty'
key_settings_minversion = 'minversion'
key_imp_link = 'link_on_import'
key_settings_dotpath = Settings.key_dotpath
key_settings_workdir = Settings.key_workdir
key_settings_link_dotfile_default = Settings.key_link_dotfile_default
key_settings_noempty = Settings.key_ignoreempty
key_settings_minversion = Settings.key_minversion
key_imp_link = Settings.key_link_on_import
# link values
lnk_nolink = LinkTypes.NOLINK.name.lower()
@@ -216,7 +216,9 @@ class CfgYaml:
def _resolve_dotfile_paths(self):
"""resolve dotfile paths"""
t = Templategen(variables=self.variables)
t = Templategen(variables=self.variables,
func_file=self.settings[Settings.key_func_file],
filter_file=self.settings[Settings.key_filter_file])
for dotfile in self.dotfiles.values():
# src
@@ -248,7 +250,9 @@ class CfgYaml:
def _rec_resolve_vars(self, variables):
"""recursive resolve variables"""
default = self._get_variables_dict(self.profile)
t = Templategen(variables=self._merge_dict(default, variables))
t = Templategen(variables=self._merge_dict(default, variables),
func_file=self.settings[Settings.key_func_file],
filter_file=self.settings[Settings.key_filter_file])
for k in variables.keys():
val = variables[k]
while Templategen.var_is_template(val):
@@ -284,7 +288,10 @@ class CfgYaml:
self._debug_vars(merged)
# resolve profile includes
t = Templategen(variables=merged)
t = Templategen(variables=merged,
func_file=self.settings[Settings.key_func_file],
filter_file=self.settings[Settings.key_filter_file])
for k, v in self.profiles.items():
if self.key_profile_include in v:
new = []
@@ -314,7 +321,9 @@ class CfgYaml:
def _apply_variables(self):
"""template any needed parts of the config"""
t = Templategen(variables=self.variables)
t = Templategen(variables=self.variables,
func_file=self.settings[Settings.key_func_file],
filter_file=self.settings[Settings.key_filter_file])
# import_actions
new = []