MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-11 23:13:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43 from harshavardhana/pr_out_list_buckets_response_should_be_nested_xml_buckets

Browse Source
This commit is contained in:
Harshavardhana 2015-01-23 01:57:44 -08:00
commit 3e11e9a879
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,9 @@ type ObjectListResponse struct {
type BucketListResponse struct {
XMLName xml.Name `xml:"ListAllMyBucketsResult"`
Owner Owner
Buckets []Bucket `xml:"Buckets",innerxml`
Buckets struct {
Bucket []*Bucket
} `xml:"Buckets",innerxml` // Buckets are nested
}
type Bucket struct {

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

@ -115,9 +115,12 @@ func (server *minioApi) listBucketsHandler(w http.ResponseWriter, req *http.Requ
if ok == false {
prefix = ""
}
contentType := "xml"
if req.Header["Accept"][0] == "application/json" {
contentType = "json"
if _, ok := req.Header["Accept"]; ok {
if req.Header["Accept"][0] == "application/json" {
contentType = "json"
}
}
buckets := server.storage.ListBuckets(prefix)
response := generateBucketsListResult(buckets)
@ -128,13 +131,11 @@ func (server *minioApi) listBucketsHandler(w http.ResponseWriter, req *http.Requ
w.Header().Set("Content-Type", "application/json")
encoder = json.NewEncoder(&bytesBuffer)
} else {
w.Header().Set("Content-Type", "application/xml")
w.Header().Set("Content-Type", `xml version="1.0" encoding="UTF-8"`)
encoder = xml.NewEncoder(&bytesBuffer)
}
encoder.Encode(response)
w.Write(bytesBuffer.Bytes())
}
func (server *minioApi) listObjectsHandler(w http.ResponseWriter, req *http.Request) {
@ -157,8 +158,10 @@ func (server *minioApi) listObjectsHandler(w http.ResponseWriter, req *http.Requ
contentType := "xml"
if req.Header["Accept"][0] == "application/json" {
contentType = "json"
if _, ok := req.Header["Accept"]; ok {
if req.Header["Accept"][0] == "application/json" {
contentType = "json"
}
}
objects := server.storage.ListObjects(bucket, prefix, 1000)
@ -170,7 +173,7 @@ func (server *minioApi) listObjectsHandler(w http.ResponseWriter, req *http.Requ
w.Header().Set("Content-Type", "application/json")
encoder = json.NewEncoder(&bytesBuffer)
} else {
w.Header().Set("Content-Type", "application/xml")
w.Header().Set("Content-Type", `xml version="1.0" encoding="UTF-8"`)
encoder = xml.NewEncoder(&bytesBuffer)
}
encoder.Encode(response)
@ -202,7 +205,7 @@ func (server *minioApi) putBucketHandler(w http.ResponseWriter, req *http.Reques
}
func generateBucketsListResult(buckets []mstorage.BucketMetadata) (data BucketListResponse) {
listbuckets := []Bucket{}
var listbuckets []*Bucket
owner := Owner{
ID: "minio",
@ -210,7 +213,7 @@ func generateBucketsListResult(buckets []mstorage.BucketMetadata) (data BucketLi
}
for _, bucket := range buckets {
listbucket := Bucket{
listbucket := &Bucket{
Name: bucket.Name,
CreationDate: formatDate(bucket.Created),
}
@ -218,9 +221,9 @@ func generateBucketsListResult(buckets []mstorage.BucketMetadata) (data BucketLi
}
data = BucketListResponse{
Owner: owner,
Buckets: listbuckets,
Owner: owner,
}
data.Buckets.Bucket = listbuckets
return
}