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

refactoring

Browse Source
This commit is contained in:
deadc0de6
2023-07-30 22:34:20 +02:00
committed by deadc0de
parent 7553255623
commit bc70a05ecb
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dotdrop/comparator.py
View File

@@ -38,7 +38,7 @@ class Comparator:
ignore = []
local_path = os.path.expanduser(local_path)
deployed_path = os.path.expanduser(deployed_path)
self.log.dbg(f'comparing {local_path} and {deployed_path}')
self.log.dbg(f'comparing \"{local_path}\" and \"{deployed_path}\"')
self.log.dbg(f'ignore pattern(s): {ignore}')
# test type of file
@@ -59,7 +59,7 @@ class Comparator:
ret = self._comp_mode(local_path, deployed_path, mode=mode)
return ret
self.log.dbg(f'{local_path} is a directory')
self.log.dbg(f'\"{local_path}\" is a directory')
ret = self._comp_dir(local_path, deployed_path, ignore)
if not ret:
@@ -100,10 +100,13 @@ class Comparator:
self.log.dbg(f'compare directory {local_path} with {deployed_path}')
if not os.path.exists(deployed_path):
return ''
if (self.ignore_missing_in_dotdrop and not
os.path.exists(local_path)) \
or must_ignore([local_path, deployed_path], ignore,
debug=self.debug):
ign_missing = self.ignore_missing_in_dotdrop and not \
os.path.exists(local_path)
paths = [local_path, deployed_path]
must_ign = must_ignore(paths,
ignore,
debug=self.debug)
if ign_missing or must_ign:
self.log.dbg(f'ignoring diff {local_path} and {deployed_path}')
return ''
if not os.path.isdir(deployed_path):