Implement delimiter, path prefix

pkg/api/minioapi/api_test.go

@@ -28,6 +28,7 @@ import (
 	"testing"
 	"time"
 
+	mstorage "github.com/minio-io/minio/pkg/storage"
 	"github.com/minio-io/minio/pkg/storage/inmemory"
 	. "gopkg.in/check.v1"
 )
@@ -243,9 +244,13 @@ func (s *MySuite) TestPutObject(c *C) {
 	testServer := httptest.NewServer(httpHandler)
 	defer testServer.Close()
 
-	objects, isTruncated, err := storage.ListObjects("bucket", "", 1000)
+	resources := mstorage.BucketResourcesMetadata{}
+
+	resources.Maxkeys = 1000
+	resources.Prefix = ""
+	objects, resources, err := storage.ListObjects("bucket", resources)
 	c.Assert(len(objects), Equals, 0)
-	c.Assert(isTruncated, Equals, false)
+	c.Assert(resources.IsTruncated, Equals, false)
 	c.Assert(err, Not(IsNil))
 
 	date1 := time.Now()
@@ -268,9 +273,12 @@ func (s *MySuite) TestPutObject(c *C) {
 
 	date2 := time.Now()
 
-	objects, isTruncated, err = storage.ListObjects("bucket", "", 1000)
+	resources.Maxkeys = 1000
+	resources.Prefix = ""
+
+	objects, resources, err = storage.ListObjects("bucket", resources)
 	c.Assert(len(objects), Equals, 1)
-	c.Assert(isTruncated, Equals, false)
+	c.Assert(resources.IsTruncated, Equals, false)
 	c.Assert(err, IsNil)
 
 	var writer bytes.Buffer

pkg/api/minioapi/bucket_handlers.go

@@ -35,17 +35,17 @@ func (server *minioApi) listObjectsHandler(w http.ResponseWriter, req *http.Requ
 	bucket := vars["bucket"]
 
 	resources := getBucketResources(req.URL.Query())
-	if resources.policy == true {
+	if resources.Policy == true {
 		server.getBucketPolicyHandler(w, req)
 		return
 	}
 
 	acceptsContentType := getContentType(req)
-	objects, isTruncated, err := server.storage.ListObjects(bucket, resources.prefix, 1000)
+	objects, resources, err := server.storage.ListObjects(bucket, resources)
 	switch err := err.(type) {
 	case nil: // success
 		{
-			response := generateObjectsListResult(bucket, objects, isTruncated)
+			response := generateObjectsListResult(bucket, objects, resources.IsTruncated)
 			w.Write(writeObjectHeadersAndResponse(w, response, acceptsContentType))
 		}
 	case mstorage.BucketNotFound:
@@ -74,7 +74,7 @@ func (server *minioApi) listObjectsHandler(w http.ResponseWriter, req *http.Requ
 	case mstorage.ObjectNameInvalid:
 		{
 			error := errorCodeError(NoSuchKey)
-			errorResponse := getErrorResponse(error, resources.prefix)
+			errorResponse := getErrorResponse(error, resources.Prefix)
 			w.WriteHeader(error.HttpStatusCode)
 			w.Write(writeErrorResponse(w, errorResponse, acceptsContentType))
 		}
@@ -122,7 +122,7 @@ func (server *minioApi) putBucketHandler(w http.ResponseWriter, req *http.Reques
 	err := server.storage.StoreBucket(bucket)
 
 	resources := getBucketResources(req.URL.Query())
-	if resources.policy == true {
+	if resources.Policy == true {
 		server.putBucketPolicyHandler(w, req)
 		return
 	}

pkg/api/minioapi/definitions.go

@@ -27,12 +27,17 @@ const (
 
 // Object list response format
 type ObjectListResponse struct {
-	XMLName     xml.Name `xml:"ListBucketResult" json:"-"`
-	Name        string
-	Marker      string
-	MaxKeys     int
-	IsTruncated bool
-	Contents    []*Item `xml:,innerxml`
+	XMLName        xml.Name `xml:"ListBucketResult" json:"-"`
+	Name           string
+	Prefix         string
+	Marker         string
+	MaxKeys        int
+	Delimiter      string
+	IsTruncated    bool
+	Contents       []*Item `xml:,innerxml`
+	CommonPrefixes struct {
+		Prefix string
+	} `xml:,innerxml`
 }
 
 // Bucket list response format

pkg/api/minioapi/object_handlers.go

@@ -130,7 +130,7 @@ func (server *minioApi) putObjectHandler(w http.ResponseWriter, req *http.Reques
 	object = vars["object"]
 
 	resources := getBucketResources(req.URL.Query())
-	if resources.policy == true && object == "" {
+	if resources.Policy == true && object == "" {
 		server.putBucketPolicyHandler(w, req)
 		return
 	}

pkg/api/minioapi/resources.go

@@ -19,32 +19,24 @@ package minioapi
 import (
 	"net/url"
 	"strconv"
+
+	mstorage "github.com/minio-io/minio/pkg/storage"
 )
 
-// support bucket resources go here
-type bucketResources struct {
-	prefix    string
-	marker    string
-	maxkeys   int
-	policy    bool
-	delimiter string
-	//	uploads   bool - TODO implemented with multipart support
-}
-
 // parse bucket url queries
-func getBucketResources(values url.Values) (v bucketResources) {
+func getBucketResources(values url.Values) (v mstorage.BucketResourcesMetadata) {
 	for key, value := range values {
 		switch true {
 		case key == "prefix":
-			v.prefix = value[0]
+			v.Prefix = value[0]
 		case key == "marker":
-			v.marker = value[0]
-		case key == "maxkeys":
-			v.maxkeys, _ = strconv.Atoi(value[0])
+			v.Marker = value[0]
+		case key == "max-keys":
+			v.Maxkeys, _ = strconv.Atoi(value[0])
 		case key == "policy":
-			v.policy = true
+			v.Policy = true
 		case key == "delimiter":
-			v.delimiter = value[0]
+			v.Delimiter = value[0]
 		}
 	}
 	return