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

improve comparison

Browse Source
This commit is contained in:
deadc0de6
2024-01-27 23:09:46 +01:00
committed by deadc0de
parent e94b5bb5c0
commit 6fc489289e
4 changed files with 65 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dotdrop/ftree.py
View File

@@ -13,7 +13,9 @@ from dotdrop.utils import must_ignore
class FTreeDir:
"""directory tree for comparison"""
"""
directory tree for comparison
"""
def __init__(self, path, ignores=None, debug=False):
self.path = path
@@ -24,14 +26,27 @@ class FTreeDir:
self._walk()
def _walk(self):
for root, _, files in os.walk(self.path):
"""
index directory
ignore empty directory
test for ignore pattern
"""
for root, dirs, files in os.walk(self.path):
for file in files:
fpath = os.path.join(root, file)
if must_ignore([fpath], ignores=self.ignores,
debug=self.debug):
continue
self.entries.append(fpath)
self.entries.sort()
for dname in dirs:
dpath = os.path.join(root, dname)
if len(os.listdir(dpath)) < 1:
# ignore empty directory
continue
if must_ignore([dpath], ignores=self.ignores,
debug=self.debug):
continue
self.entries.append(dpath)
def compare(self, other):
"""
@@ -39,8 +54,11 @@ class FTreeDir:
- left_only (only in self)
- right_only (only in other)
- in_both (in both)
the relative path are returned
"""
left_only = set(self.entries) - set(other.entries)
right_only = set(other.entries) - set(self.entries)
in_both = set(self.entries) & set(other.entries)
left = [os.path.relpath(entry, self.path) for entry in self.entries]
right = [os.path.relpath(entry, other.path) for entry in other.entries]
left_only = set(left) - set(right)
right_only = set(right) - set(left)
in_both = set(left) & set(right)
return list(left_only), list(right_only), list(in_both)