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

handle symlink of templates through working directory

Browse Source
This commit is contained in:
deadc0de6
2018-09-02 14:35:14 +02:00
parent 401c9a2d0c
commit 37d676d22d
7 changed files with 135 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dotdrop/config.py
View File

@@ -29,6 +29,7 @@ class Cfg:
key_long = 'longkey'
key_keepdot = 'keepdot'
key_deflink = 'link_by_default'
key_workdir = 'workdir'
# actions keys
key_actions = 'actions'
@@ -62,6 +63,7 @@ class Cfg:
default_longkey = False
default_keepdot = False
default_link_by_default = False
default_workdir = '~/.config/dotdrop'
def __init__(self, cfgpath):
if not os.path.exists(cfgpath):
@@ -295,6 +297,8 @@ class Cfg:
self.lnk_settings[self.key_keepdot] = self.default_keepdot
if self.key_deflink not in self.lnk_settings:
self.lnk_settings[self.key_deflink] = self.default_link_by_default
if self.key_workdir not in self.lnk_settings:
self.lnk_settings[self.key_workdir] = self.default_workdir
def abs_dotpath(self, path):
"""transform path to an absolute path based on config path"""

7
dotdrop/dotdrop.py
View File

@@ -85,7 +85,8 @@ def install(opts, conf):
variables=opts['variables'], debug=opts['debug'])
inst = Installer(create=opts['create'], backup=opts['backup'],
dry=opts['dry'], safe=opts['safe'], base=opts['dotpath'],
diff=opts['installdiff'], debug=opts['debug'])
workdir=opts['workdir'], diff=opts['installdiff'],
debug=opts['debug'])
installed = []
for dotfile in dotfiles:
if dotfile.actions and Cfg.key_actions_pre in dotfile.actions:
@@ -99,7 +100,7 @@ def install(opts, conf):
if opts['debug']:
LOG.dbg('installing {}'.format(dotfile))
if hasattr(dotfile, 'link') and dotfile.link:
r = inst.link(dotfile.src, dotfile.dst)
r = inst.link(t, dotfile.src, dotfile.dst)
else:
src = dotfile.src
tmp = None
@@ -189,7 +190,7 @@ def compare(opts, conf, tmp, focus=None, ignore=[]):
variables=opts['variables'], debug=opts['debug'])
inst = Installer(create=opts['create'], backup=opts['backup'],
dry=opts['dry'], base=opts['dotpath'],
debug=opts['debug'])
workdir=opts['workdir'], debug=opts['debug'])
comp = Comparator(diffopts=opts['dopts'], debug=opts['debug'],
ignore=ignore)

53
dotdrop/installer.py
View File

@@ -17,28 +17,25 @@ import dotdrop.utils as utils
class Installer:
BACKUP_SUFFIX = '.dotdropbak'
# TODO get this from the config file with a default
DOTDROP_WORK = '{}/.config/dotdrop'.format(os.path.expanduser('~'))
def __init__(self, base='.', create=True, backup=True,
dry=False, safe=False, debug=False, diff=True):
dry=False, safe=False, workdir='~/.config/dotdrop',
debug=False, diff=True):
self.create = create
self.backup = backup
self.dry = dry
self.safe = safe
self.workdir = os.path.expanduser(workdir)
self.base = base
self.debug = debug
self.diff = diff
self.comparing = False
self.log = Logger()
def _dotdrop_work(self):
os.makedirs(self.DOTDROP_WORK, exist_ok=True)
def install(self, templater, src, dst):
"""install the src to dst using a template"""
src = os.path.join(self.base, os.path.expanduser(src))
dst = os.path.join(self.base, os.path.expanduser(dst))
dst = os.path.expanduser(dst)
if utils.samefile(src, dst):
# symlink loop
self.log.err('dotfile points to itself: {}'.format(dst))
@@ -49,22 +46,19 @@ class Installer:
return self._handle_dir(templater, src, dst)
return self._handle_file(templater, src, dst)
def link(self, src, dst):
def link(self, templater, src, dst):
"""set src as the link target of dst"""
src = os.path.join(self.base, os.path.expanduser(src))
dst = os.path.join(self.base, os.path.expanduser(dst))
dst = os.path.expanduser(dst)
if Templategen.is_template(src):
# TODO
# first make sure the template is generated in the working dir
# if it's not generate it
# and then symlink it as any other file
# by udating src and dst
return []
# is not a template
if self.debug:
self.log.dbg('dotfile is a template')
self.log.dbg('install to {} and symlink'.format(self.workdir))
tmp = self._pivot_path(dst, self.workdir, striphome=True)
if not self.install(templater, src, tmp):
return []
src = tmp
return self._link(src, dst)
def _link(self, src, dst):
@@ -95,7 +89,7 @@ class Installer:
self.log.err('creating directory for \"{}\"'.format(dst))
return []
os.symlink(src, dst)
self.log.sub('linked {} to {}'.format(dst, src))
self.log.sub('linked \"{}\" to \"{}\"'.format(dst, src))
return [(src, dst)]
def _handle_file(self, templater, src, dst):
@@ -206,19 +200,24 @@ class Installer:
self.log.log('backup {} to {}'.format(path, dst))
os.rename(path, dst)
def _pivot_path(self, path, newdir, striphome=False):
"""change path to be under newdir"""
if striphome:
home = os.path.expanduser('~')
path = path.lstrip(home)
sub = path.lstrip(os.sep)
return os.path.join(newdir, sub)
def _install_to_temp(self, templater, src, dst, tmpdir):
"""install a dotfile to a tempdir for comparing"""
sub = dst
if dst[0] == os.sep:
sub = dst[1:]
tmpdst = os.path.join(tmpdir, sub)
"""install a dotfile to a tempdir"""
tmpdst = self._pivot_path(dst, tmpdir)
return self.install(templater, src, tmpdst), tmpdst
def install_to_temp(self, templater, tmpdir, src, dst):
"""compare a temporary generated dotfile with the local one"""
"""install a dotfile to a tempdir"""
ret = False
tmpdst = ''
# saved some flags while comparing
# save some flags while comparing
self.comparing = True
drysaved = self.dry
self.dry = False