fixup! Allow to choose the Matcher from the command line

Author: shtrom

rotate_backups/__init__.py

@@ -561,13 +561,13 @@ def timestamp_pattern(self, value):
         set_property(self, 'matcher', FilenameMatcher(self.timestamp_pattern))
 
     @mutable_property
-    def unix_timestamp(self):
-        return type(self.matcher) == TimestampMatcher
+    def stat_timestamp(self):
+        return type(self.matcher) == StatsMatcher
 
-    @unix_timestamp.setter
-    def unix_timestamp(self, value):
+    @stat_timestamp.setter
+    def stat_timestamp(self, value):
         if value:
-            set_property(self, 'matcher', TimestampMatcher())
+            set_property(self, 'matcher', StatsMatcher())
         else:
             # Force re-setting the FilenameMatcher
             self.timestamp_pattern = self.timestamp_pattern

rotate_backups/cli.py

@@ -168,9 +168,9 @@
     readable and/or writable for the current user (or the user logged in to a
     remote system over SSH).
 
-  -U, --unix-timestamp
+  -s, --stat-timestamp
 
-    Consider using mtime timestamps, instead of filenames, to determine the
+    Use mtime stat timestamps, instead of filenames, to determine the
     date of each file.
 
   -S, --syslog=CHOICE
@@ -250,7 +250,7 @@ def main():
             'minutely=', 'hourly=', 'daily=', 'weekly=', 'monthly=', 'yearly=',
             'timestamp-pattern=', 'include=', 'exclude=', 'parallel',
             'prefer-recent', 'relaxed', 'ionice=', 'config=',
-            'removal-command=', 'use-sudo', 'unix-timestamp', 'syslog=',
+            'removal-command=', 'use-sudo', 'stat-timestamp', 'syslog=',
             'force', 'dry-run', 'verbose', 'quiet', 'help',
         ])
         for option, value in options:
@@ -289,8 +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', '--stat-timestamp'):
+                kw['stat_timestamp'] = True
             elif option in ('-S', '--syslog'):
                 use_syslog = coerce_boolean(value)
             elif option in ('-f', '--force'):