MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-20 09:56:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adding IsTruncated to minioapi

Browse Source
This commit is contained in:
Frederick F. Kautz IV
2015-01-25 13:32:39 -08:00
parent 39208601dc
commit d37bbfec41
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/webapi/minioapi/minioapi.go
View File

@@ -189,8 +189,8 @@ func (server *minioApi) listObjectsHandler(w http.ResponseWriter, req *http.Requ
}
}
objects := server.storage.ListObjects(bucket, prefix, 1000)
response := generateObjectsListResult(bucket, objects)
objects, isTruncated := server.storage.ListObjects(bucket, prefix, 1000)
response := generateObjectsListResult(bucket, objects, isTruncated)
var bytesBuffer bytes.Buffer
var encoder encoder
@@ -269,7 +269,7 @@ func generateBucketsListResult(buckets []mstorage.BucketMetadata) BucketListResp
return data
}
func generateObjectsListResult(bucket string, objects []mstorage.ObjectMetadata) ObjectListResponse {
func generateObjectsListResult(bucket string, objects []mstorage.ObjectMetadata, isTruncated bool) ObjectListResponse {
var contents []*Item
var owner = Owner{}
var data = ObjectListResponse{}
@@ -290,6 +290,6 @@ func generateObjectsListResult(bucket string, objects []mstorage.ObjectMetadata)
data.Name = bucket
data.Contents = contents
data.MaxKeys = MAX_OBJECT_LIST
data.IsTruncated = false
data.IsTruncated = isTruncated
return data
}

4
pkg/webapi/minioapi/minioapi_test.go
View File

@@ -237,7 +237,7 @@ func (s *MySuite) TestPutObject(c *C) {
testServer := httptest.NewServer(httpHandler)
defer testServer.Close()
objects := storage.ListObjects("bucket", "", 1000)
objects, _ := storage.ListObjects("bucket", "", 1000)
c.Assert(len(objects), Equals, 0)
date1 := time.Now()
@@ -260,7 +260,7 @@ func (s *MySuite) TestPutObject(c *C) {
date2 := time.Now()
objects = storage.ListObjects("bucket", "", 1000)
objects, _ = storage.ListObjects("bucket", "", 1000)
c.Assert(len(objects), Equals, 1)
var writer bytes.Buffer