tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Better implementation of filtering algorithm.

This commit is contained in:
Alberto Berti 2009-02-22 16:40:49 -07:00
parent 2fbca1596b
commit 89a20fe4dd
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/allmydata/scripts/cli.py
View File

@ -216,7 +216,7 @@ class BackupOptions(VDriveOptions):
def __init__(self): def __init__(self):
super(BackupOptions, self).__init__() super(BackupOptions, self).__init__()
self['exclude'] = [] self['exclude'] = set()
def parseArgs(self, localdir, topath): def parseArgs(self, localdir, topath):
self.from_dir = localdir self.from_dir = localdir
@ -231,8 +231,7 @@ class BackupOptions(VDriveOptions):
g = pattern.strip() g = pattern.strip()
if g: if g:
exclude = self['exclude'] exclude = self['exclude']
if g not in exclude: exclude.add(g)
exclude.append(g)
def opt_exclude_from(self, filepath): def opt_exclude_from(self, filepath):
"""Ignore file matching glob patterns listed in file, one per """Ignore file matching glob patterns listed in file, one per
@ -257,14 +256,12 @@ class BackupOptions(VDriveOptions):
def filter_listdir(self, listdir): def filter_listdir(self, listdir):
"""Yields non-excluded childpaths in path.""" """Yields non-excluded childpaths in path."""
exclude = self['exclude'] exclude = self['exclude']
excluded_dirmembers = [] exclude_regexps = [re.compile(fnmatch.translate(pat)) for pat in exclude]
if listdir and exclude:
# expand patterns with a reduce taste
for pattern in exclude:
excluded_dirmembers += fnmatch.filter(listdir, pattern)
# do subtraction
for filename in listdir: for filename in listdir:
if filename not in excluded_dirmembers: for regexp in exclude_regexps:
if regexp.match(filename):
break
else:
yield filename yield filename
longdesc = """Add a versioned backup of the local FROM directory to a timestamped subdir of the (tahoe) TO/Archives directory, sharing as many files and directories as possible with the previous backup. Creates TO/Latest as a reference to the latest backup. Behaves somewhat like 'rsync -a --link-dest=TO/Archives/(previous) FROM TO/Archives/(new); ln -sf TO/Archives/(new) TO/Latest'.""" longdesc = """Add a versioned backup of the local FROM directory to a timestamped subdir of the (tahoe) TO/Archives directory, sharing as many files and directories as possible with the previous backup. Creates TO/Latest as a reference to the latest backup. Behaves somewhat like 'rsync -a --link-dest=TO/Archives/(previous) FROM TO/Archives/(new); ln -sf TO/Archives/(new) TO/Latest'."""