[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff-backup.1 rdiff_bac...

[dean gaudet]

CVSROOT:        /cvsroot/rdiff-backup
Module name:    rdiff-backup
Changes by:     dean gaudet <dgaudet>   06/11/05 01:36:23

Modified files:
        .              : CHANGELOG rdiff-backup.1 
        rdiff_backup   : Main.py selection.py 

Log message:
        --min-file-size/--max-file-size support.  (Patch from Wout Mertens.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.185&r2=1.186
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff-backup.1?cvsroot=rdiff-backup&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/Main.py?cvsroot=rdiff-backup&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/selection.py?cvsroot=rdiff-backup&r1=1.42&r2=1.43

Patches:
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -b -r1.185 -r1.186
--- CHANGELOG   5 Nov 2006 01:30:02 -0000       1.185
+++ CHANGELOG   5 Nov 2006 01:36:23 -0000       1.186
@@ -1,6 +1,8 @@
 New in v1.1.6 (????/??/??)
 --------------------------
 
+--min-file-size/--max-file-size support.  (Patch from Wout Mertens.)
+
 Mac OS X Extended Attributes support.  (Patch from Andrew Ferguson.)
 
 Preserve Mac OS X 'Creation Date' field across backups.  (Patch from Andrew

Index: rdiff-backup.1
===================================================================
RCS file: /cvsroot/rdiff-backup/rdiff-backup/rdiff-backup.1,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- rdiff-backup.1      2 Jan 2006 20:29:25 -0000       1.78
+++ rdiff-backup.1      5 Nov 2006 01:36:23 -0000       1.79
@@ -283,6 +283,12 @@
 only the sizes of the mirror and increments pertaining to that
 subdirectory will be listed.
 .TP
+.BI "\-\-max-file-size " size
+Exclude files that are larger than the given size in bytes
+.TP
+.BI "\-\-min-file-size " size
+Exclude files that are smaller than the given size in bytes
+.TP
 .B \-\-never-drop-acls
 Exit with error instead of dropping acls or acl entries.  Normally
 this may happen (with a warning) because the destination does not

Index: rdiff_backup/Main.py
===================================================================
RCS file: /cvsroot/rdiff-backup/rdiff-backup/rdiff_backup/Main.py,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- rdiff_backup/Main.py        1 Feb 2006 03:00:24 -0000       1.105
+++ rdiff_backup/Main.py        5 Nov 2006 01:36:23 -0000       1.106
@@ -75,6 +75,7 @@
                  "include-special-files", "include-symbolic-links",
                  "list-at-time=", "list-changed-since=", "list-increments",
                  "list-increment-sizes", "never-drop-acls",
+                 "max-file-size=", "min-file-size=",
                  "no-acls", "no-carbonfile",
                  "no-compare-inode", "no-compression", 
"no-compression-regexp=",
                  "no-eas", "no-file-statistics", "no-hard-links", 
"null-separator",
@@ -152,6 +153,8 @@
                elif opt == "-l" or opt == "--list-increments":
                        action = "list-increments"
                elif opt == '--list-increment-sizes': action = 
'list-increment-sizes'
+               elif opt == "--max-file-size": select_opts.append((opt, arg))
+               elif opt == "--min-file-size": select_opts.append((opt, arg))
                elif opt == "--never-drop-acls": Globals.set("never_drop_acls", 
1)
                elif opt == "--no-acls": Globals.set("acls_active", 0)
                elif opt == "--no-carbonfile": Globals.set("carbonfile_active", 
0)

Index: rdiff_backup/selection.py
===================================================================
RCS file: /cvsroot/rdiff-backup/rdiff-backup/rdiff_backup/selection.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- rdiff_backup/selection.py   10 Jan 2006 04:56:44 -0000      1.42
+++ rdiff_backup/selection.py   5 Nov 2006 01:36:23 -0000       1.43
@@ -274,6 +274,10 @@
                                        
self.add_selection_func(self.special_get_sf(1))
                                elif opt == "--include-symbolic-links":
                                        
self.add_selection_func(self.symlinks_get_sf(1))
+                               elif opt == "--max-file-size":
+                                       
self.add_selection_func(self.size_get_sf(1, arg))
+                               elif opt == "--min-file-size":
+                                       
self.add_selection_func(self.size_get_sf(0, arg))
                                else: assert 0, "Bad selection option %s" % opt
                except SelectError, e: self.parse_catch_error(e)
                assert filelists_index == len(filelists)
@@ -507,6 +511,16 @@
                sel_func.name = (include and "include" or "exclude") + " 
special files"
                return sel_func
 
+       def size_get_sf(self, min_max, sizestr):
+               """Return selection function given by filesize"""
+               size = int(sizestr)
+               assert size > 0
+               if min_max: sel_func = lambda rp: (rp.getsize() <= size)
+               else: sel_func = lambda rp: (rp.getsize() >= size)
+               sel_func.exclude = 1
+               sel_func.name = "%s size %d" % (min_max and "Maximum" or 
"Minimum", size)
+               return sel_func
+
        def glob_get_sf(self, glob_str, include):
                """Return selection function given by glob string"""
                assert include == 0 or include == 1