Commit 51bfe06f authored by Matt Bell's avatar Matt Bell

commands/http: Support recursive multipart in MultiFileReader

parent 9d2ee4f1
...@@ -50,7 +50,7 @@ func (c *client) Send(req cmds.Request) (cmds.Response, error) { ...@@ -50,7 +50,7 @@ func (c *client) Send(req cmds.Request) (cmds.Response, error) {
var fileReader *MultiFileReader var fileReader *MultiFileReader
if req.Files() != nil { if req.Files() != nil {
fileReader = NewMultiFileReader(req.Files()) fileReader = NewMultiFileReader(req.Files(), true)
} }
path := strings.Join(req.Path(), "/") path := strings.Join(req.Path(), "/")
......
...@@ -2,8 +2,10 @@ package http ...@@ -2,8 +2,10 @@ package http
import ( import (
"bytes" "bytes"
"fmt"
"io" "io"
"mime/multipart" "mime/multipart"
"net/textproto"
cmds "github.com/jbenet/go-ipfs/commands" cmds "github.com/jbenet/go-ipfs/commands"
) )
...@@ -12,15 +14,20 @@ type MultiFileReader struct { ...@@ -12,15 +14,20 @@ type MultiFileReader struct {
io.Reader io.Reader
files cmds.File files cmds.File
currentFile cmds.File currentFile io.Reader
buf bytes.Buffer buf bytes.Buffer
mpWriter *multipart.Writer mpWriter *multipart.Writer
closed bool closed bool
// if true, the data will be type 'multipart/form-data'
// if false, the data will be type 'multipart/mixed'
form bool
} }
func NewMultiFileReader(file cmds.File) *MultiFileReader { func NewMultiFileReader(file cmds.File, form bool) *MultiFileReader {
mfr := &MultiFileReader{ mfr := &MultiFileReader{
files: file, files: file,
form: form,
} }
mfr.mpWriter = multipart.NewWriter(&mfr.buf) mfr.mpWriter = multipart.NewWriter(&mfr.buf)
...@@ -35,16 +42,42 @@ func (mfr *MultiFileReader) Read(buf []byte) (written int, err error) { ...@@ -35,16 +42,42 @@ func (mfr *MultiFileReader) Read(buf []byte) (written int, err error) {
// if the current file isn't set, advance to the next file // if the current file isn't set, advance to the next file
if mfr.currentFile == nil { if mfr.currentFile == nil {
mfr.currentFile, err = mfr.files.NextFile() file, err := mfr.files.NextFile()
if err == io.EOF || (err == nil && mfr.currentFile == nil) { if err == io.EOF || (err == nil && file == nil) {
mfr.mpWriter.Close() mfr.mpWriter.Close()
mfr.closed = true mfr.closed = true
} else if err != nil { } else if err != nil {
return 0, err return 0, err
} }
// handle starting a new file part
if !mfr.closed { if !mfr.closed {
_, err := mfr.mpWriter.CreateFormFile("file", mfr.currentFile.FileName()) if file.IsDirectory() {
// if file is a directory, create a multifilereader from it
// (using 'multipart/mixed')
mfr.currentFile = NewMultiFileReader(file, false)
} else {
// otherwise, use the file as a reader to read its contents
mfr.currentFile = file
}
// write the boundary and headers
header := make(textproto.MIMEHeader)
if mfr.form {
contentDisposition := fmt.Sprintf("form-data; name=\"file\"; filename=\"%s\"", file.FileName())
header.Set("Content-Disposition", contentDisposition)
} else {
header.Set("Content-Disposition", fmt.Sprintf("file; filename=\"%s\"", file.FileName()))
}
if file.IsDirectory() {
boundary := mfr.currentFile.(*MultiFileReader).Boundary()
header.Set("Content-Type", fmt.Sprintf("multipart/mixed; boundary=%s", boundary))
} else {
header.Set("Content-Type", "application/octet-stream")
}
_, err := mfr.mpWriter.CreatePart(header)
if err != nil { if err != nil {
return 0, err return 0, err
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment