@@ -1,3 +1,8 @@

+2007-03-26  Michal Ludvig  <michal@logix.cz>

+

+	* s3cmd, S3/S3Uri.py: Output public HTTP URL for objects

+	  stored with Public ACL.

+	  

 2007-02-28  Michal Ludvig  <michal@logix.cz>

 	* s3cmd: Verify supplied accesskey and secretkey

@@ -33,6 +33,9 @@ class S3Uri(object):

 	def __str__(self):

 		return self.uri()

+	def public_url(self):

+		raise ValueError("This S3 URI does not have Anonymous URL representation")

+	

 class S3UriS3(S3Uri):

 	type = "s3"

 	_re = re.compile("^s3://([^/]+)/?(.*)", re.IGNORECASE)

@@ -59,10 +62,13 @@ class S3UriS3(S3Uri):

 	def uri(self):

 		return "/".join(["s3:/", self._bucket, self._object])

+	def public_url(self):

+		return "http://s3.amazonaws.com/%s/%s" % (self._bucket, self._object)

+

 	@staticmethod

 	def compose_uri(bucket, object = ""):

 		return "s3://%s/%s" % (bucket, object)

-

+	

 class S3UriS3FS(S3Uri):

 	type = "s3fs"

 	_re = re.compile("^s3fs://([^/]*)/?(.*)", re.IGNORECASE)

@@ -130,6 +130,9 @@ def cmd_object_put(args):

 		response = s3.object_put_uri(file, uri_final)

 		output("File '%s' stored as %s (%d bytes)" %

 			(file, uri_final, response["size"]))

+		if Config().acl_public:

+			output("Public URL of the object is: %s" %

+				(uri.public_url()))

 def cmd_object_get(args):

 	s3 = S3(Config())