Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle 'marker' paginating parameter in the list-objects query

Browse Source
This commit is contained in:
Julien Duchesne 2017-09-09 00:25:02 -04:00
parent a0283fc1ca
commit 0ddbcb5464
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
moto/s3/responses.py
View File

@ -276,8 +276,13 @@ class ResponseObject(_TemplateEnvironmentMixin):
if prefix and isinstance(prefix, six.binary_type): if prefix and isinstance(prefix, six.binary_type):
prefix = prefix.decode("utf-8") prefix = prefix.decode("utf-8")
delimiter = querystring.get('delimiter', [None])[0] delimiter = querystring.get('delimiter', [None])[0]
marker = querystring.get('marker', [None])[0]
result_keys, result_folders = self.backend.prefix_query( result_keys, result_folders = self.backend.prefix_query(
bucket, prefix, delimiter) bucket, prefix, delimiter)
if marker:
result_keys = self._get_results_from_token(result_keys, marker)
template = self.response_template(S3_BUCKET_GET_RESPONSE) template = self.response_template(S3_BUCKET_GET_RESPONSE)
return 200, {}, template.render( return 200, {}, template.render(
bucket=bucket, bucket=bucket,
@ -305,12 +310,7 @@ class ResponseObject(_TemplateEnvironmentMixin):
if continuation_token or start_after: if continuation_token or start_after:
limit = continuation_token or start_after limit = continuation_token or start_after
continuation_index = 0 result_keys = self._get_results_from_token(result_keys, limit)
for key in result_keys:
if key.name > limit:
break
continuation_index += 1
result_keys = result_keys[continuation_index:]
if len(result_keys) > max_keys: if len(result_keys) > max_keys:
is_truncated = 'true' is_truncated = 'true'
@ -333,6 +333,15 @@ class ResponseObject(_TemplateEnvironmentMixin):
start_after=None if continuation_token else start_after start_after=None if continuation_token else start_after
) )
def _get_results_from_token(self, result_keys, token):
continuation_index = 0
for key in result_keys:
if key.name > token:
break
continuation_index += 1
return result_keys[continuation_index:]
def _bucket_response_put(self, request, body, region_name, bucket_name, querystring, headers): def _bucket_response_put(self, request, body, region_name, bucket_name, querystring, headers):
if not request.headers.get('Content-Length'): if not request.headers.get('Content-Length'):
return 411, {}, "Content-Length required" return 411, {}, "Content-Length required"