X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tq%2Fbasic_upload.go;h=8e7a3d3793b611a09745c28553b517f0df4bd422;hb=342dfef3098e19e566e53cadd9c5c75660bdb1fd;hp=00ced92e41d33a1fb02d8773ecb0b856be53d492;hpb=5cf3e0186958f7b628484818806f75aa03e6c09c;p=scm%2Ftest.git

diff --git a/tq/basic_upload.go b/tq/basic_upload.go
index 00ced92..8e7a3d3 100644
--- a/tq/basic_upload.go
+++ b/tq/basic_upload.go
@@ -3,6 +3,7 @@ package tq
 import (
 	"io"
 	"io/ioutil"
+	"net/http"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -14,7 +15,8 @@ import (
 )
 
 const (
-	BasicAdapterName = "basic"
+	BasicAdapterName   = "basic"
+	defaultContentType = "application/octet-stream"
 )
 
 // Adapter for basic uploads (non resumable)
@@ -56,10 +58,6 @@ func (a *basicUploadAdapter) DoTransfer(ctx interface{}, t *Transfer, cb Progres
 		return err
 	}
 
-	if len(req.Header.Get("Content-Type")) == 0 {
-		req.Header.Set("Content-Type", "application/octet-stream")
-	}
-
 	if req.Header.Get("Transfer-Encoding") == "chunked" {
 		req.TransferEncoding = []string{"chunked"}
 	} else {
@@ -74,6 +72,10 @@ func (a *basicUploadAdapter) DoTransfer(ctx interface{}, t *Transfer, cb Progres
 	}
 	defer f.Close()
 
+	if err := setContentTypeFor(req, f); err != nil {
+		return err
+	}
+
 	// Ensure progress callbacks made while uploading
 	// Wrap callback to give name context
 	ccb := func(totalSize int64, readSoFar int64, readSinceLast int) error {
@@ -171,3 +173,27 @@ func configureBasicUploadAdapter(m *Manifest) {
 		return nil
 	})
 }
+
+func setContentTypeFor(req *http.Request, r io.ReadSeeker) error {
+	if len(req.Header.Get("Content-Type")) != 0 {
+		return nil
+	}
+
+	buffer := make([]byte, 512)
+	n, err := r.Read(buffer)
+	if err != nil && err != io.EOF {
+		return errors.Wrap(err, "content type detect")
+	}
+
+	contentType := http.DetectContentType(buffer[:n])
+	if _, err := r.Seek(0, 0); err != nil {
+		return errors.Wrap(err, "content type rewind")
+	}
+
+	if contentType == "" {
+		contentType = defaultContentType
+	}
+
+	req.Header.Set("Content-Type", contentType)
+	return nil
+}