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

fix s3 key list and missing key response

Browse source
This commit is contained in:
Steve Pulec 2013-02-27 01:12:11 -05:00
commit b0d89bb7b7
3 changed files with 121 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

27
moto/s3/models.py
View file

@ -16,6 +16,10 @@ class FakeKey(object):
value_md5.update(self.value)
return '"{0}"'.format(value_md5.hexdigest())
@property
def size(self):
return len(self.value)
class FakeBucket(object):
def __init__(self, name):
@ -60,6 +64,29 @@ class S3Backend(BaseBackend):
bucket = self.buckets[bucket_name]
return bucket.keys.get(key_name)
def prefix_query(self, bucket, prefix):
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]
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:
folder_results.add(key_name.split("/")[0])
else:
key_results.add(key)
key_results = sorted(key_results, key=lambda key: key.name)
folder_results = [folder_name for folder_name in sorted(folder_results, key=lambda key: key)]
return key_results, folder_results
def delete_key(self, bucket_name, key_name):
bucket = self.buckets[bucket_name]
return bucket.keys.pop(key_name)