@@ -1,3 +1,12 @@

+2008-11-21  Michal Ludvig  <michal@logix.cz>

+

+	* s3cmd: Support for 'cp' command.

+	* S3/S3.py: Added S3.object.copy() method.

+	* s3cmd.1: Document 'cp' command.

+	* NEWS: Let everyone know ;-)

+	Thanks Andrew Ryan for a patch proposal!

+	https://sourceforge.net/forum/forum.php?thread_id=2346987&forum_id=618865

+

 2008-11-17  Michal Ludvig  <michal@logix.cz>

 	* S3/Progress.py: Two progress meter implementations.

@@ -4,6 +4,7 @@ s3cmd 0.9.9   -   ???

 * Removing of non-empty buckets with --force

 * Recursively remove objects from buckets with a given

   prefix with --recursive (-r)

+* Copying objects, within or between buckets. (Andrew Ryan)

 s3cmd 0.9.8.4 -   2008-11-07

 =============

@@ -199,6 +199,21 @@ class S3(object):

 		response = self.send_request(request)

 		return response

+	def object_copy(self, src_uri, dst_uri, extra_headers = None):

+		if src_uri.type != "s3":

+			raise ValueError("Expected URI type 's3', got '%s'" % src_uri.type)

+		if dst_uri.type != "s3":

+			raise ValueError("Expected URI type 's3', got '%s'" % dst_uri.type)

+		headers = SortedDict()

+		headers['x-amz-copy-source'] = "/%s/%s" % (src_uri.bucket(), self.urlencode_string(src_uri.object()))

+		if self.config.acl_public:

+			headers["x-amz-acl"] = "public-read"

+		if extra_headers:

+			headers.update(extra_headers)

+		request = self.create_request("OBJECT_PUT", uri = dst_uri, headers = headers)

+		response = self.send_request(request)

+		return response

+

 	def object_info(self, uri):

 		request = self.create_request("OBJECT_HEAD", uri = uri)

 		response = self.send_request(request)

@@ -308,6 +308,25 @@ def subcmd_object_del_uri(uri, recursive = None):

 		response = s3.object_delete(_uri)

 		output("Object %s deleted" % _uri)

+def cmd_cp(args):

+	s3 = S3(Config())

+	src_uri = S3Uri(args.pop(0))

+	dst_uri = S3Uri(args.pop(0))

+

+	if len(args): 

+		raise ParameterError("Too many parameters! Expected: %s" % commands['cp']['param']) 

+

+	if src_uri.type != "s3" or dst_uri.type != "s3": 

+		raise ParameterError("Parameters are not URIs! Expected: %s" % commands['cp']['param']) 

+

+	if dst_uri.object() == "":

+		dst_uri = S3Uri(dst_uri.uri() + src_uri.object())

+ 

+	response = s3.object_copy(src_uri, dst_uri) 

+	output("Object is copied to %s" % dst_uri)

+	if Config().acl_public:

+		output("Public URL is: %s" % dst_uri.public_url())

+

 def cmd_info(args):

 	s3 = S3(Config())

@@ -882,6 +901,7 @@ commands_list = [

 	{"cmd":"sync", "label":"Synchronize a directory tree to S3", "param":"LOCAL_DIR s3://BUCKET[/PREFIX] or s3://BUCKET[/PREFIX] LOCAL_DIR", "func":cmd_sync, "argc":2},

 	{"cmd":"du", "label":"Disk usage by buckets", "param":"[s3://BUCKET[/PREFIX]]", "func":cmd_du, "argc":0},

 	{"cmd":"info", "label":"Get various information about Buckets or Objects", "param":"s3://BUCKET[/OBJECT]", "func":cmd_info, "argc":1},

+	{"cmd":"cp", "label":"Copy object", "param":"s3://BUCKET1/OBJECT1 s3://BUCKET2[/OBJECT2]", "func":cmd_cp, "argc":2},

 	#{"cmd":"setacl", "label":"Modify Access control list for Bucket or Object", "param":"s3://BUCKET[/OBJECT]", "func":cmd_setacl, "argc":1},

 	]

@@ -42,6 +42,10 @@ Backup a directory tree to S3

 \fBsync\fR \fIs3://BUCKET[/PREFIX] LOCAL_DIR\fR

 Restore a tree from S3 to local directory

 .TP

+\fBcp\fR \fIs3://BUCKET1/OBJECT1 s3://BUCKET2[/OBJECT2]\fR 

+Make a copy of a file. Either in the same bucket with a different name

+or in another bucket with the same or different name.

+.TP 

 \fBinfo\fR \fIs3://BUCKET[/OBJECT]\fR

 Get various information about a Bucket or Object

 .TP