|
|
|
@ -545,9 +545,6 @@ func (donut API) ListObjects(bucket string, resources BucketResourcesMetadata, s |
|
|
|
|
} |
|
|
|
|
resources.CommonPrefixes = listObjects.CommonPrefixes |
|
|
|
|
resources.IsTruncated = listObjects.IsTruncated |
|
|
|
|
if resources.IsTruncated && resources.Delimiter != "" { |
|
|
|
|
resources.NextMarker = results[len(results)-1].Object |
|
|
|
|
} |
|
|
|
|
for key := range listObjects.Objects { |
|
|
|
|
keys = append(keys, key) |
|
|
|
|
} |
|
|
|
@ -555,6 +552,9 @@ func (donut API) ListObjects(bucket string, resources BucketResourcesMetadata, s |
|
|
|
|
for _, key := range keys { |
|
|
|
|
results = append(results, listObjects.Objects[key]) |
|
|
|
|
} |
|
|
|
|
if resources.IsTruncated && resources.Delimiter != "" { |
|
|
|
|
resources.NextMarker = results[len(results)-1].Object |
|
|
|
|
} |
|
|
|
|
return results, resources, nil |
|
|
|
|
} |
|
|
|
|
storedBucket := donut.storedBuckets.Get(bucket).(storedBucket) |
|
|
|
|