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

implement notemplate for install

Browse Source
This commit is contained in:
deadc0de6
2020-10-09 20:13:16 +02:00
parent 4b0fb64679
commit 4a74e71bb7
4 changed files with 94 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dotdrop/cfg_yaml.py
View File

@@ -603,6 +603,7 @@ class CfgYaml:
if self.key_dotfile_notemplate not in v: if self.key_dotfile_notemplate not in v:
val = self.settings.get(self.key_settings_notemplate, False) val = self.settings.get(self.key_settings_notemplate, False)
v[self.key_dotfile_notemplate] = val v[self.key_dotfile_notemplate] = val
return new return new
def _add_variables(self, new, shell=False, template=True, prio=False): def _add_variables(self, new, shell=False, template=True, prio=False):

12
dotdrop/dotdrop.py
View File

@@ -129,11 +129,13 @@ def cmd_install(o):
LOG.dbg(dotfile.prt()) LOG.dbg(dotfile.prt())
if hasattr(dotfile, 'link') and dotfile.link == LinkTypes.LINK: if hasattr(dotfile, 'link') and dotfile.link == LinkTypes.LINK:
r, err = inst.link(t, dotfile.src, dotfile.dst, r, err = inst.link(t, dotfile.src, dotfile.dst,
actionexec=pre_actions_exec) actionexec=pre_actions_exec,
notemplate=dotfile.notemplate)
elif hasattr(dotfile, 'link') and \ elif hasattr(dotfile, 'link') and \
dotfile.link == LinkTypes.LINK_CHILDREN: dotfile.link == LinkTypes.LINK_CHILDREN:
r, err = inst.link_children(t, dotfile.src, dotfile.dst, r, err = inst.link_children(t, dotfile.src, dotfile.dst,
actionexec=pre_actions_exec) actionexec=pre_actions_exec,
notemplate=dotfile.notemplate)
else: else:
src = dotfile.src src = dotfile.src
tmp = None tmp = None
@@ -147,7 +149,8 @@ def cmd_install(o):
r, err = inst.install(t, src, dotfile.dst, r, err = inst.install(t, src, dotfile.dst,
actionexec=pre_actions_exec, actionexec=pre_actions_exec,
noempty=dotfile.noempty, noempty=dotfile.noempty,
ignore=ignores) ignore=ignores,
notemplate=dotfile.notemplate)
if tmp: if tmp:
tmp = os.path.join(o.dotpath, tmp) tmp = os.path.join(o.dotpath, tmp)
if os.path.exists(tmp): if os.path.exists(tmp):
@@ -264,7 +267,8 @@ def cmd_compare(o, tmp):
continue continue
# install dotfile to temporary dir and compare # install dotfile to temporary dir and compare
ret, err, insttmp = inst.install_to_temp(t, tmp, src, dotfile.dst) ret, err, insttmp = inst.install_to_temp(t, tmp, src, dotfile.dst,
notemplate=dotfile.notemplate)
if not ret: if not ret:
# failed to install to tmp # failed to install to tmp
line = '=> compare {}: error' line = '=> compare {}: error'

9
dotdrop/dotfile.py
View File

@@ -99,7 +99,6 @@ class Dotfile(DictParser):
value.pop(cls.key_noempty, None) value.pop(cls.key_noempty, None)
value.pop(cls.key_trans_r, None) value.pop(cls.key_trans_r, None)
value.pop(cls.key_trans_w, None) value.pop(cls.key_trans_w, None)
value.pop(cls.key_notemplate, None)
return value return value
def __eq__(self, other): def __eq__(self, other):
@@ -109,8 +108,12 @@ class Dotfile(DictParser):
return hash(self.dst) ^ hash(self.src) ^ hash(self.key) return hash(self.dst) ^ hash(self.src) ^ hash(self.key)
def __str__(self): def __str__(self):
msg = 'key:\"{}\", src:\"{}\", dst:\"{}\", link:\"{}\"' msg = 'key:\"{}\"'.format(self.key)
return msg.format(self.key, self.src, self.dst, str(self.link)) msg += ', src:\"{}\"'.format(self.src)
msg += ', dst:\"{}\"'.format(self.dst)
msg += ', link:\"{}\"'.format(str(self.link))
msg += ', template:{}'.format(not self.notemplate)
return msg
def prt(self): def prt(self):
"""extended dotfile to str""" """extended dotfile to str"""

124
dotdrop/installer.py
View File

@@ -7,6 +7,7 @@ handle the installation of dotfiles
import os import os
import errno import errno
import shutil
# local imports # local imports
from dotdrop.logger import Logger from dotdrop.logger import Logger
@@ -65,7 +66,7 @@ class Installer:
def install(self, templater, src, dst, def install(self, templater, src, dst,
actionexec=None, noempty=False, actionexec=None, noempty=False,
ignore=[]): ignore=[], notemplate=False):
""" """
install src to dst using a template install src to dst using a template
@templater: the templater object @templater: the templater object
@@ -74,6 +75,7 @@ class Installer:
@actionexec: action executor callback @actionexec: action executor callback
@noempty: render empty template flag @noempty: render empty template flag
@ignore: pattern to ignore when installing @ignore: pattern to ignore when installing
@notemplate: do not template
return return
- True, None : success - True, None : success
@@ -105,20 +107,23 @@ class Installer:
if isdir: if isdir:
b, e = self._install_dir(templater, src, dst, b, e = self._install_dir(templater, src, dst,
actionexec=actionexec, actionexec=actionexec,
noempty=noempty, ignore=ignore) noempty=noempty, ignore=ignore,
notemplate=notemplate)
return self._log_install(b, e) return self._log_install(b, e)
b, e = self._install_file(templater, src, dst, b, e = self._install_file(templater, src, dst,
actionexec=actionexec, actionexec=actionexec,
noempty=noempty, ignore=ignore) noempty=noempty, ignore=ignore,
notemplate=notemplate)
return self._log_install(b, e) return self._log_install(b, e)
def link(self, templater, src, dst, actionexec=None): def link(self, templater, src, dst, actionexec=None, notemplate=False):
""" """
set src as the link target of dst set src as the link target of dst
@templater: the templater @templater: the templater
@src: dotfile source path in dotpath @src: dotfile source path in dotpath
@dst: dotfile destination path in the FS @dst: dotfile destination path in the FS
@actionexec: action executor callback @actionexec: action executor callback
@notemplate: do no template
return return
- True, None : success - True, None : success
@@ -140,28 +145,32 @@ class Installer:
dst = os.path.normpath(os.path.expanduser(dst)) dst = os.path.normpath(os.path.expanduser(dst))
if self.totemp: if self.totemp:
# ignore actions # ignore actions
b, e = self.install(templater, src, dst, actionexec=None) b, e = self.install(templater, src, dst, actionexec=None,
notemplate=notemplate)
return self._log_install(b, e) return self._log_install(b, e)
if Templategen.is_template(src): if not notemplate and Templategen.is_template(src):
if self.debug: if self.debug:
self.log.dbg('dotfile is a template') self.log.dbg('dotfile is a template')
self.log.dbg('install to {} and symlink'.format(self.workdir)) self.log.dbg('install to {} and symlink'.format(self.workdir))
tmp = self._pivot_path(dst, self.workdir, striphome=True) tmp = self._pivot_path(dst, self.workdir, striphome=True)
i, err = self.install(templater, src, tmp, actionexec=actionexec) i, err = self.install(templater, src, tmp, actionexec=actionexec,
notemplate=notemplate)
if not i and not os.path.exists(tmp): if not i and not os.path.exists(tmp):
return self._log_install(i, err) return self._log_install(i, err)
src = tmp src = tmp
b, e = self._link(src, dst, actionexec=actionexec) b, e = self._link(src, dst, actionexec=actionexec)
return self._log_install(b, e) return self._log_install(b, e)
def link_children(self, templater, src, dst, actionexec=None): def link_children(self, templater, src, dst, actionexec=None,
notemplate=False):
""" """
link all dotfiles in a given directory link all dotfiles in a given directory
@templater: the templater @templater: the templater
@src: dotfile source path in dotpath @src: dotfile source path in dotpath
@dst: dotfile destination path in the FS @dst: dotfile destination path in the FS
@actionexec: action executor callback @actionexec: action executor callback
@notemplate: do not template
return return
- True, None: success - True, None: success
@@ -221,13 +230,14 @@ class Installer:
if self.debug: if self.debug:
self.log.dbg('symlink child {} to {}'.format(src, dst)) self.log.dbg('symlink child {} to {}'.format(src, dst))
if Templategen.is_template(src): if not notemplate and Templategen.is_template(src):
if self.debug: if self.debug:
self.log.dbg('dotfile is a template') self.log.dbg('dotfile is a template')
self.log.dbg('install to {} and symlink' self.log.dbg('install to {} and symlink'
.format(self.workdir)) .format(self.workdir))
tmp = self._pivot_path(dst, self.workdir, striphome=True) tmp = self._pivot_path(dst, self.workdir, striphome=True)
r, e = self.install(templater, src, tmp, actionexec=actionexec) r, e = self.install(templater, src, tmp, actionexec=actionexec,
notemplate=notemplate)
if not r and e and not os.path.exists(tmp): if not r and e and not os.path.exists(tmp):
continue continue
src = tmp src = tmp
@@ -308,12 +318,14 @@ class Installer:
def _install_file(self, templater, src, dst, def _install_file(self, templater, src, dst,
actionexec=None, noempty=False, actionexec=None, noempty=False,
ignore=[]): ignore=[], notemplate=False):
"""install src to dst when is a file""" """install src to dst when is a file"""
if self.debug: if self.debug:
self.log.dbg('generate template for {}'.format(src)) self.log.dbg('deploy file: {}'.format(src))
self.log.dbg('ignore empty: {}'.format(noempty)) self.log.dbg('ignore empty: {}'.format(noempty))
self.log.dbg('ignore pattern: {}'.format(ignore)) self.log.dbg('ignore pattern: {}'.format(ignore))
self.log.dbg('no template: {}'.format(notemplate))
self.log.dbg('no empty: {}'.format(noempty))
if utils.must_ignore([src, dst], ignore, debug=self.debug): if utils.must_ignore([src, dst], ignore, debug=self.debug):
if self.debug: if self.debug:
@@ -324,42 +336,60 @@ class Installer:
# symlink loop # symlink loop
err = 'dotfile points to itself: {}'.format(dst) err = 'dotfile points to itself: {}'.format(dst)
return False, err return False, err
saved = templater.add_tmp_vars(self._get_tmp_file_vars(src, dst))
try: # handle the file
content = templater.generate(src) if not notemplate:
except UndefinedException as e: # template the file
return False, str(e) saved = templater.add_tmp_vars(self._get_tmp_file_vars(src, dst))
finally: try:
templater.restore_vars(saved) content = templater.generate(src)
if noempty and utils.content_empty(content): except UndefinedException as e:
if self.debug: return False, str(e)
self.log.dbg('ignoring empty template: {}'.format(src)) finally:
return False, None templater.restore_vars(saved)
if content is None: if noempty and utils.content_empty(content):
err = 'empty template {}'.format(src) if self.debug:
return False, err self.log.dbg('ignoring empty template: {}'.format(src))
if not os.path.exists(src): return False, None
err = 'source dotfile does not exist: {}'.format(src) if content is None:
return False, err err = 'empty template {}'.format(src)
st = os.stat(src) return False, err
ret, err = self._write(src, dst, content, if not os.path.exists(src):
st.st_mode, actionexec=actionexec) err = 'source dotfile does not exist: {}'.format(src)
if ret < 0: return False, err
return False, err st = os.stat(src)
if ret > 0: ret, err = self._write(src, dst, content,
if self.debug: st.st_mode, actionexec=actionexec)
self.log.dbg('ignoring {}'.format(dst)) # build return values
return False, None if ret < 0:
# error
return False, err
if ret > 0:
# already exists
if self.debug:
self.log.dbg('ignoring {}'.format(dst))
return False, None
else:
# copy the file
try:
shutil.copyfile(src, dst)
shutil.copymode(src, dst)
except Exception as e:
return False, str(e)
ret = 0
if ret == 0: if ret == 0:
# success
if not self.dry and not self.comparing: if not self.dry and not self.comparing:
self.log.sub('copied {} to {}'.format(src, dst)) self.log.sub('copied {} to {}'.format(src, dst))
return True, None return True, None
# error
err = 'installing {} to {}'.format(src, dst) err = 'installing {} to {}'.format(src, dst)
return False, err return False, err
def _install_dir(self, templater, src, dst, def _install_dir(self, templater, src, dst,
actionexec=None, noempty=False, actionexec=None, noempty=False,
ignore=[]): ignore=[], notemplate=False):
"""install src to dst when is a directory""" """install src to dst when is a directory"""
if self.debug: if self.debug:
self.log.dbg('install dir {}'.format(src)) self.log.dbg('install dir {}'.format(src))
@@ -378,7 +408,8 @@ class Installer:
os.path.join(dst, entry), os.path.join(dst, entry),
actionexec=actionexec, actionexec=actionexec,
noempty=noempty, noempty=noempty,
ignore=ignore) ignore=ignore,
notemplate=notemplate)
if not res and err: if not res and err:
# error occured # error occured
ret = res, err ret = res, err
@@ -392,7 +423,8 @@ class Installer:
os.path.join(dst, entry), os.path.join(dst, entry),
actionexec=actionexec, actionexec=actionexec,
noempty=noempty, noempty=noempty,
ignore=ignore) ignore=ignore,
notemplate=notemplate)
if not res and err: if not res and err:
# error occured # error occured
ret = res, err ret = res, err
@@ -530,12 +562,13 @@ class Installer:
self.action_executed = True self.action_executed = True
return ret, err return ret, err
def _install_to_temp(self, templater, src, dst, tmpdir): def _install_to_temp(self, templater, src, dst, tmpdir, notemplate=False):
"""install a dotfile to a tempdir""" """install a dotfile to a tempdir"""
tmpdst = self._pivot_path(dst, tmpdir) tmpdst = self._pivot_path(dst, tmpdir)
return self.install(templater, src, tmpdst), tmpdst r = self.install(templater, src, tmpdst, notemplate=notemplate)
return r, tmpdst
def install_to_temp(self, templater, tmpdir, src, dst): def install_to_temp(self, templater, tmpdir, src, dst, notemplate=False):
"""install a dotfile to a tempdir""" """install a dotfile to a tempdir"""
ret = False ret = False
tmpdst = '' tmpdst = ''
@@ -553,7 +586,8 @@ class Installer:
if self.debug: if self.debug:
self.log.dbg('tmp install {} (defined dst: {})'.format(src, dst)) self.log.dbg('tmp install {} (defined dst: {})'.format(src, dst))
# install the dotfile to a temp directory for comparing # install the dotfile to a temp directory for comparing
r, tmpdst = self._install_to_temp(templater, src, dst, tmpdir) r, tmpdst = self._install_to_temp(templater, src, dst, tmpdir,
notemplate=notemplate)
ret, err = r ret, err = r
if self.debug: if self.debug:
self.log.dbg('tmp installed in {}'.format(tmpdst)) self.log.dbg('tmp installed in {}'.format(tmpdst))