MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49 from fkautz/pr_out_cleaning_up_more_code

Browse Source
This commit is contained in:
Frederick F. Kautz IV 2015-01-23 17:29:47 -08:00
commit caa80f201e
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,8 +32,8 @@ import (
type contentType int
const (
xmlType contentType = iota
jsonType = iota
xmlType contentType = iota
jsonType
)
const (
@ -65,14 +65,6 @@ func HttpHandler(storage mstorage.Storage) http.Handler {
return mux
}
func writeObjectHeaders(w http.ResponseWriter, metadata mstorage.ObjectMetadata) {
lastModified := metadata.Created.Format(time.RFC1123)
w.Header().Set("ETag", metadata.ETag)
w.Header().Set("Last-Modified", lastModified)
w.Header().Set("Content-Length", strconv.Itoa(metadata.Size))
w.Header().Set("Content-Type", "text/plain")
}
func (server *minioApi) getObjectHandler(w http.ResponseWriter, req *http.Request) {
vars := mux.Vars(req)
bucket := vars["bucket"]
@ -121,8 +113,9 @@ func (server *minioApi) headObjectHandler(w http.ResponseWriter, req *http.Reque
func (server *minioApi) listBucketsHandler(w http.ResponseWriter, req *http.Request) {
vars := mux.Vars(req)
prefix, ok := vars["prefix"]
if ok == false {
var prefix string
var ok bool
if prefix, ok = vars["prefix"]; ok == false {
prefix = ""
}
@ -150,17 +143,7 @@ func (server *minioApi) listBucketsHandler(w http.ResponseWriter, req *http.Requ
func (server *minioApi) listObjectsHandler(w http.ResponseWriter, req *http.Request) {
vars := mux.Vars(req)
//delimiter, ok := vars["delimiter"]
//encodingType, ok := vars["encoding-type"]
//marker, ok := vars["marker"]
//maxKeys, ok := vars["max-keys"]
bucket := vars["bucket"]
//bucket, ok := vars["bucket"]
//if ok == false {
// w.WriteHeader(http.StatusBadRequest)
// return
//}
prefix, ok := vars["prefix"]
if ok == false {
prefix = ""
@ -213,6 +196,16 @@ func (server *minioApi) putBucketHandler(w http.ResponseWriter, req *http.Reques
}
}
// Helpers
func writeObjectHeaders(w http.ResponseWriter, metadata mstorage.ObjectMetadata) {
lastModified := metadata.Created.Format(time.RFC1123)
w.Header().Set("ETag", metadata.ETag)
w.Header().Set("Last-Modified", lastModified)
w.Header().Set("Content-Length", strconv.Itoa(metadata.Size))
w.Header().Set("Content-Type", "text/plain")
}
func generateBucketsListResult(buckets []mstorage.BucketMetadata) (data BucketListResponse) {
var listbuckets []*Bucket