Merge pull request #71 from iineva/v2

V2

cmd/ipasd/service/transport.go

@@ -73,7 +73,7 @@ func MakeAddEndpoint(srv Service) endpoint.Endpoint {
 			return nil, fmt.Errorf("do not support %s file", path.Ext(p.file.FileName()))
 		}
 
-		app, err := srv.Add(buf, buf.Size(), t)
+		app, err := srv.Add(buf, p.file.Size(), t)
 		if err != nil {
 			return nil, err
 		}
@@ -217,4 +217,4 @@ func tryMatchID(id string) error {
 		return ErrIdInvalid
 	}
 	return nil
-}
+}

pkg/multipart/multipart.go

@@ -7,6 +7,7 @@ import (
 	"mime"
 	"mime/multipart"
 	"net/http"
+	"strconv"
 )
 
 type MultipartForm struct {
@@ -17,7 +18,7 @@ type FormFile struct {
 	part     *multipart.Part
 	name     string // form name
 	filename string // file name
-	// size     int64  // readed size
+	size     int64  // readed size
 }
 
 var _ io.Reader = (*FormFile)(nil)
@@ -43,10 +44,17 @@ func (m *MultipartForm) GetFormFile(targetName string) (*FormFile, error) {
 	}
 	filename := p.FileName()
 
+	s := m.r.Header.Get("Content-Length")
+	size, err := strconv.ParseInt(s, 10, 64)
+	if err != nil {
+		return nil, err
+	}
+
 	return &FormFile{
 		part:     p,
 		name:     name,
 		filename: filename,
+		size:     size,
 	}, nil
 }
 
@@ -79,3 +87,7 @@ func (f *FormFile) FileName() string {
 func (f *FormFile) Name() string {
 	return f.name
 }
+
+func (f *FormFile) Size() int64 {
+	return f.size
+}