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

refactoring

Browse Source
This commit is contained in:
deadc0de6
2020-04-10 13:48:04 +02:00
parent 141caef07f
commit 79431e0976
1 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
dotdrop/cfg_yaml.py
View File

@@ -227,7 +227,7 @@ class CfgYaml:
self.log.dbg('dynvariables: {}'.format(self.ori_dvariables)) self.log.dbg('dynvariables: {}'.format(self.ori_dvariables))
def _resolve_dotfile_paths(self): def _resolve_dotfile_paths(self):
"""resolve dotfile paths""" """resolve dotfiles paths"""
t = Templategen(variables=self.variables, t = Templategen(variables=self.variables,
func_file=self.settings[Settings.key_func_file], func_file=self.settings[Settings.key_func_file],
filter_file=self.settings[Settings.key_filter_file]) filter_file=self.settings[Settings.key_filter_file])
@@ -235,29 +235,42 @@ class CfgYaml:
for dotfile in self.dotfiles.values(): for dotfile in self.dotfiles.values():
# src # src
src = dotfile[self.key_dotfile_src] src = dotfile[self.key_dotfile_src]
if not src: newsrc = self.resolve_dotfile_src(src, templater=t)
dotfile[self.key_dotfile_src] = '' dotfile[self.key_dotfile_src] = newsrc
else:
new = t.generate_string(src)
if new != src and self.debug:
msg = 'dotfile src: \"{}\" -> \"{}\"'.format(src, new)
self.log.dbg(msg)
src = new
src = os.path.join(self.settings[self.key_settings_dotpath],
src)
dotfile[self.key_dotfile_src] = self._norm_path(src)
# dst # dst
dst = dotfile[self.key_dotfile_dst] dst = dotfile[self.key_dotfile_dst]
if not dst: newdst = self.resolve_dotfile_dst(dst, templater=t)
dotfile[self.key_dotfile_dst] = '' dotfile[self.key_dotfile_dst] = newdst
else:
new = t.generate_string(dst) def resolve_dotfile_src(self, src, templater=None):
if new != dst and self.debug: """resolve dotfile src path"""
msg = 'dotfile dst: \"{}\" -> \"{}\"'.format(dst, new) newsrc = ''
self.log.dbg(msg) if src:
dst = new new = src
dotfile[self.key_dotfile_dst] = self._norm_path(dst) if templater:
new = templater.generate_string(src)
if new != src and self.debug:
msg = 'dotfile src: \"{}\" -> \"{}\"'.format(src, new)
self.log.dbg(msg)
src = new
src = os.path.join(self.settings[self.key_settings_dotpath],
src)
newsrc = self._norm_path(src)
return newsrc
def resolve_dotfile_dst(self, dst, templater=None):
"""resolve dotfile dst path"""
newdst = ''
if dst:
new = dst
if templater:
new = templater.generate_string(dst)
if new != dst and self.debug:
msg = 'dotfile dst: \"{}\" -> \"{}\"'.format(dst, new)
self.log.dbg(msg)
dst = new
newdst = self._norm_path(dst)
return newdst
def _rec_resolve_vars(self, variables): def _rec_resolve_vars(self, variables):
"""recursive resolve variables""" """recursive resolve variables"""