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

+2009-05-27  Michal Ludvig  <michal@logix.cz>

+

+	* S3/SortedDict.py: Add case-sensitive mode.

+	* s3cmd, S3/S3.py, S3/Config.py: Use SortedDict() in 

+	  case-sensitive mode to avoid dropping filenames

+	  differing only in capitalisation

+	* run-tests.py: Testsuite for the above.

+	* NEWS: Updated.

+

 2009-03-20  Michal Ludvig  <michal@logix.cz>

 	* S3/S3.py: Re-sign requests before retrial to avoid 

@@ -2,6 +2,8 @@ s3cmd 1.0.0

 ===========

 * New command 'sign' for signing for instance

   the POST upload policies.

+* Fixed handling of filenames that differ only in 

+  capitalisation (eg blah.txt vs Blah.TXT).

 s3cmd 0.9.9   -   2009-02-17

 ===========

@@ -27,7 +27,7 @@ class Config(object):

 	recv_chunk = 4096

 	list_md5 = False

 	human_readable_sizes = False

-	extra_headers = SortedDict()

+	extra_headers = SortedDict(ignore_case = True)

 	force = False

 	get_continue = False

 	skip_existing = False

@@ -27,7 +27,7 @@ from ACL import ACL

 class S3Request(object):

 	def __init__(self, s3, method_string, resource, headers, params = {}):

 		self.s3 = s3

-		self.headers = SortedDict(headers or {})

+		self.headers = SortedDict(headers or {}, ignore_case = True)

 		self.resource = resource

 		self.method_string = method_string

 		self.params = params

@@ -195,7 +195,7 @@ class S3(object):

 		return response

 	def bucket_create(self, bucket, bucket_location = None):

-		headers = SortedDict()

+		headers = SortedDict(ignore_case = True)

 		body = ""

 		if bucket_location and bucket_location.strip().upper() != "US":

 			body  = "<CreateBucketConfiguration><LocationConstraint>"

@@ -235,7 +235,7 @@ class S3(object):

 			size = os.stat(filename)[ST_SIZE]

 		except IOError, e:

 			raise InvalidFileError(u"%s: %s" % (unicodise(filename), e.strerror))

-		headers = SortedDict()

+		headers = SortedDict(ignore_case = True)

 		if extra_headers:

 			headers.update(extra_headers)

 		headers["content-length"] = size

@@ -273,7 +273,7 @@ class S3(object):

 			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 = SortedDict(ignore_case = True)

 		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"

@@ -17,11 +17,19 @@ class SortedDictIterator(object):

 			raise StopIteration

 class SortedDict(dict):

-	keys_sort_lowercase = True

+	def __init__(self, mapping = {}, ignore_case = True, **kwargs):

+		"""

+		WARNING: SortedDict() with ignore_case==True will

+		         drop entries differing only in capitalisation!

+				 Eg: SortedDict({'auckland':1, 'Auckland':2}).keys() => ['Auckland']

+				 With ignore_case==False it's all right

+		"""

+		dict.__init__(self, mapping, **kwargs)

+		self.ignore_case = ignore_case

 	def keys(self):

 		keys = dict.keys(self)

-		if self.keys_sort_lowercase:

+		if self.ignore_case:

 			# Translation map

 			xlat_map = BidirMap()

 			for key in keys:

@@ -38,18 +46,16 @@ class SortedDict(dict):

 		return SortedDictIterator(self, self.keys())

 if __name__ == "__main__":

-	d = SortedDict()

-	d['AWS'] = 1

-	d['Action'] = 2

-	d['america'] = 3

-	d.keys_sort_lowercase = True

-	print "Wanted: Action, america, AWS,"

+	d = { 'AWS' : 1, 'Action' : 2, 'america' : 3, 'Auckland' : 4, 'America' : 5 }

+	sd = SortedDict(d)

+	print "Wanted: Action, america, Auckland, AWS,    [ignore case]"

 	print "Got:   ",

-	for key in d:

+	for key in sd:

 		print "%s," % key,

-	print "   __iter__()"

-	d.keys_return_lowercase = True

+	print "   [used: __iter__()]"

+	d = SortedDict(d, ignore_case = False)

+	print "Wanted: AWS, Action, Auckland, america,    [case sensitive]"

 	print "Got:   ",

 	for key in d.keys():

 		print "%s," % key,

-	print "   keys()"

+	print "   [used: keys()]"

@@ -338,6 +338,9 @@ test_s3cmd("Get multiple files", ['get', 's3://s3cmd-autotest-1/xyz/etc2/Logo.PN

 test_s3cmd("Copy between buckets", ['cp', 's3://s3cmd-autotest-1/xyz/etc2/Logo.PNG', 's3://s3cmd-Autotest-3'],

 	must_find = [ "File s3://s3cmd-autotest-1/xyz/etc2/Logo.PNG copied to s3://s3cmd-Autotest-3/xyz/etc2/Logo.PNG" ])

+## ====== Upload files differing in capitalisation

+test_s3cmd("blah.txt / Blah.txt", ['put', '-r', 'testsuite/blahBlah', 's3://s3cmd-autotest-1/'],

+	must_find = [ 's3://s3cmd-autotest-1/blahBlah/Blah.txt', 's3://s3cmd-autotest-1/blahBlah/blah.txt' ])

 ## ====== Simple delete

 test_s3cmd("Simple delete", ['del', 's3://s3cmd-autotest-1/xyz/etc2/Logo.PNG'],

@@ -187,7 +187,7 @@ def cmd_bucket_delete(args):

 def fetch_local_list(args, recursive = None):

 	local_uris = []

-	local_list = SortedDict()

+	local_list = SortedDict(ignore_case = False)

 	single_file = False

 	if type(args) not in (list, tuple):

@@ -220,7 +220,7 @@ def fetch_local_list(args, recursive = None):

 def fetch_remote_list(args, require_attribs = False, recursive = None):

 	remote_uris = []

-	remote_list = SortedDict()

+	remote_list = SortedDict(ignore_case = False)

 	if type(args) not in (list, tuple):

 		args = [args]

@@ -586,7 +586,7 @@ def _get_filelist_local(local_uri):

 		local_path = deunicodise(local_uri.dirname())

 		filelist = [( local_path, [], [deunicodise(local_uri.basename())] )]

 		single_file = True

-	loc_list = SortedDict()

+	loc_list = SortedDict(ignore_case = False)

 	for root, dirs, files in filelist:

 		rel_root = root.replace(local_path, local_base, 1)

 		for f in files:

@@ -637,7 +637,7 @@ def _get_filelist_remote(remote_uri, recursive = True):

 		rem_base = rem_base[:rem_base.rfind('/')+1]

 		remote_uri = S3Uri("s3://%s/%s" % (remote_uri.bucket(), rem_base))

 	rem_base_len = len(rem_base)

-	rem_list = SortedDict()

+	rem_list = SortedDict(ignore_case = False)

 	break_now = False

 	for object in response['list']:

 		if object['Key'] == rem_base_original and object['Key'][-1] != os.path.sep:

@@ -664,7 +664,7 @@ def _get_filelist_remote(remote_uri, recursive = True):

 def _filelist_filter_exclude_include(src_list):

 	info(u"Applying --exclude/--include")

 	cfg = Config()

-	exclude_list = SortedDict()

+	exclude_list = SortedDict(ignore_case = False)

 	for file in src_list.keys():

 		debug(u"CHECK: %s" % file)

 		excluded = False

@@ -693,7 +693,7 @@ def _filelist_filter_exclude_include(src_list):

 def _compare_filelists(src_list, dst_list, src_is_local_and_dst_is_remote):

 	info(u"Verifying attributes...")

 	cfg = Config()

-	exists_list = SortedDict()

+	exists_list = SortedDict(ignore_case = False)

 	for file in src_list.keys():

 		debug(u"CHECK: %s" % file)