change: ReadUnmarshalFunc func(reader io.ReadCloser, header http.Head…

…er, v interface{}) error; add FileUnmarshaler

Unmarshaler.go

@@ -8,10 +8,10 @@ import (
 
 type (
 	ReadUnmarshaler interface {
-		Unmarshal(reader io.Reader, header http.Header, v interface{}) error
+		Unmarshal(reader io.ReadCloser, header http.Header, v interface{}) error
 	}
 
-	ReadUnmarshalFunc func(reader io.Reader, header http.Header, v interface{}) error
+	ReadUnmarshalFunc func(reader io.ReadCloser, header http.Header, v interface{}) error
 
 	ReaderAdapter struct {
 		unmarshaler Unmarshaler
@@ -40,13 +40,14 @@ func (fn UnmarshalFunc) Unmarshal(data []byte, v interface{}) error {
 	return fn(data, v)
 }
 
-func (fn ReadUnmarshalFunc) Unmarshal(reader io.Reader, header http.Header, v interface{}) error {
+func (fn ReadUnmarshalFunc) Unmarshal(reader io.ReadCloser, header http.Header, v interface{}) error {
 	return fn(reader, header, v)
 }
 
-func (adapter *ReaderAdapter) Unmarshal(reader io.Reader, header http.Header, v interface{}) (err error) {
+func (adapter *ReaderAdapter) Unmarshal(reader io.ReadCloser, header http.Header, v interface{}) (err error) {
 	var body []byte
 	body, err = ioutil.ReadAll(reader)
+	reader.Close()
 	if err == nil {
 		err = adapter.unmarshaler.Unmarshal(body, v)
 	}

VarsCtr.go

@@ -312,7 +312,6 @@ func (parser *VarsParser) setContentType(contentType string) {
 	parser.contentType = contentType
 }
 
-// TODO: test it
 // can only be called by parse()
 func (parser *VarsParser) checkContentType(contentType string) (err error) {
 	switch contentType {

builder_test.go

@@ -93,9 +93,10 @@ func TestBuilder_AddReaderUnmarshalerFunc(t *testing.T) {
 
 	creator, err := gotten.NewBuilder().
 		SetBaseUrl("https://mock.io").
-		AddReadUnmarshalFunc(func(body io.Reader, _ http.Header, v interface{}) (err error) {
+		AddReadUnmarshalFunc(func(body io.ReadCloser, _ http.Header, v interface{}) (err error) {
 			var data []byte
 			data, err = ioutil.ReadAll(body)
+			body.Close()
 			if err == nil {
 				var success bool
 				success, err = strconv.ParseBool(string(data))

unmarshalers/ErrorMessages.go

@@ -0,0 +1,5 @@
+package unmarshalers
+
+const (
+	ContentDispositionOrFilenameEmpty = "Content-Disposition or filename is empty"
+)

unmarshalers/FileUnmarshaler.go

@@ -0,0 +1,61 @@
+package unmarshalers
+
+import (
+	"errors"
+	"github.com/Hexilee/gotten/headers"
+	"io"
+	"mime"
+	"net/http"
+	"path"
+)
+
+type (
+	Filename int
+	FileUnmarshaler struct {
+		basePath      string // Default: wd
+		extensionName string // ZeroStr means keep the same extension name with Content-Disposition or Content-Type
+		discard       bool
+		filename      Filename // Default: ContentDisposition
+	}
+)
+
+const (
+	// Filename
+	ContentDisposition Filename = iota // as the same as the filename in Content-Disposition
+	Hash                               // md5
+	HashHeader                         // hash-filename
+)
+
+const (
+	ZeroStr = ""
+)
+
+func (unmarshaler FileUnmarshaler) Unmarshal(reader io.Reader, header http.Header, v interface{}) (err error) {
+	var filename string
+	var ext string
+	var hash string
+	contentDisposition := header.Get(headers.HeaderContentDisposition)
+	if contentDisposition != ZeroStr {
+		_, params, err := mime.ParseMediaType(contentDisposition)
+		if err == nil {
+			filename = params["filename"]
+			ext = path.Ext(filename)
+		}
+	}
+
+	if err == nil {
+		if (contentDisposition == ZeroStr || filename == ZeroStr) &&
+			(unmarshaler.filename == ContentDisposition || unmarshaler.filename == HashHeader) {
+			err = errors.New(ContentDispositionOrFilenameEmpty)
+		}
+
+		if err == nil {
+			switch unmarshaler.filename {
+			case ContentDisposition:
+				_ = ext
+				_ = hash
+			}
+		}
+	}
+	return
+}