Add lexicographic Marker/NextMarker support for recursive listing of objects.

Also update times when an object is accessed logic

pkg/api/api_definitions.go

@@ -27,45 +27,66 @@ const (
 
 // ListObjectsResponse - format for list objects response
 type ListObjectsResponse struct {
-	XMLName        xml.Name `xml:"http://doc.s3.amazonaws.com/2006-03-01 ListBucketResult" json:"-"`
-	Name           string
-	Prefix         string
-	Marker         string
-	MaxKeys        int
-	Delimiter      string
-	IsTruncated    bool
-	Contents       []*Item
-	CommonPrefixes []*Prefix
+	XMLName xml.Name `xml:"http://doc.s3.amazonaws.com/2006-03-01 ListBucketResult" json:"-"`
+
+	CommonPrefixes []*CommonPrefix
+	Contents       []*Object
+
+	Delimiter string
+
+	// Encoding type used to encode object keys in the response.
+	EncodingType string
+
+	// A flag that indicates whether or not ListObjects returned all of the results
+	// that satisfied the search criteria.
+	IsTruncated bool
+	Marker      string
+	MaxKeys     int
+	Name        string
+
+	// When response is truncated (the IsTruncated element value in the response
+	// is true), you can use the key name in this field as marker in the subsequent
+	// request to get next set of objects. Object storage lists objects in alphabetical
+	// order Note: This element is returned only if you have delimiter request parameter
+	// specified. If response does not include the NextMaker and it is truncated,
+	// you can use the value of the last Key in the response as the marker in the
+	// subsequent request to get the next set of object keys.
+	NextMarker string
+	Prefix     string
 }
 
 // ListBucketsResponse - format for list buckets response
 type ListBucketsResponse struct {
 	XMLName xml.Name `xml:"http://doc.s3.amazonaws.com/2006-03-01 ListAllMyBucketsResult" json:"-"`
-	Owner   Owner
+	// Container for one or more buckets.
 	Buckets struct {
 		Bucket []*Bucket
 	} // Buckets are nested
+	Owner Owner
 }
 
-// Prefix - common prefix
-type Prefix struct {
+// CommonPrefix container for prefix response in ListObjectsResponse
+type CommonPrefix struct {
 	Prefix string
 }
 
-// Bucket - bucket item
+// Bucket container for bucket metadata
 type Bucket struct {
 	Name         string
 	CreationDate string
 }
 
-// Item - object item
-type Item struct {
+// Object container for object metadata
+type Object struct {
+	ETag         string
 	Key          string
 	LastModified string
-	ETag         string
 	Size         int64
+
+	Owner Owner
+
+	// The class of storage used to store the object.
 	StorageClass string
-	Owner        Owner
 }
 
 // Owner - bucket owner/principal

pkg/api/api_response.go

@@ -57,7 +57,7 @@ func generateListBucketsResponse(buckets []drivers.BucketMetadata) ListBucketsRe
 }
 
 // itemKey
-type itemKey []*Item
+type itemKey []*Object
 
 func (b itemKey) Len() int           { return len(b) }
 func (b itemKey) Swap(i, j int)      { b[i], b[j] = b[j], b[i] }
@@ -72,8 +72,8 @@ func (b itemKey) Less(i, j int) bool { return b[i].Key < b[j].Key }
 // output:
 // populated struct that can be serialized to match xml and json api spec output
 func generateListObjectsResponse(bucket string, objects []drivers.ObjectMetadata, bucketResources drivers.BucketResourcesMetadata) ListObjectsResponse {
-	var contents []*Item
-	var prefixes []*Prefix
+	var contents []*Object
+	var prefixes []*CommonPrefix
 	var owner = Owner{}
 	var data = ListObjectsResponse{}
 
@@ -81,7 +81,7 @@ func generateListObjectsResponse(bucket string, objects []drivers.ObjectMetadata
 	owner.DisplayName = "minio"
 
 	for _, object := range objects {
-		var content = &Item{}
+		var content = &Object{}
 		if object.Key == "" {
 			continue
 		}
@@ -94,15 +94,17 @@ func generateListObjectsResponse(bucket string, objects []drivers.ObjectMetadata
 		contents = append(contents, content)
 	}
 	sort.Sort(itemKey(contents))
+	// TODO - support EncodingType in xml decoding
 	data.Name = bucket
 	data.Contents = contents
 	data.MaxKeys = bucketResources.Maxkeys
 	data.Prefix = bucketResources.Prefix
 	data.Delimiter = bucketResources.Delimiter
 	data.Marker = bucketResources.Marker
+	data.NextMarker = bucketResources.NextMarker
 	data.IsTruncated = bucketResources.IsTruncated
 	for _, prefix := range bucketResources.CommonPrefixes {
-		var prefixItem = &Prefix{}
+		var prefixItem = &CommonPrefix{}
 		prefixItem.Prefix = prefix
 		prefixes = append(prefixes, prefixItem)
 	}

pkg/api/resources.go

@@ -35,6 +35,8 @@ func getBucketResources(values url.Values) (v drivers.BucketResourcesMetadata) {
 			v.Maxkeys, _ = strconv.Atoi(value[0])
 		case key == "delimiter":
 			v.Delimiter = value[0]
+		case key == "encoding-type":
+			v.EncodingType = value[0]
 		}
 	}
 	return