mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-08 17:14:18 +00:00
Code Activity

add src=key for dotfile if not present (for #150)

Browse Source
This commit is contained in:
deadc0de6
2019-05-31 20:31:24 +02:00
parent 806b4690b2
commit 8f8c39ce9c
2 changed files with 113 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dotdrop/cfg_yaml.py
View File

@@ -103,6 +103,7 @@ class CfgYaml:
# dotfiles
self.dotfiles = self._get_entry(self.yaml_dict, self.key_dotfiles)
self.dotfiles = self._norm_dotfiles(self.dotfiles)
if self.debug:
self.log.dbg('dotfiles: {}'.format(self.dotfiles))
@@ -114,7 +115,7 @@ class CfgYaml:
# actions
self.actions = self._get_entry(self.yaml_dict, self.key_actions,
mandatory=False)
self.actions = self._patch_actions(self.actions)
self.actions = self._norm_actions(self.actions)
if self.debug:
self.log.dbg('actions: {}'.format(self.actions))
@@ -246,7 +247,7 @@ class CfgYaml:
return allvars
def _patch_actions(self, actions):
def _norm_actions(self, actions):
"""
ensure each action is either pre or post explicitely
action entry of the form {action_key: (pre|post, action)}
@@ -262,6 +263,19 @@ class CfgYaml:
new[k] = (self.action_pre, v)
return new
def _norm_dotfiles(self, dotfiles):
"""add 'src' as 'key if not present"""
if not dotfiles:
return dotfiles
new = {}
for k, v in dotfiles.items():
if self.key_dotfile_src not in v:
v[self.key_dotfile_src] = k
new[k] = v
else:
new[k] = v
return new
def _get_variables_dict(self, profile, seen, sub=False):
"""return enriched variables"""
variables = {}
@@ -352,7 +366,7 @@ class CfgYaml:
self.log.dbg('import actions from {}'.format(path))
self.actions = self._import_sub(path, self.key_actions,
self.actions, mandatory=False,
patch_func=self._patch_actions)
patch_func=self._norm_actions)
# profiles -> import
for k, v in self.profiles.items():
@@ -365,7 +379,8 @@ class CfgYaml:
current = v.get(self.key_dotfiles, [])
path = self.resolve_path(p)
current = self._import_sub(path, self.key_dotfiles,
current, mandatory=False)
current, mandatory=False,
path_func=self._norm_dotfiles)
v[self.key_dotfiles] = current
def _resolve_import_configs(self):