Add support for "bup index --exclude-rx <pattern> ...".

[bup.git] / lib / bup / drecurse.py

diff --git a/lib/bup/drecurse.py b/lib/bup/drecurse.py
index e0855c83197a241d50e79988ae0f5497d0cf68ad..694c403594d1aec45c6979629c20314fd4c948ea 100644 (file)
--- a/lib/bup/drecurse.py
+++ b/lib/bup/drecurse.py
@@ -49,8 +49,17 @@ def _dirlist():
     return l
 
 
-def _recursive_dirlist(prepend, xdev, bup_dir=None, excluded_paths=None):
+def _recursive_dirlist(prepend, xdev, bup_dir=None,
+                       excluded_paths=None,
+                       exclude_rxs=None):
     for (name,pst) in _dirlist():
+        path = prepend + name
+        if excluded_paths:
+            if os.path.normpath(path) in excluded_paths:
+                debug1('Skipping %r: excluded.\n' % path)
+                continue
+        if exclude_rxs and should_rx_exclude_path(path, exclude_rxs):
+            continue
         if name.endswith('/'):
             if xdev != None and pst.st_dev != xdev:
                 debug1('Skipping %r: different filesystem.\n' % (prepend+name))
@@ -59,10 +68,6 @@ def _recursive_dirlist(prepend, xdev, bup_dir=None, excluded_paths=None):
                 if os.path.normpath(prepend+name) == bup_dir:
                     debug1('Skipping BUP_DIR.\n')
                     continue
-            if excluded_paths:
-                if os.path.normpath(prepend+name) in excluded_paths:
-                    debug1('Skipping %r: excluded.\n' % (prepend+name))
-                    continue
             try:
                 OsFile(name).fchdir()
             except OSError, e:
@@ -70,13 +75,15 @@ def _recursive_dirlist(prepend, xdev, bup_dir=None, excluded_paths=None):
             else:
                 for i in _recursive_dirlist(prepend=prepend+name, xdev=xdev,
                                             bup_dir=bup_dir,
-                                            excluded_paths=excluded_paths):
+                                            excluded_paths=excluded_paths,
+                                            exclude_rxs=exclude_rxs):
                     yield i
                 os.chdir('..')
         yield (prepend + name, pst)
 
 
-def recursive_dirlist(paths, xdev, bup_dir=None, excluded_paths=None):
+def recursive_dirlist(paths, xdev, bup_dir=None, excluded_paths=None,
+                      exclude_rxs=None):
     startdir = OsFile('.')
     try:
         assert(type(paths) != type(''))
@@ -104,7 +111,8 @@ def recursive_dirlist(paths, xdev, bup_dir=None, excluded_paths=None):
                 prepend = os.path.join(path, '')
                 for i in _recursive_dirlist(prepend=prepend, xdev=xdev,
                                             bup_dir=bup_dir,
-                                            excluded_paths=excluded_paths):
+                                            excluded_paths=excluded_paths,
+                                            exclude_rxs=exclude_rxs):
                     yield i
                 startdir.fchdir()
             else:
@@ -116,25 +124,3 @@ def recursive_dirlist(paths, xdev, bup_dir=None, excluded_paths=None):
         except:
             pass
         raise
-
-def parse_excludes(flags):
-    excluded_paths = []
-
-    for flag in flags:
-        (option, parameter) = flag
-        if option == '--exclude':
-            excluded_paths.append(realpath(parameter))
-
-        if option == '--exclude-from':
-            try:
-                try:
-                    f = open(realpath(parameter))
-                    for exclude_path in f.readlines():
-                        excluded_paths.append(realpath(exclude_path.strip()))
-                except Error, e:
-                    log("warning: couldn't read %s" % parameter)
-            finally:
-                f.close()
-
-    return excluded_paths
-