Collapse GetPartialObject() into GetObject()

pkg/server/api/headers.go

@@ -78,23 +78,30 @@ func encodeErrorResponse(response interface{}, acceptsType contentType) []byte {
 }
 
 // Write object header
-func setObjectHeaders(w http.ResponseWriter, metadata donut.ObjectMetadata) {
+func setObjectHeaders(w http.ResponseWriter, metadata donut.ObjectMetadata, contentRange *httpRange) {
+	// set common headers
+	if contentRange != nil {
+		if contentRange.length > 0 {
+			setCommonHeaders(w, metadata.Metadata["contentType"], int(contentRange.length))
+		} else {
+			setCommonHeaders(w, metadata.Metadata["contentType"], int(metadata.Size))
+		}
+	} else {
+		setCommonHeaders(w, metadata.Metadata["contentType"], int(metadata.Size))
+	}
+	// set object headers
 	lastModified := metadata.Created.Format(http.TimeFormat)
-	// common headers
-	setCommonHeaders(w, metadata.Metadata["contentType"], int(metadata.Size))
 	// object related headers
 	w.Header().Set("ETag", "\""+metadata.MD5Sum+"\"")
 	w.Header().Set("Last-Modified", lastModified)
-}
 
-// Write range object header
-func setRangeObjectHeaders(w http.ResponseWriter, metadata donut.ObjectMetadata, contentRange *httpRange) {
-	// set common headers
-	setCommonHeaders(w, metadata.Metadata["contentType"], int(metadata.Size))
-	// set object headers
-	setObjectHeaders(w, metadata)
 	// set content range
-	w.Header().Set("Content-Range", contentRange.getContentRange())
+	if contentRange != nil {
+		if contentRange.start > 0 || contentRange.length > 0 {
+			w.Header().Set("Content-Range", contentRange.String())
+			w.WriteHeader(http.StatusPartialContent)
+		}
+	}
 }
 
 func encodeSuccessResponse(response interface{}, acceptsType contentType) []byte {

pkg/server/api/object-handlers.go

@@ -69,26 +69,16 @@ func (api Minio) GetObjectHandler(w http.ResponseWriter, req *http.Request) {
 	switch iodine.ToError(err).(type) {
 	case nil: // success
 		{
-			httpRange, err := getRequestedRange(req, metadata.Size)
+			httpRange, err := getRequestedRange(req.Header.Get("Range"), metadata.Size)
 			if err != nil {
 				writeErrorResponse(w, req, InvalidRange, acceptsContentType, req.URL.Path)
 				return
 			}
-			switch httpRange.start == 0 && httpRange.length == 0 {
-			case true:
-				setObjectHeaders(w, metadata)
-				if _, err := api.Donut.GetObject(w, bucket, object); err != nil {
-					// unable to write headers, we've already printed data. Just close the connection.
-					log.Error.Println(iodine.New(err, nil))
-				}
-			case false:
-				metadata.Size = httpRange.length
-				setRangeObjectHeaders(w, metadata, httpRange)
-				w.WriteHeader(http.StatusPartialContent)
-				if _, err := api.Donut.GetPartialObject(w, bucket, object, httpRange.start, httpRange.length); err != nil {
-					// unable to write headers, we've already printed data. Just close the connection.
-					log.Error.Println(iodine.New(err, nil))
-				}
+			setObjectHeaders(w, metadata, httpRange)
+			if _, err := api.Donut.GetObject(w, bucket, object, httpRange.start, httpRange.length); err != nil {
+				// unable to write headers, we've already printed data. Just close the connection.
+				log.Error.Println(iodine.New(err, nil))
+				return
 			}
 		}
 	case donut.SignatureDoesNotMatch:
@@ -144,7 +134,7 @@ func (api Minio) HeadObjectHandler(w http.ResponseWriter, req *http.Request) {
 	metadata, err := api.Donut.GetObjectMetadata(bucket, object, signature)
 	switch iodine.ToError(err).(type) {
 	case nil:
-		setObjectHeaders(w, metadata)
+		setObjectHeaders(w, metadata, nil)
 		w.WriteHeader(http.StatusOK)
 	case donut.SignatureDoesNotMatch:
 		writeErrorResponse(w, req, SignatureDoesNotMatch, acceptsContentType, req.URL.Path)

pkg/server/api/range.go

@@ -19,9 +19,11 @@ package api
 import (
 	"errors"
 	"fmt"
-	"net/http"
 	"strconv"
 	"strings"
+
+	"github.com/minio/minio/pkg/donut"
+	"github.com/minio/minio/pkg/iodine"
 )
 
 const (
@@ -33,23 +35,23 @@ type httpRange struct {
 	start, length, size int64
 }
 
-// GetContentRange populate range header
-func (r *httpRange) getContentRange() string {
+// String populate range stringer interface
+func (r *httpRange) String() string {
 	return fmt.Sprintf("bytes %d-%d/%d", r.start, r.start+r.length-1, r.size)
 }
 
 // Grab new range from request header
-func getRequestedRange(req *http.Request, size int64) (*httpRange, error) {
+func getRequestedRange(hrange string, size int64) (*httpRange, error) {
 	r := &httpRange{
 		start:  0,
 		length: 0,
 		size:   0,
 	}
 	r.size = size
-	if s := req.Header.Get("Range"); s != "" {
-		err := r.parseRange(s)
+	if hrange != "" {
+		err := r.parseRange(hrange)
 		if err != nil {
-			return nil, err
+			return nil, iodine.New(err, nil)
 		}
 	}
 	return r, nil
@@ -58,7 +60,7 @@ func getRequestedRange(req *http.Request, size int64) (*httpRange, error) {
 func (r *httpRange) parse(ra string) error {
 	i := strings.Index(ra, "-")
 	if i < 0 {
-		return errors.New("invalid range")
+		return iodine.New(donut.InvalidRange{}, nil)
 	}
 	start, end := strings.TrimSpace(ra[:i]), strings.TrimSpace(ra[i+1:])
 	if start == "" {
@@ -66,7 +68,7 @@ func (r *httpRange) parse(ra string) error {
 		// range start relative to the end of the file.
 		i, err := strconv.ParseInt(end, 10, 64)
 		if err != nil {
-			return errors.New("invalid range")
+			return iodine.New(donut.InvalidRange{}, nil)
 		}
 		if i > r.size {
 			i = r.size
@@ -76,7 +78,7 @@ func (r *httpRange) parse(ra string) error {
 	} else {
 		i, err := strconv.ParseInt(start, 10, 64)
 		if err != nil || i > r.size || i < 0 {
-			return errors.New("invalid range")
+			return iodine.New(donut.InvalidRange{}, nil)
 		}
 		r.start = i
 		if end == "" {
@@ -85,7 +87,7 @@ func (r *httpRange) parse(ra string) error {
 		} else {
 			i, err := strconv.ParseInt(end, 10, 64)
 			if err != nil || r.start > i {
-				return errors.New("invalid range")
+				return iodine.New(donut.InvalidRange{}, nil)
 			}
 			if i >= r.size {
 				i = r.size - 1
@@ -99,24 +101,24 @@ func (r *httpRange) parse(ra string) error {
 // parseRange parses a Range header string as per RFC 2616.
 func (r *httpRange) parseRange(s string) error {
 	if s == "" {
-		return errors.New("header not present")
+		return iodine.New(errors.New("header not present"), nil)
 	}
 	if !strings.HasPrefix(s, b) {
-		return errors.New("invalid range")
+		return iodine.New(donut.InvalidRange{}, nil)
 	}
 
 	ras := strings.Split(s[len(b):], ",")
 	if len(ras) == 0 {
-		return errors.New("invalid request")
+		return iodine.New(errors.New("invalid request"), nil)
 	}
 	// Just pick the first one and ignore the rest, we only support one range per object
 	if len(ras) > 1 {
-		return errors.New("multiple ranges specified")
+		return iodine.New(errors.New("multiple ranges specified"), nil)
 	}
 
 	ra := strings.TrimSpace(ras[0])
 	if ra == "" {
-		return errors.New("invalid range")
+		return iodine.New(donut.InvalidRange{}, nil)
 	}
 	return r.parse(ra)
 }