simplifed image processing and created a filesaver interface to allow plugable saving of files. i.e. filesystem,gcloud,s3,etc

Author: Josh Cave

fileupload.go

@@ -5,22 +5,24 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"fmt"
+	"image"
+	"image/jpeg"
+	"image/png"
 	"io"
 	"io/ioutil"
 	"mime/multipart"
 	"net/http"
-	"net/url"
+	u "net/url"
 	"os"
+	"path/filepath"
 	"strconv"
+	"strings"
 
 	"github.com/kennygrant/sanitize"
+	pngquant "github.com/manhtai/gopngquant"
 )
 
-type File struct {
-	FileName string `json:"FileName"`
-	URL      string `json:"URL"`
-}
-
 func FromRequestToFile(req *http.Request, path string) (string, string, error) {
 	req.ParseMultipartForm(32)
 	file, handler, err := req.FormFile("file")
@@ -96,6 +98,11 @@ type operations struct {
 	Ops []*operation
 }
 
+func NewProcessingOps() *operations {
+	ops := &operations{}
+	return ops
+}
+
 func (o *operation) addParam(key string, val interface{}) {
 	if o.Params == nil {
 		o.Params = make(map[string]interface{})
@@ -116,6 +123,7 @@ func (o *operations) last() *operation {
 	return o.Ops[len(o.Ops)-1]
 }
 
+// ProcessedImage deprecated not flexible enough
 func ProcessedImageFromRequest(req *http.Request, imageType string, width int, height int, quality int, convert bool) ([]byte, error) {
 	err := req.ParseMultipartForm(32)
 	if err != nil {
@@ -129,6 +137,7 @@ func ProcessedImageFromRequest(req *http.Request, imageType string, width int, h
 	return ProcessedImage(file, imageType, width, height, quality, convert)
 }
 
+// ProcessedImage deprecated not flexible enough
 func ProcessedImage(r io.Reader, imageType string, width int, height int, quality int, convert bool) ([]byte, error) {
 	ops := &operations{}
 
@@ -156,7 +165,12 @@ func ProcessedImage(r io.Reader, imageType string, width int, height int, qualit
 	if err != nil {
 		return nil, err
 	}
-	endpoint := os.Getenv("IMAGE_PROCESSING_ENDPOINT") + "pipeline?operations=" + url.QueryEscape(string(bOps))
+
+	imgProcessingEndpoint := os.Getenv("IMAGE_PROCESSING_ENDPOINT")
+	if imgProcessingEndpoint == "" {
+		imgProcessingEndpoint = os.Getenv("IMAGINARY_ENDPOINT")
+	}
+	endpoint := imgProcessingEndpoint + "pipeline?operations=" + u.QueryEscape(string(bOps))
 
 	var b bytes.Buffer
 	w := multipart.NewWriter(&b)
@@ -242,3 +256,86 @@ func DownloadToFileNoSanitize(url string, filename string, filepath string) (str
 	}
 	return FromBytesNoSanitize(filename, filepath, b)
 }
+
+type FileSaver interface {
+	SaveFile(filename string, b io.Reader) (bts *bytes.Buffer, fileName string, url string, err error)
+}
+
+type imageProcessHelper struct {
+	fileSaver FileSaver
+	endpoint  string
+}
+
+func NewImageHelper(endpoint string, fs FileSaver) *imageProcessHelper {
+	return &imageProcessHelper{
+		fs,
+		endpoint,
+	}
+}
+
+func (ip *imageProcessHelper) GetDimensions(bts []byte, ext string) (width int, height int, err error) {
+	ext = strings.ToLower(ext)
+	var imgConfig image.Config
+	if strings.HasSuffix(ext, "jpeg") || strings.HasSuffix(ext, "jpg") {
+		imgConfig, err = jpeg.DecodeConfig(bytes.NewBuffer(bts))
+	} else {
+		imgConfig, err = png.DecodeConfig(bytes.NewBuffer(bts))
+	}
+	if err != nil {
+		return -1, -1, fmt.Errorf("failed to get the original image dimensions %v", err)
+	}
+	return imgConfig.Width, imgConfig.Width, nil
+}
+
+func (ip *imageProcessHelper) ProcessImage(filename string, bts []byte, ops *operations) (byts *bytes.Buffer, fileName string, url string, err error) {
+	ext := filepath.Ext(filename)
+
+	bOps, err := json.Marshal(ops.Ops)
+	if err != nil {
+		return nil, "", "", fmt.Errorf("json.Marshal %v", err)
+	}
+	endpoint := ip.endpoint + "pipeline?operations=" + u.QueryEscape(string(bOps))
+	var b bytes.Buffer
+	mpW := multipart.NewWriter(&b)
+	fw, err := mpW.CreateFormFile("file", "placeholder."+ext)
+	if err != nil {
+		return nil, "", "", fmt.Errorf("mpW.CreateFormFile %v", err)
+		// ctx.ErrorJSON(http.StatusOK, "couldn't create form file ", err)
+	}
+	_, err = io.Copy(fw, bytes.NewBuffer(bts))
+	if err != nil {
+		// ctx.ErrorJSON(http.StatusOK, "failed to copy from reqFile", err)
+		return nil, "", "", fmt.Errorf("failed to copy to multipart writer %v", err)
+	}
+	err = mpW.Close()
+	if err != nil {
+		return nil, "", "", fmt.Errorf("failed to close multipart writer %v", err)
+	}
+
+	req, err := http.NewRequest("POST", endpoint, &b)
+	if err != nil {
+		return nil, "", "", fmt.Errorf("failed to copy from req %v", err)
+	}
+	req.Header.Set("Content-Type", mpW.FormDataContentType())
+
+	client := &http.Client{}
+	res, err := client.Do(req)
+	if err != nil {
+		return nil, "", "", fmt.Errorf("statuscode %v", err)
+	}
+	if res.StatusCode != 200 {
+		return nil, "", "", fmt.Errorf("error status code is: %d", res.StatusCode)
+	}
+	defer res.Body.Close()
+
+	if ext == "png" {
+		cmpressedPNG := make([]byte, 0)
+		buf := bytes.NewBuffer(cmpressedPNG)
+		err = pngquant.CompressPng(res.Body, buf, 5)
+		if err != nil {
+			return nil, "", "", fmt.Errorf("pngquant.CompressPng %v", err)
+		}
+		return ip.fileSaver.SaveFile(filename, buf)
+	}
+	return ip.fileSaver.SaveFile(filename, res.Body)
+}

go.mod

@@ -2,7 +2,11 @@ module github.com/nerdynz/fileupload
 
 go 1.12
 
+replace bitbucket.org/iqhive/tkt-shared => ../tkt-shared
+
 require (
 	github.com/kennygrant/sanitize v1.2.4
+	github.com/manhtai/gopngquant v0.0.0-20180310144719-578cebc80102
+	github.com/manhtai/imagequant v0.0.0-20180310104925-a76d35dcb570 // indirect
 	golang.org/x/net v0.0.0-20200421231249-e086a090c8fd // indirect
 )

go.sum

@@ -1,5 +1,9 @@
 github.com/kennygrant/sanitize v1.2.4 h1:gN25/otpP5vAsO2djbMhF/LQX6R7+O1TB4yv8NzpJ3o=
 github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak=
+github.com/manhtai/gopngquant v0.0.0-20180310144719-578cebc80102 h1:bShgP1wiKAQf05xCYAVZJ0ghMq6vnBy+ioKGPip1gEI=
+github.com/manhtai/gopngquant v0.0.0-20180310144719-578cebc80102/go.mod h1:jHu+AhKQgxLdKw7pisWUAD+BeH38FhmHDTtDBsXG1sA=
+github.com/manhtai/imagequant v0.0.0-20180310104925-a76d35dcb570 h1:RJ95GXJWSewO5Mhi+jD4sX6b5RUk3S3/OiDO0+BBxCI=
+github.com/manhtai/imagequant v0.0.0-20180310104925-a76d35dcb570/go.mod h1:LTQQU89K3IGCYY8a1nqBJVT1rH29s4nBygn/653/HBk=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
 golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=