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

fix diff printing

Browse Source
This commit is contained in:
deadc0de6
2020-10-09 23:05:08 +02:00
parent bcfa934c5d
commit 1f45334e03
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dotdrop/installer.py
View File

@@ -165,7 +165,7 @@ class Installer:
def link_children(self, templater, src, dst, actionexec=None, def link_children(self, templater, src, dst, actionexec=None,
template=True): template=True):
""" """
link all dotfiles in a given directory link all files under 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
@@ -477,10 +477,12 @@ class Installer:
self.log.dbg('change detected for {}'.format(dst)) self.log.dbg('change detected for {}'.format(dst))
if self.showdiff: if self.showdiff:
if diff is None: if diff is None:
# get diff
diff = self._diff_before_write(src, dst, diff = self._diff_before_write(src, dst,
content=content, content=content,
quiet=True) quiet=True)
self._print_diff(src, dst, diff) if diff:
self._print_diff(src, dst, diff)
if not self.log.ask('Overwrite \"{}\"'.format(dst)): if not self.log.ask('Overwrite \"{}\"'.format(dst)):
self.log.warn('ignoring {}'.format(dst)) self.log.warn('ignoring {}'.format(dst))
return 1, None return 1, None
@@ -523,7 +525,11 @@ class Installer:
return 0, None return 0, None
def _diff_before_write(self, src, dst, content=None, quiet=False): def _diff_before_write(self, src, dst, content=None, quiet=False):
"""diff before writing""" """
diff before writing
using a temp file if content is not None
returns diff string ('' if same)
"""
tmp = None tmp = None
if content: if content:
tmp = utils.write_to_tmpfile(content) tmp = utils.write_to_tmpfile(content)
@@ -533,11 +539,12 @@ class Installer:
if tmp: if tmp:
utils.remove(tmp, quiet=True) utils.remove(tmp, quiet=True)
if not quiet: if not quiet and diff:
self._print_diff(src, dst, diff) self._print_diff(src, dst, diff)
return diff return diff
def _print_diff(self, src, dst, diff): def _print_diff(self, src, dst, diff):
"""show diff to user"""
self.log.log('diff \"{}\" VS \"{}\"'.format(dst, src)) self.log.log('diff \"{}\" VS \"{}\"'.format(dst, src))
self.log.emph(diff) self.log.emph(diff)