timestamp option

Author: stathis-alexopoulos

rotate_backups/__init__.py

@@ -71,8 +71,7 @@
 :class:`~dateutil.relativedelta.relativedelta` objects as values. This
 dictionary is generated based on the tuples in :data:`ORDERED_FREQUENCIES`.
 """
-
-TIMESTAMP_PATTERN = re.compile(r'''
+TIMESTAMP = r'''
     # Required components.
     (?P<year>\d{4} ) \D?
     (?P<month>\d{2}) \D?
@@ -83,7 +82,8 @@
         (?P<minute>\d{2}) \D?
         (?P<second>\d{2})?
     )?
-''', re.VERBOSE)
+'''
+
 """
 A compiled regular expression object used to match timestamps encoded in
 filenames.
@@ -197,6 +197,7 @@ def load_config_file(configuration_file=None, expand=True):
         options = dict(include_list=split(items.get('include-list', '')),
                        exclude_list=split(items.get('exclude-list', '')),
                        io_scheduling_class=items.get('ionice'),
+                       timestamp=items.get('timestamp'),
                        strict=coerce_boolean(items.get('strict', 'yes')),
                        prefer_recent=coerce_boolean(items.get('prefer-recent', 'no')))
         # Don't override the value of the 'removal_command' property unless the
@@ -254,6 +255,10 @@ def __init__(self, rotation_scheme, **options):
         options.update(rotation_scheme=rotation_scheme)
         super(RotateBackups, self).__init__(**options)
 
+    @cached_property(writable=True)
+    def timestamp(self):
+        return TIMESTAMP
+
     @mutable_property
     def config_file(self):
         """
@@ -557,15 +562,19 @@ def collect_backups(self, location):
         location = coerce_location(location)
         logger.info("Scanning %s for backups ..", location)
         location.ensure_readable()
+        pattern=re.compile(self.timestamp, re.VERBOSE)
         for entry in natsort(location.context.list_entries(location.directory)):
-            match = TIMESTAMP_PATTERN.search(entry)
+#            match = TIMESTAMP_PATTERN.search(entry)
+            match = pattern.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)
                 elif self.include_list and not any(fnmatch.fnmatch(entry, p) for p in self.include_list):
                     logger.verbose("Excluded %s (it didn't match the include list).", entry)
                 else:
                     try:
+#                        for group in match.groups('0'):
+#                            print group
                         backups.append(Backup(
                             pathname=os.path.join(location.directory, entry),
                             timestamp=datetime.datetime(*(int(group, 10) for group in match.groups('0'))),

rotate_backups/cli.py

@@ -214,9 +214,9 @@ def main():
     selected_locations = []
     # Parse the command line arguments.
     try:
-        options, arguments = getopt.getopt(sys.argv[1:], 'M:H:d:w:m:y:I:x:jpri:c:r:uC:nvqh', [
+        options, arguments = getopt.getopt(sys.argv[1:], 'M:H:d:w:m:y:tI:x:jpri:c:r:uC:nvqh', [
             'minutely=', 'hourly=', 'daily=', 'weekly=', 'monthly=', 'yearly=',
-            'include=', 'exclude=', 'parallel', 'prefer-recent', 'relaxed',
+            'timestamp=', 'include=', 'exclude=', 'parallel', 'prefer-recent', 'relaxed',
             'ionice=', 'config=', 'use-sudo', 'dry-run', 'removal-command=',
             'verbose', 'quiet', 'help',
         ])
@@ -233,6 +233,8 @@ def main():
                 rotation_scheme['monthly'] = coerce_retention_period(value)
             elif option in ('-y', '--yearly'):
                 rotation_scheme['yearly'] = coerce_retention_period(value)
+            elif option in ('-t', '--timestamp'):
+                kw['timestamp'].append(value)
             elif option in ('-I', '--include'):
                 kw['include_list'].append(value)
             elif option in ('-x', '--exclude'):