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

properly handle compare dir and file

Browse Source
This commit is contained in:
deadc0de6
2019-03-03 13:56:54 +01:00
parent b592fc8448
commit d3ba86fe5d
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dotdrop/comparator.py
View File

@@ -35,6 +35,8 @@ class Comparator:
if self.debug: if self.debug:
self.log.dbg('is file') self.log.dbg('is file')
return self._comp_file(left, right, ignore) return self._comp_file(left, right, ignore)
if self.debug:
self.log.dbg('is directory')
return self._comp_dir(left, right, ignore) return self._comp_dir(left, right, ignore)
def _comp_file(self, left, right, ignore): def _comp_file(self, left, right, ignore):
@@ -57,6 +59,8 @@ class Comparator:
if self.debug: if self.debug:
self.log.dbg('ignoring diff {} and {}'.format(left, right)) self.log.dbg('ignoring diff {} and {}'.format(left, right))
return '' return ''
if not os.path.isdir(right):
return '\"{}\" is a file\n'.format(right)
if self.debug: if self.debug:
self.log.dbg('compare {} and {}'.format(left, right)) self.log.dbg('compare {} and {}'.format(left, right))
ret = [] ret = []
@@ -83,7 +87,7 @@ class Comparator:
rfile = os.path.join(right, i) rfile = os.path.join(right, i)
short = os.path.basename(lfile) short = os.path.basename(lfile)
# file vs dir # file vs dir
ret.append('different type: \"{}\"\n'.format(short)) ret.append('=> different type: \"{}\"\n'.format(short))
# content is different # content is different
funny = comp.diff_files funny = comp.diff_files

4
dotdrop/installer.py
View File

@@ -64,9 +64,11 @@ class Installer:
# symlink loop # symlink loop
self.log.err('dotfile points to itself: {}'.format(dst)) self.log.err('dotfile points to itself: {}'.format(dst))
return [] return []
isdir = os.path.isdir(src)
if self.debug: if self.debug:
self.log.dbg('install {} to {}'.format(src, dst)) self.log.dbg('install {} to {}'.format(src, dst))
if os.path.isdir(src): self.log.dbg('is \"{}\" a directory: {}'.format(src, isdir))
if isdir:
return self._handle_dir(templater, src, dst, actions=actions, return self._handle_dir(templater, src, dst, actions=actions,
noempty=noempty) noempty=noempty)
return self._handle_file(templater, src, dst, return self._handle_file(templater, src, dst,