remove another copy

filing/fs_weed/formdata.go

 package fs_weed
 
 import (
-	"bytes"
 	"fmt"
 	"io"
-	"log"
 	"mime/multipart"
 	"net/textproto"
+
+	"gitlab.com/gfxlabs/goutil/bufpool"
 )
 
 func makeFormData(
 	filename, mimeType string,
-	content io.Reader,
-) (formData *bytes.Buffer, contentType string, err error) {
-	buf := new(bytes.Buffer)
+	content []byte,
+) (formData *bufpool.PooledBuffer, err error) {
+	buf := BUFPOOL.Get()
 	writer := multipart.NewWriter(buf)
+	defer writer.Close()
 	part, err := createFormFile(writer, "file", filename, mimeType)
 	if err != nil {
-		log.Println(err)
-		return
+		return buf, err
 	}
-	_, err = io.Copy(part, content)
+	_, err = part.Write(content)
 	if err != nil {
-		log.Println(err)
-		return
+		return buf, err
 	}
-	formData = buf
-	contentType = writer.FormDataContentType()
-	writer.Close()
-	return
+	return buf, err
 }
 
 func createFormFile(writer *multipart.Writer, fieldname, filename, mime string) (io.Writer, error) {

filing/fs_weed/weed.go

 package fs_weed
 
 import (
-	"bytes"
 	"encoding/json"
 	"errors"
 	"io"
@@ -115,11 +114,13 @@ func (F *FS) get(file string) (http.Header, []byte, error) {
 func (F *FS) push(
 	file, content string, dat []byte,
 ) (http.Header, []byte, error) {
-	if content == "" {
-		content = http.DetectContentType(dat)
+	contentType := content
+	if contentType == "" {
+		contentType = http.DetectContentType(dat)
 	}
 	sum := meow.Checksum64(THREEBEEF, dat)
-	d, ct, err := makeFormData(normalizeName(file), content, bytes.NewBuffer(dat))
+	d, err := makeFormData(normalizeName(file), contentType, dat)
+	defer d.Release()
 	if err != nil {
 		return nil, nil, err
 	}
@@ -134,7 +135,7 @@ func (F *FS) push(
 		return nil, nil, err
 	}
 	req.Header.Set("Seaweed-Meow64", strconv.FormatUint(sum, 10))
-	req.Header.Set("Content-Type", ct)
+	req.Header.Set("Content-Type", contentType)
 	resp, err := F.client.Do(req)
 	if err != nil {
 		return nil, nil, err