mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify the ExcludePattern logic further, and explain.

This commit is contained in:
Dan Christensen 2014-02-07 18:04:21 -05:00
parent 8cc74be62e
commit b76a40c987
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
attic/helpers.py
View File

@ -158,6 +158,12 @@ def exclude_path(path, patterns):
return False return False
# For both IncludePattern and ExcludePattern, we require that
# the pattern either match the whole path or an initial segment
# of the path up to but not including a path separator. To
# unify the two cases, we add a path separator to the end of
# the path before matching.
class IncludePattern: class IncludePattern:
"""Literal files or directories listed on the command line """Literal files or directories listed on the command line
for some operations (e.g. extract, but create). for some operations (e.g. extract, but create).
@ -179,19 +185,16 @@ class ExcludePattern(IncludePattern):
exclude the contents of a directory, but not the directory itself. exclude the contents of a directory, but not the directory itself.
""" """
def __init__(self, pattern): def __init__(self, pattern):
self.pattern = pattern if pattern.endswith(os.path.sep):
self.pattern = pattern+'*'+os.path.sep
else:
self.pattern = pattern+os.path.sep+'*'
# fnmatch and re.match both cache compiled regular expressions. # fnmatch and re.match both cache compiled regular expressions.
# Nevertheless, this is about 10 times faster. # Nevertheless, this is about 10 times faster.
if pattern.endswith(os.path.sep): self.regex = re.compile(translate(self.pattern))
regex = translate(pattern+'*')
else:
regex1 = translate(pattern)
regex2 = translate(pattern+os.path.sep+'*')
regex = '(' + regex1 + ')|(' + regex2 + ')'
self.regobj = re.compile(regex)
def match(self, path): def match(self, path):
return self.regobj.match(path) is not None return self.regex.match(path+os.path.sep) is not None
def __repr__(self): def __repr__(self):
return '%s(%s)' % (type(self), self.pattern) return '%s(%s)' % (type(self), self.pattern)