mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-09 01:24:16 +00:00
Code Activity

fix merging

Browse Source
This commit is contained in:
deadc0de6
2018-09-25 07:27:38 +02:00
parent 61eb611dc0 ef58a44fc0
commit dc6cc860b6
7 changed files with 377 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dotdrop/action.py
View File

@@ -32,12 +32,23 @@ class Cmd:
class Action(Cmd):
def __init__(self, key, action, *args):
super(Action, self).__init__(key, action)
self.args = args
def execute(self):
"""execute the action in the shell"""
ret = 1
self.log.sub('executing \"{}\"'.format(self.action))
try:
ret = subprocess.call(self.action, shell=True)
cmd = self.action.format(*self.args)
except IndexError:
err = 'bad action: \"{}\"'.format(self.action)
err += ' with \"{}\"'.format(self.args)
self.log.warn(err)
return False
self.log.sub('executing \"{}\"'.format(cmd))
try:
ret = subprocess.call(cmd, shell=True)
except KeyboardInterrupt:
self.log.warn('action interrupted')
return ret == 0

20
dotdrop/config.py
View File

@@ -7,6 +7,7 @@ yaml config file manager
import yaml
import os
import shlex
# local import
from dotdrop.dotfile import Dotfile
@@ -258,16 +259,29 @@ class Cfg:
self.key_actions_pre: [],
self.key_actions_post: [],
}
for entry in entries:
for line in entries:
fields = shlex.split(line)
entry = fields[0]
args = []
if len(fields) > 1:
args = fields[1:]
action = None
if self.key_actions_pre in self.actions and \
entry in self.actions[self.key_actions_pre]:
key = self.key_actions_pre
action = self.actions[self.key_actions_pre][entry]
if not args:
action = self.actions[self.key_actions_pre][entry]
else:
a = self.actions[self.key_actions_pre][entry].action
action = Action(key, a, *args)
elif self.key_actions_post in self.actions and \
entry in self.actions[self.key_actions_post]:
key = self.key_actions_post
action = self.actions[self.key_actions_post][entry]
if not args:
action = self.actions[self.key_actions_post][entry]
else:
a = self.actions[self.key_actions_post][entry].action
action = Action(key, a, *args)
else:
self.log.warn('unknown action \"{}\"'.format(entry))
continue

12
dotdrop/dotdrop.py
View File

@@ -93,18 +93,14 @@ def install(opts, conf, temporary=False):
debug=opts['debug'], totemp=tmpdir)
installed = []
for dotfile in dotfiles:
preactions = []
if dotfile.actions and Cfg.key_actions_pre in dotfile.actions:
for action in dotfile.actions[Cfg.key_actions_pre]:
if opts['dry']:
LOG.dry('would execute action: {}'.format(action))
else:
if opts['debug']:
LOG.dbg('executing pre action {}'.format(action))
action.execute()
preactions.append(action)
if opts['debug']:
LOG.dbg('installing {}'.format(dotfile))
if hasattr(dotfile, 'link') and dotfile.link:
r = inst.link(t, dotfile.src, dotfile.dst)
r = inst.link(t, dotfile.src, dotfile.dst, actions=preactions)
else:
src = dotfile.src
tmp = None
@@ -113,7 +109,7 @@ def install(opts, conf, temporary=False):
if not tmp:
continue
src = tmp
r = inst.install(t, src, dotfile.dst)
r = inst.install(t, src, dotfile.dst, actions=preactions)
if tmp:
tmp = os.path.join(opts['dotpath'], tmp)
if os.path.exists(tmp):

52
dotdrop/installer.py
View File

@@ -31,10 +31,12 @@ class Installer:
self.diff = diff
self.totemp = totemp
self.comparing = False
self.action_executed = False
self.log = Logger()
def install(self, templater, src, dst):
def install(self, templater, src, dst, actions=[]):
"""install the src to dst using a template"""
self.action_executed = False
src = os.path.join(self.base, os.path.expanduser(src))
if not os.path.exists(src):
self.log.err('source dotfile does not exist: {}'.format(src))
@@ -48,30 +50,32 @@ class Installer:
if self.debug:
self.log.dbg('install {} to {}'.format(src, dst))
if os.path.isdir(src):
return self._handle_dir(templater, src, dst)
return self._handle_file(templater, src, dst)
return self._handle_dir(templater, src, dst, actions=actions)
return self._handle_file(templater, src, dst, actions=actions)
def link(self, templater, src, dst):
def link(self, templater, src, dst, actions=[]):
"""set src as the link target of dst"""
self.action_executed = False
src = os.path.join(self.base, os.path.expanduser(src))
if not os.path.exists(src):
self.log.err('source dotfile does not exist: {}'.format(src))
dst = os.path.expanduser(dst)
if self.totemp:
return self.install(templater, src, dst)
# ignore actions
return self.install(templater, src, dst, actions=[])
if Templategen.is_template(src):
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)
i = self.install(templater, src, tmp)
i = self.install(templater, src, tmp, actions=actions)
if not i and not os.path.exists(tmp):
return []
src = tmp
return self._link(src, dst)
return self._link(src, dst, actions=actions)
def _link(self, src, dst):
def _link(self, src, dst, actions=[]):
"""set src as a link target of dst"""
if os.path.lexists(dst):
if os.path.realpath(dst) == os.path.realpath(src):
@@ -98,11 +102,12 @@ class Installer:
if not self._create_dirs(base):
self.log.err('creating directory for \"{}\"'.format(dst))
return []
self._exec_pre_actions(actions)
os.symlink(src, dst)
self.log.sub('linked \"{}\" to \"{}\"'.format(dst, src))
return [(src, dst)]
def _handle_file(self, templater, src, dst):
def _handle_file(self, templater, src, dst, actions=[]):
"""install src to dst when is a file"""
if self.debug:
self.log.dbg('generate template for {}'.format(src))
@@ -118,7 +123,7 @@ class Installer:
self.log.err('source dotfile does not exist: \"{}\"'.format(src))
return []
st = os.stat(src)
ret = self._write(dst, content, st.st_mode)
ret = self._write(dst, content, st.st_mode, actions=actions)
if ret < 0:
self.log.err('installing \"{}\" to \"{}\"'.format(src, dst))
return []
@@ -132,18 +137,21 @@ class Installer:
return [(src, dst)]
return []
def _handle_dir(self, templater, src, dst):
def _handle_dir(self, templater, src, dst, actions=[]):
"""install src to dst when is a directory"""
ret = []
self._create_dirs(dst)
if not self._create_dirs(dst):
return []
# handle all files in dir
for entry in os.listdir(src):
f = os.path.join(src, entry)
if not os.path.isdir(f):
res = self._handle_file(templater, f, os.path.join(dst, entry))
res = self._handle_file(templater, f, os.path.join(dst, entry),
actions=actions)
ret.extend(res)
else:
res = self._handle_dir(templater, f, os.path.join(dst, entry))
res = self._handle_dir(templater, f, os.path.join(dst, entry),
actions=actions)
ret.extend(res)
return ret
@@ -154,7 +162,7 @@ class Installer:
cur = f.read()
return cur == content
def _write(self, dst, content, rights):
def _write(self, dst, content, rights, actions=[]):
"""write content to file
return 0 for success,
1 when already exists
@@ -179,6 +187,7 @@ class Installer:
return -1
if self.debug:
self.log.dbg('write content to {}'.format(dst))
self._exec_pre_actions(actions)
try:
with open(dst, 'wb') as f:
f.write(content)
@@ -218,6 +227,19 @@ class Installer:
sub = path.lstrip(os.sep)
return os.path.join(newdir, sub)
def _exec_pre_actions(self, actions):
"""execute pre-actions if any"""
if self.action_executed:
return
for action in actions:
if self.dry:
self.log.dry('would execute action: {}'.format(action))
else:
if self.debug:
self.log.dbg('executing pre action {}'.format(action))
action.execute()
self.action_executed = True
def _install_to_temp(self, templater, src, dst, tmpdir):
"""install a dotfile to a tempdir"""
tmpdst = self._pivot_path(dst, tmpdir)