@@ -2,43 +2,28 @@ from __future__ import with_statement import commands import time +import sys from optparse import OptionParser -def parse_setup(): - parser = OptionParser() - parser.add_option("-u", "--user", action="store", type="string", - dest="username", help="MySQL user name", metavar="USER") - parser.add_option("-h", "--hostfile", action="store", type="string", - dest="hostfile", help="Location of hosts.yak.", metavar="HOSTFILE") - parser.add_option("-d", "--destpath", action="store", type="string", - dest="destpath", help="Destination path on the remote server.", metavar="DESTPATH") - parser.add_option("-a", "--archiver", action="store", type="string", - dest="archiver", help="What archiver to use. Default is tar.", metavar="ARCHIVER") - parser.add_option("-o", "--archiveroptions", action="store", type="string", - dest="archiver_options", help="Special options to pass to the archiver.", metavar="ARCHIVEROPTIONS") - parser.add_option("-c", "--compresser", action="store", type="string", - dest="compress_app", help="What type of compression to use. Defaults to bzip2.", metavar="COMPRESSOR") - if not sys.argv[1:]: - parser.print_help() - exit(2) - (options, arg) = parser.parse_args() - return (options, arg) +DEFAULTS = {'user': 'timeyak', 'hostfile': 'hosts.yak', 'dest_path': '/home/timeyak/backup/', 'archiver': 'tar', + 'archiver_options': 'cf', 'archiver_ext': '.tar', 'compress_app': 'bzip2', 'compress_ext': '.bz' } class YakDump: - def __init__(self, user='timeyak', hostfile='hosts.yak', dest_path='/home/timeyak/backup/', archiver_options='-cf', archiver='tar', archiver_ext='.tar', compress_app='bzip2', compress_ext='.bz'): + def __init__(self, options): print('timeyak waits for noman') current_time = time.localtime() self.time_str = str(current_time[0]) + str(current_time[1]) + str(current_time[2]) - self.compress_app = compress_app - self.compress_ext = compress_ext - self.archiver = archiver - self.archiver_ext = archiver_ext - self.archiver_options = archiver_options - self.hostfile = hostfile - self.user = user self.files = [] - self.dest_path = dest_path + self.compress_app = options.user if options.user else DEFAULTS['compress_app'] + self.archiver = options.archiver if options.archiver else DEFAULTS['archiver'] + self.archiver_options = options.archiver_options if options.archiver_options else DEFAULTS['archiver_options'] + self.hostfile = options.hostfile if options.hostfile else DEFAULTS['hostfile'] + self.user = options.user if options.user else DEFAULTS['user'] + self.dest_path = options.dest_path if options.dest_path else DEFAULTS['dest_path'] + + self.compress_ext = DEFAULTS['compress_ext'] #@todo: need this to check compress_app and pick based on that + self.archiver_ext = DEFAULTS['archiver_ext'] def get_hosts(self): with open(self.hostfile) as f: @@ -73,6 +58,28 @@ class YakDump: c = 'scp ' + file + ' ' + self.user + '@' + host + ':' + self.dest_path ret = commands.getstatusoutput(c.replace("\n", "")) -yakdump = YakDump() -yakdump.dump_files('/home/timeyak/test/') -yakdump.copy_files() +def parse_setup(): + parser = OptionParser() + parser.add_option("-u", "--user", action="store", type="string", + dest="user", help="timeyak user name", metavar="USER") + parser.add_option("-f", "--hostfile", action="store", type="string", + dest="hostfile", help="Location of hosts.yak.", metavar="HOSTFILE") + parser.add_option("-d", "--destpath", action="store", type="string", + dest="dest_path", help="Destination path on the remote server.", metavar="DESTPATH") + parser.add_option("-a", "--archiver", action="store", type="string", + dest="archiver", help="What archiver to use. Default is tar.", metavar="ARCHIVER") + parser.add_option("-o", "--archiveroptions", action="store", type="string", + dest="archiver_options", help="Special options to pass to the archiver.", metavar="ARCHIVEROPTIONS") + parser.add_option("-c", "--compresser", action="store", type="string", + dest="compress_app", help="What type of compression to use. Defaults to bzip2.", metavar="COMPRESSOR") + (options, arg) = parser.parse_args() + return (options, arg) + +def main(): + (options, arg) = parse_setup() + yakdump = YakDump(options) + yakdump.dump_files('/home/timeyak/test/') + yakdump.copy_files() + +if __name__ == "__main__": + main() timeyak.py a41a640c925b121f80c9c44f7f45342fcffe6470 Michael Matuzak michael@lambdaphant.com http://github.com/emkay/timeyak/commit/e8e6e9db78e28a75db9e82f0a6d2e9a0f5b1de9d e8e6e9db78e28a75db9e82f0a6d2e9a0f5b1de9d 2009-05-07T17:12:32-07:00 2009-05-07T17:12:32-07:00 moving around parsing function, making a main function, passing in cl args to the class, and setting up defaults a8f45033a94ac40e5787dccedf68ed911f04c653 Michael Matuzak michael@lambdaphant.com