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

fix bug for #86

Browse Source
This commit is contained in:
deadc0de6
2019-02-11 14:11:05 +01:00
parent 88c730157d
commit 7876dd3d41
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dotdrop/comparator.py
View File

@@ -32,11 +32,15 @@ class Comparator:
self.log.dbg('comparing {} and {}'.format(left, right)) self.log.dbg('comparing {} and {}'.format(left, right))
self.log.dbg('ignore pattern(s): {}'.format(ignore)) self.log.dbg('ignore pattern(s): {}'.format(ignore))
if not os.path.isdir(left): if not os.path.isdir(left):
if self.debug:
self.log.dbg('is file')
return self._comp_file(left, right, ignore) return self._comp_file(left, right, ignore)
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):
"""compare a file""" """compare a file"""
if self.debug:
self.log.dbg('compare file {} with {}'.format(left, right))
if utils.must_ignore([left, right], ignore, debug=self.debug): if utils.must_ignore([left, right], ignore, debug=self.debug):
if self.debug: if self.debug:
self.log.dbg('ignoring diff {} and {}'.format(left, right)) self.log.dbg('ignoring diff {} and {}'.format(left, right))
@@ -45,6 +49,8 @@ class Comparator:
def _comp_dir(self, left, right, ignore): def _comp_dir(self, left, right, ignore):
"""compare a directory""" """compare a directory"""
if self.debug:
self.log.dbg('compare directory {} with {}'.format(left, right))
if not os.path.exists(right): if not os.path.exists(right):
return '' return ''
if utils.must_ignore([left, right], ignore, debug=self.debug): if utils.must_ignore([left, right], ignore, debug=self.debug):
@@ -61,6 +67,7 @@ class Comparator:
ignore, debug=self.debug): ignore, debug=self.debug):
continue continue
ret.append('=> \"{}\" does not exist on local\n'.format(i)) ret.append('=> \"{}\" does not exist on local\n'.format(i))
# handle files only in dotpath file
for i in comp.right_only: for i in comp.right_only:
if utils.must_ignore([os.path.join(right, i)], if utils.must_ignore([os.path.join(right, i)],
ignore, debug=self.debug): ignore, debug=self.debug):
@@ -86,6 +93,12 @@ class Comparator:
diff = self._diff(lfile, rfile, header=True) diff = self._diff(lfile, rfile, header=True)
ret.append(diff) ret.append(diff)
# recursively compare subdirs
for i in comp.common_dirs:
subleft = os.path.join(left, i)
subright = os.path.join(right, i)
ret.extend(self._comp_dir(subleft, subright, ignore))
return ''.join(ret) return ''.join(ret)
def _diff(self, left, right, header=False): def _diff(self, left, right, header=False):