pvl-backup: comparison scripts/pvlbackup-rsync-snapshot

equal deleted inserted replaced

-:d4b9954273a1
+:b88653920e7a
 Parse command-line arguments.
 """
 parser = optparse.OptionParser(
 prog        = argv[0],
-usage       = '%prog: [options] --source <src> --destination <dst>',
+usage       = '%prog: [options] [ --config <path> | --target <path> [ --source <src> ] [ --interval <name> ] ]',
 # module docstring
 # XXX: breaks multi-line descriptions..
 description = __doc__,
 )
 #
 parser.add_option('-c', '--config',     metavar='FILE',
 help="Load configuration file")
 #
-parser.add_option('-s', '--source',     metavar='RSYNC-PATH',
+parser.add_option('-T', '--target',    metavar='PATH',
-help="Backup source in rsync-syntax")
+help="Target path")
-parser.add_option('-d', '--destination',    metavar='RSYNC-PATH',
+parser.add_option('-s', '--source',     metavar='RSYNC-PATH', dest='target_source', default=False,
-help="Backup destination in rsync-syntax")
+help="Run target backup from source in rsync-syntax")
 parser.add_option('--interval',         metavar='NAME', action='append', dest='target_intervals',
-help="Enable given interval")
+help="Run target with given given interval(s)")
 # defaults
 parser.set_defaults(
-loglevel    = logging.WARNING,
+loglevel            = logging.WARNING,
+target_intervals    = [],
 )
 parser.set_defaults(**defaults)
 # parse
 )
 else :
 # partial instance with keep
 return cls(name,
 format  = base.format,
-keep    = config_int('keep', arg),
+keep    = config_int('keep', arg) if arg else base.keep,
 )
 def __init__ (self, name, format, keep) :
 self.name = name
 self.format = format
 # subsections
 intervals       = None,
 rsync_options   = None,
 ) :
-if not source :
+if not source and source is not False :
 raise ConfigError("Missing required option: source for [target:{name}]".format(name=name))
 # global defaults
 _rsync_options = dict(options.rsync_options)
 self.snapshots_dir = os.path.join(self.path, 'snapshots')
 # 'current' symlink
 self.current_path = os.path.join(self.path, 'current')
-def snapshot (self, options, now) :
+def prepare (self, options) :
 """
-Perform the rsync from our source to self.snapshot_dir.
+Prepare dir for usage
+"""
-XXX: allocate snapshot_name here?
-"""
+if not os.path.exists(self.path) :
+raise Exception("Missing target dir: {path}".format(path=self.path))
 if not os.path.exists(self.snapshots_dir) :
 log.warn("Creating snapshots dir: %s", self.snapshots_dir)
 os.mkdir(self.snapshots_dir)
+def snapshot (self, options, now) :
+"""
+Perform the rsync from our source to self.snapshot_dir.
+XXX: allocate snapshot_name here?
+"""
 # new snapshot
 snapshot_name = now.strftime(options.snapshot_format)
 snapshot_path = os.path.join(self.snapshots_dir, snapshot_name)
 temp_path = os.path.join(self.snapshots_dir, 'tmp')
 def run (self, options) :
 """
 Execute
 """
+# prep
+self.prepare(options)
 # clean intervals?
 if options.clean_intervals:
 for interval in self.intervals :
 log.info("Cleaning interval: %s...", interval)
 return 1
 def __str__ (self) :
 return self.name
-def run (options) :
+def run (options, targets) :
 # default config
 config = dict(
 rsync_options   = {},
 intervals       = {},
 targets         = {},
 if options.config :
 # load
 config = parse_config(options.config, config)
 # manual?
-if options.destination :
+if options.target :
-config['targets']['<commandline>'] = dict(
+config['targets'][options.target] = dict(
-path        = options.destination,
+path        = options.target,
-source      = options.source,
+source      = options.target_source,
-intervals   = options.target_intervals,
+intervals   = dict((name, None) for name in options.target_intervals),
 )
 # intervals
 for name in config['intervals'] :
 interval_config = config['intervals'][name]
 log.debug("rsync option: %s=%s", option, value)
 # store
 options.rsync_options[option] = value
-for name in config['targets'] :
+# all targets?
+if not targets :
+targets = list(config['targets'])
+# targets
+for name in targets :
 target_config = config['targets'][name]
 # parse
 target = Target.from_config(options, name, **target_config)
 defaults = config_defaults()
 # global options + args
 options, args = parse_options(argv, defaults)
-# XXX: args?
+# args: filter targets
-if args :
+# XXX: fix name mangling
-log.error("No arguments are handled")
+targets = [target.replace('-', '_') for target in args]
-return 2
 try :
 # handle it
-return run(options)
+return run(options, targets)
 except Exception, e:
 log.error("Internal error:", exc_info=e)
 return 3

changeset 17	b88653920e7a
parent 16	d4b9954273a1
child 21	de69e9ba8f22