mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-06 18:55:38 +00:00
Code Activity

Actually ignore missing files on update

Browse Source
This commit is contained in:
Marcel Robitaille
2021-02-06 22:38:27 -05:00
parent d2f07ade5d
commit ecc4fe3c19
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dotdrop/updater.py
View File

@@ -273,16 +273,17 @@ class Updater:
local_path, local_path,
)) ))
# paths must be absolute (no tildes) # paths must be absolute (no tildes)
path = os.path.expanduser(deployed_path) deployed_path = os.path.expanduser(deployed_path)
local_path = os.path.expanduser(local_path) local_path = os.path.expanduser(local_path)
if self._ignore([path, local_path]):
if self._ignore([deployed_path, local_path]):
self.log.sub('\"{}\" ignored'.format(local_path)) self.log.sub('\"{}\" ignored'.format(local_path))
return True return True
# find the differences # find the differences
diff = filecmp.dircmp(path, local_path, ignore=None) diff = filecmp.dircmp(deployed_path, local_path, ignore=None)
# handle directories diff # handle directories diff
ret = self._merge_dirs(diff, dotfile) ret = self._merge_dirs(diff, dotfile)
self._mirror_rights(path, local_path) self._mirror_rights(deployed_path, local_path)
return ret return ret
def _merge_dirs(self, diff, dotfile): def _merge_dirs(self, diff, dotfile):
@@ -293,6 +294,9 @@ class Updater:
if self._ignore([left, right]): if self._ignore([left, right]):
return True return True
ignore_missing_in_dotdrop = self.ignore_missing_in_dotdrop or \
dotfile.ignore_missing_in_dotdrop
# create dirs that don't exist in dotdrop # create dirs that don't exist in dotdrop
for toadd in diff.left_only: for toadd in diff.left_only:
exist = os.path.join(left, toadd) exist = os.path.join(left, toadd)
@@ -301,7 +305,8 @@ class Updater:
continue continue
# match to dotdrop dotpath # match to dotdrop dotpath
new = os.path.join(right, toadd) new = os.path.join(right, toadd)
if self._ignore([exist, new]): if (ignore_missing_in_dotdrop and not os.path.exists(new)) or \
self._ignore([exist, new]):
self.log.sub('\"{}\" ignored'.format(exist)) self.log.sub('\"{}\" ignored'.format(exist))
continue continue
if self.dry: if self.dry:
@@ -354,7 +359,8 @@ class Updater:
for f in fdiff: for f in fdiff:
fleft = os.path.join(left, f) fleft = os.path.join(left, f)
fright = os.path.join(right, f) fright = os.path.join(right, f)
if self._ignore([fleft, fright]): if (ignore_missing_in_dotdrop and not os.path.exists(fright)) or \
self._ignore([exist, new]):
continue continue
if self.dry: if self.dry:
self.log.dry('would cp {} {}'.format(fleft, fright)) self.log.dry('would cp {} {}'.format(fleft, fright))
@@ -370,7 +376,8 @@ class Updater:
# ignore dirs, done above # ignore dirs, done above
continue continue
new = os.path.join(right, toadd) new = os.path.join(right, toadd)
if self._ignore([exist, new]): if (ignore_missing_in_dotdrop and not os.path.exists(new)) or \
self._ignore([exist, new]):
continue continue
if self.dry: if self.dry:
self.log.dry('would cp {} {}'.format(exist, new)) self.log.dry('would cp {} {}'.format(exist, new))