catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix S3 bucket list objects order and delimiters. Closes #14.

Browse source
This commit is contained in:
Steve Pulec 2013-04-13 19:23:32 -04:00
commit be26daaff4
3 changed files with 51 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

10
moto/s3/models.py
View file

@ -87,20 +87,22 @@ class S3Backend(BaseBackend):
if bucket:
return bucket.keys.get(key_name)
def prefix_query(self, bucket, prefix):
def prefix_query(self, bucket, prefix, delimiter):
key_results = set()
folder_results = set()
if prefix:
for key_name, key in bucket.keys.iteritems():
if key_name.startswith(prefix):
if '/' in key_name.lstrip(prefix):
key_without_prefix = key_name.lstrip(prefix).split("/")[0]
if delimiter and '/' in key_name.lstrip(prefix):
# If delimiter, we need to split out folder_results
key_without_prefix = "{}/".format(key_name.lstrip(prefix).split("/")[0])
folder_results.add("{}{}".format(prefix, key_without_prefix))
else:
key_results.add(key)
else:
for key_name, key in bucket.keys.iteritems():
if '/' in key_name:
if delimiter and '/' in key_name:
# If delimiter, we need to split out folder_results
folder_results.add(key_name.split("/")[0])
else:
key_results.add(key)