Merging in latest boto.

bin/s3put

 #!/usr/bin/env python
 # Copyright (c) 2006,2007,2008 Mitch Garnaat http://garnaat.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
@@ skipping 12 matching lines @@
 import getopt, sys, os
 import boto
 from boto.exception import S3ResponseError
 
 usage_string = """
 SYNOPSIS
     s3put [-a/--access_key <access_key>] [-s/--secret_key <secret_key>]
           -b/--bucket <bucket_name> [-c/--callback <num_cb>]
           [-d/--debug <debug_level>] [-i/--ignore <ignore_dirs>]
           [-n/--no_op] [-p/--prefix <prefix>] [-q/--quiet]
-          [-g/--grant grant] [-w/--no_overwrite] path
+          [-g/--grant grant] [-w/--no_overwrite] [-r/--reduced] path
 
     Where
         access_key - Your AWS Access Key ID.  If not supplied, boto will
                      use the value of the environment variable
                      AWS_ACCESS_KEY_ID
         secret_key - Your AWS Secret Access Key.  If not supplied, boto
                      will use the value of the environment variable
                      AWS_SECRET_ACCESS_KEY
         bucket_name - The name of the S3 bucket the file(s) should be
                       copied to.
@@ skipping 23 matching lines @@
         grant - A canned ACL policy that will be granted on each file
                 transferred to S3.  The value of provided must be one
                 of the "canned" ACL policies supported by S3:
                 private|public-read|public-read-write|authenticated-read
         no_overwrite - No files will be overwritten on S3, if the file/key 
                        exists on s3 it will be kept. This is useful for 
                        resuming interrupted transfers. Note this is not a 
                        sync, even if the file has been updated locally if 
                        the key exists on s3 the file on s3 will not be 
                        updated.
+        reduced - Use Reduced Redundancy storage
+
 
      If the -n option is provided, no files will be transferred to S3 but
      informational messages will be printed about what would happen.
 """
 def usage():
     print usage_string
     sys.exit()
   
 def submit_cb(bytes_so_far, total_bytes):
     print '%d bytes transferred / %d bytes total' % (bytes_so_far, total_bytes)
 
 def get_key_name(fullpath, prefix):
     key_name = fullpath[len(prefix):]
     l = key_name.split(os.sep)
     return '/'.join(l)
 
 def main():
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'a:b:c::d:g:hi:np:qs:vw',
-                                   ['access_key', 'bucket', 'callback', 'debug', 'help', 'grant',
-                                    'ignore', 'no_op', 'prefix', 'quiet', 'secret_key', 'no_overwrite'])
+        opts, args = getopt.getopt(
+                sys.argv[1:], 'a:b:c::d:g:hi:np:qs:vwr',
+                ['access_key', 'bucket', 'callback', 'debug', 'help', 'grant',
+                 'ignore', 'no_op', 'prefix', 'quiet', 'secret_key',
+                 'no_overwrite', 'reduced']
+                )
     except:
         usage()
     ignore_dirs = []
     aws_access_key_id = None
     aws_secret_access_key = None
     bucket_name = ''
     total = 0
     debug = 0
     cb = None
     num_cb = 0
     quiet = False
     no_op = False
     prefix = '/'
     grant = None
     no_overwrite = False
+    reduced = False
     for o, a in opts:
         if o in ('-h', '--help'):
             usage()
             sys.exit()
         if o in ('-a', '--access_key'):
             aws_access_key_id = a
         if o in ('-b', '--bucket'):
             bucket_name = a
         if o in ('-c', '--callback'):
             num_cb = int(a)
             cb = submit_cb
         if o in ('-d', '--debug'):
             debug = int(a)
         if o in ('-g', '--grant'):
             grant = a
         if o in ('-i', '--ignore'):
             ignore_dirs = a.split(',')
         if o in ('-n', '--no_op'):
             no_op = True
-        if o in ('w', '--no_overwrite'):
+        if o in ('-w', '--no_overwrite'):
             no_overwrite = True
+        if o in ('-r', '--reduced'):
+            reduced = True
         if o in ('-p', '--prefix'):
             prefix = a
             if prefix[-1] != os.sep:
                 prefix = prefix + os.sep
         if o in ('-q', '--quiet'):
             quiet = True
         if o in ('-s', '--secret_key'):
             aws_secret_access_key = a
     if len(args) != 1:
         print usage()
@@ skipping 23 matching lines @@
                     if no_overwrite:
                         if key_name in keys:
                             copy_file = False
                             if not quiet:
                                 print 'Skipping %s as it exists in s3' % file
                     if copy_file:
                         if not quiet:
                             print 'Copying %s to %s/%s' % (file, bucket_name, key_name)
                         if not no_op:
                             k = b.new_key(key_name)
-                            k.set_contents_from_filename(fullpath, cb=cb,
-                                                            num_cb=num_cb, policy=grant)
+                            k.set_contents_from_filename(
+                                    fullpath, cb=cb, num_cb=num_cb,
+                                    policy=grant, reduced_redundancy=reduced,
+                                    )
                     total += 1
         elif os.path.isfile(path):
             key_name = os.path.split(path)[1]
             copy_file = True
             if no_overwrite:
                 if b.get_key(key_name):
                     copy_file = False
                     if not quiet:
                         print 'Skipping %s as it exists in s3' % path
             if copy_file:
                 k = b.new_key(key_name)
-                k.set_contents_from_filename(path, cb=cb, num_cb=num_cb, policy=grant)
+                k.set_contents_from_filename(path, cb=cb, num_cb=num_cb,
+                                             policy=grant,
+                                             reduced_redundancy=reduced)
     else:
         print usage()
 
 if __name__ == "__main__":
     main()
-        
+