Imported Upstream version 2.5.0

[scm/test.git] / tq / basic_upload.go

diff --git a/tq/basic_upload.go b/tq/basic_upload.go
index eb8bb49..8e7a3d3 100644 (file)
--- 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"
@@ -10,11 +11,12 @@ import (
 
        "github.com/git-lfs/git-lfs/errors"
        "github.com/git-lfs/git-lfs/lfsapi"
-       "github.com/git-lfs/git-lfs/progress"
+       "github.com/git-lfs/git-lfs/tools"
 )
 
 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 {
@@ -83,7 +85,7 @@ func (a *basicUploadAdapter) DoTransfer(ctx interface{}, t *Transfer, cb Progres
                return nil
        }
 
-       cbr := progress.NewBodyWithCallback(f, t.Size, ccb)
+       cbr := tools.NewBodyWithCallback(f, t.Size, ccb)
        var reader lfsapi.ReadSeekCloser = cbr
 
        // Signal auth was ok on first read; this frees up other workers to start
@@ -161,7 +163,7 @@ func configureBasicUploadAdapter(m *Manifest) {
        m.RegisterNewAdapterFunc(BasicAdapterName, Upload, func(name string, dir Direction) Adapter {
                switch dir {
                case Upload:
-                       bu := &basicUploadAdapter{newAdapterBase(name, dir, nil)}
+                       bu := &basicUploadAdapter{newAdapterBase(m.fs, name, dir, nil)}
                        // self implements impl
                        bu.transferImpl = bu
                        return bu
@@ -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
+}