Allow to choose the Matcher from the command line

Signed-off-by: Olivier Mehani <[email protected]>

Author: shtrom

rotate_backups/__init__.py

@@ -353,6 +353,8 @@ def __init__(self, rotation_scheme, **options):
                         and :attr:`strict`).
         """
         options.update(rotation_scheme=rotation_scheme)
+        # Force re-setting the FilenameMatcher
+        self.timestamp_pattern = self.timestamp_pattern
         super(RotateBackups, self).__init__(**options)
 
     @mutable_property
@@ -556,6 +558,19 @@ def timestamp_pattern(self, value):
             if component not in pattern.groupindex and required:
                 raise ValueError("Pattern is missing required capture group! (%s)" % component)
         set_property(self, 'timestamp_pattern', pattern)
+        set_property(self, 'matcher', FilenameMatcher(self.timestamp_pattern))
+
+    @mutable_property
+    def unix_timestamp(self):
+        return type(self.matcher) == TimestampMatcher
+
+    @unix_timestamp.setter
+    def unix_timestamp(self, value):
+        if value:
+            set_property(self, 'matcher', TimestampMatcher())
+        else:
+            # Force re-setting the FilenameMatcher
+            self.timestamp_pattern = self.timestamp_pattern
 
     def rotate_concurrent(self, *locations, **kw):
         """
@@ -719,9 +734,8 @@ def collect_backups(self, location):
         logger.info("Scanning %s for backups ..", location)
         location.ensure_readable(self.force)
 
-        matcher = FilenameMatcher(self.timestamp_pattern)
         for entry in natsort(location.context.list_entries(location.directory)):
-            match = matcher.search(entry)
+            match = self.matcher.search(entry)
             if match:
                 if self.exclude_list and any(fnmatch.fnmatch(entry, p) for p in self.exclude_list):
                     logger.verbose("Excluded %s (it matched the exclude list).", entry)

rotate_backups/cli.py

@@ -168,6 +168,11 @@
     readable and/or writable for the current user (or the user logged in to a
     remote system over SSH).
 
+  -U, --unix-timestamp
+
+    Consider using mtime timestamps, instead of filenames, to determine the
+    date of each file.
+
   -S, --syslog=CHOICE
 
     Explicitly enable or disable system logging instead of letting the program
@@ -241,12 +246,12 @@ def main():
     selected_locations = []
     # Parse the command line arguments.
     try:
-        options, arguments = getopt.getopt(sys.argv[1:], 'M:H:d:w:m:y:t:I:x:jpri:c:C:uS:fnvqh', [
+        options, arguments = getopt.getopt(sys.argv[1:], 'M:H:d:w:m:y:t:I:x:jpri:c:C:uUS:fnvqh', [
             'minutely=', 'hourly=', 'daily=', 'weekly=', 'monthly=', 'yearly=',
             'timestamp-pattern=', 'include=', 'exclude=', 'parallel',
             'prefer-recent', 'relaxed', 'ionice=', 'config=',
-            'removal-command=', 'use-sudo', 'syslog=', 'force',
-            'dry-run', 'verbose', 'quiet', 'help',
+            'removal-command=', 'use-sudo', 'unix-timestamp', 'syslog=',
+            'force', 'dry-run', 'verbose', 'quiet', 'help',
         ])
         for option, value in options:
             if option in ('-M', '--minutely'):
@@ -284,6 +289,8 @@ def main():
                 kw['removal_command'] = removal_command
             elif option in ('-u', '--use-sudo'):
                 use_sudo = True
+            elif option in ('-U', '--unix-timestamp'):
+                kw['unix_timestamp'] = True
             elif option in ('-S', '--syslog'):
                 use_syslog = coerce_boolean(value)
             elif option in ('-f', '--force'):