[S3tools-commits] SF.net SVN: s3tools:[223] s3cmd/trunk

[<lu...@us...>]

Revision: 223
          http://s3tools.svn.sourceforge.net/s3tools/?rev=223&view=rev
Author:   ludvigm
Date:     2008-09-03 01:48:55 +0000 (Wed, 03 Sep 2008)

Log Message:
-----------
* s3cmd, S3/Config.py: [rb] Allow removal of non-empty buckets
  with --force.
  [mb, rb] Allow multiple arguments, i.e. create or remove
  multiple buckets at once.
  [del] Perform recursive removal with --recursive (or -r).

Modified Paths:
--------------
    s3cmd/trunk/ChangeLog
    s3cmd/trunk/S3/Config.py
    s3cmd/trunk/s3cmd

Modified: s3cmd/trunk/ChangeLog
===================================================================
--- s3cmd/trunk/ChangeLog	2008-09-01 03:05:34 UTC (rev 222)
+++ s3cmd/trunk/ChangeLog	2008-09-03 01:48:55 UTC (rev 223)
@@ -1,5 +1,13 @@
 2008-09-01  Michal Ludvig  <mi...@lo...>
 
+	* s3cmd, S3/Config.py: [rb] Allow removal of non-empty buckets
+	  with --force.
+	  [mb, rb] Allow multiple arguments, i.e. create or remove
+	  multiple buckets at once.
+	  [del] Perform recursive removal with --recursive (or -r).
+
+2008-09-01  Michal Ludvig  <mi...@lo...>
+
 	* s3cmd: Refuse 'sync' together with '--encrypt'.
 	* S3/S3.py: removed object_{get,put,delete}_uri() functions
 	  and made object_{get,put,delete}() accept URI instead of 

Modified: s3cmd/trunk/S3/Config.py
===================================================================
--- s3cmd/trunk/S3/Config.py	2008-09-01 03:05:34 UTC (rev 222)
+++ s3cmd/trunk/S3/Config.py	2008-09-03 01:48:55 UTC (rev 223)
@@ -22,6 +22,7 @@
 	recv_chunk = 4096
 	human_readable_sizes = False
 	force = False
+	recursive = False
 	acl_public = False
 	proxy_host = ""
 	proxy_port = 3128

Modified: s3cmd/trunk/s3cmd
===================================================================
--- s3cmd/trunk/s3cmd	2008-09-01 03:05:34 UTC (rev 222)
+++ s3cmd/trunk/s3cmd	2008-09-03 01:48:55 UTC (rev 223)
@@ -125,34 +125,43 @@
 			))
 
 def cmd_bucket_create(args):
-	uri = S3Uri(args[0])
-	if not uri.type == "s3" or not uri.has_bucket() or uri.has_object():
-		raise ParameterError("Expecting S3 URI with just the bucket name set instead of '%s'" % args[0])
-	try:
-		s3 = S3(Config())
-		response = s3.bucket_create(uri.bucket(), cfg.bucket_location)
-	except S3Error, e:
-		if S3.codes.has_key(e.info["Code"]):
-			error(S3.codes[e.info["Code"]] % uri.bucket())
-			return
-		else:
-			raise
-	output("Bucket '%s' created" % uri.bucket())
+	s3 = S3(Config())
+	for arg in args:
+		uri = S3Uri(arg)
+		if not uri.type == "s3" or not uri.has_bucket() or uri.has_object():
+			raise ParameterError("Expecting S3 URI with just the bucket name set instead of '%s'" % arg)
+		try:
+			response = s3.bucket_create(uri.bucket(), cfg.bucket_location)
+			output("Bucket '%s' created" % uri.uri())
+		except S3Error, e:
+			if S3.codes.has_key(e.info["Code"]):
+				error(S3.codes[e.info["Code"]] % uri.bucket())
+				return
+			else:
+				raise
 
 def cmd_bucket_delete(args):
-	uri = S3Uri(args[0])
-	if not uri.type == "s3" or not uri.has_bucket() or uri.has_object():
-		raise ParameterError("Expecting S3 URI with just the bucket name set instead of '%s'" % args[0])
-	try:
-		s3 = S3(Config())
-		response = s3.bucket_delete(uri.bucket())
-	except S3Error, e:
-		if S3.codes.has_key(e.info["Code"]):
-			error(S3.codes[e.info["Code"]] % uri.bucket())
-			return
-		else:
-			raise
-	output("Bucket '%s' removed" % uri.bucket())
+	def _bucket_delete_one(uri):
+		try:
+			response = s3.bucket_delete(uri.bucket())
+		except S3Error, e:
+			if e.info['Code'] == 'BucketNotEmpty' and (cfg.force or cfg.recursive):
+				warning("Bucket is not empty. Removing all the objects from it first. This may take some time...")
+				subcmd_object_del_uri(uri, recursive = True)
+				return _bucket_delete_one(uri)
+			elif S3.codes.has_key(e.info["Code"]):
+				error(S3.codes[e.info["Code"]] % uri.bucket())
+				return
+			else:
+				raise
+		
+	s3 = S3(Config())
+	for arg in args:
+		uri = S3Uri(arg)
+		if not uri.type == "s3" or not uri.has_bucket() or uri.has_object():
+			raise ParameterError("Expecting S3 URI with just the bucket name set instead of '%s'" % arg)
+		_bucket_delete_one(uri)
+		output("Bucket '%s' removed" % uri.uri())
 
 def cmd_object_put(args):
 	s3 = S3(Config())
@@ -260,17 +269,32 @@
 				(uri, destination, response["size"], response["elapsed"], speed_fmt[0], speed_fmt[1]))
 
 def cmd_object_del(args):
-	s3 = S3(Config())
-
 	while (len(args)):
 		uri_arg = args.pop(0)
 		uri = S3Uri(uri_arg)
 		if uri.type != "s3" or not uri.has_object():
 			raise ParameterError("Expecting S3 URI instead of '%s'" % uri_arg)
 
-		response = s3.object_delete(uri)
-		output("Object %s deleted" % uri)
+		subcmd_object_del_uri(uri)
 
+def subcmd_object_del_uri(uri, recursive = None):
+	s3 = S3(Config())
+	if recursive is None:
+		recursive = cfg.recursive
+	uri_list = []
+	if recursive:
+		filelist = _get_filelist_remote(uri)
+		uri_base = 's3://' + uri.bucket() + "/"
+		for idx in filelist:
+			object = filelist[idx]
+			debug("Adding URI " + uri_base + object['object_key'])
+			uri_list.append(S3Uri(uri_base + object['object_key']))
+	else:
+		uri_list.append(uri)
+	for _uri in uri_list:
+		response = s3.object_delete(_uri)
+		info("Object %s deleted" % _uri)
+
 def cmd_info(args):
 	s3 = S3(Config())
 
@@ -885,6 +909,7 @@
 	optparser.add_option("-e", "--encrypt", dest="encrypt", action="store_true", help="Encrypt files before uploading to S3.")
 	optparser.add_option(      "--no-encrypt", dest="encrypt", action="store_false", help="Don't encrypt files.")
 	optparser.add_option("-f", "--force", dest="force", action="store_true", help="Force overwrite and other dangerous operations.")
+	optparser.add_option("-r", "--recursive", dest="recursive", action="store_true", help="Recursive upload, download or removal.")
 	optparser.add_option("-P", "--acl-public", dest="acl_public", action="store_true", help="Store objects with ACL allowing read for anyone.")
 	optparser.add_option(      "--acl-private", dest="acl_public", action="store_false", help="Store objects with default ACL allowing access for you only.")
 	optparser.add_option(      "--delete-removed", dest="delete_removed", action="store_true", help="Delete remote objects with no corresponding local file [sync]")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.