From fe4aace777658fcde3178727bf29f13b1342d47d Mon Sep 17 00:00:00 2001
From: mappu <mappu04@gmail.com>
Date: Sat, 9 Jun 2018 18:09:57 +1200
Subject: [PATCH] thumb: compatibility fixes for thumbnail library

---
 thumb.go | 46 ++++++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/thumb.go b/thumb.go
index 6b52119..cfcc3bb 100644
--- a/thumb.go
+++ b/thumb.go
@@ -10,52 +10,66 @@ import (
 	"code.ivysaur.me/thumbnail"
 )
 
-func thumbnailer(t byte) (*thumbnail.Thumbnailer, error) {
+func getThumbnailerConfig(t byte) (*thumbnail.Config, error) {
 	// Modelled on what imgur.com offers
 	// @ref https://api.imgur.com/models/image#thumbs
 
-	const (
-		cacheSize = 1
-		outputFmt = thumbnail.OUTPUT_JPG
-		scaleFmt  = thumbnail.SCALEFMT_BILINEAR
-	)
+	opts := thumbnail.Config{
+		Aspect: thumbnail.FitOutside,
+		Output: thumbnail.Jpeg,
+		Scale:  thumbnail.Bicubic,
+	}
 
 	switch t {
 	case 's':
-		return thumbnail.NewThumbnailerEx(90, 90, cacheSize, outputFmt, thumbnail.ASPECT_CROP_TO_DIMENSIONS, scaleFmt), nil
+		opts.Width = 90
+		opts.Height = 90
 	case 'b':
-		return thumbnail.NewThumbnailerEx(160, 160, cacheSize, outputFmt, thumbnail.ASPECT_CROP_TO_DIMENSIONS, scaleFmt), nil
+		opts.Width = 160
+		opts.Height = 160
 	case 't':
-		return thumbnail.NewThumbnailerEx(160, 160, cacheSize, outputFmt, thumbnail.ASPECT_RESPECT_MAX_DIMENSION_ONLY, scaleFmt), nil
+		opts.Width = 160
+		opts.Height = 160
+		// thumbnail.ASPECT_RESPECT_MAX_DIMENSION_ONLY
 	case 'm':
-		return thumbnail.NewThumbnailerEx(340, 340, cacheSize, outputFmt, thumbnail.ASPECT_RESPECT_MAX_DIMENSION_ONLY, scaleFmt), nil
+		opts.Width = 340
+		opts.Height = 340
+		// thumbnail.ASPECT_RESPECT_MAX_DIMENSION_ONLY
 	case 'l':
-		return thumbnail.NewThumbnailerEx(640, 640, cacheSize, outputFmt, thumbnail.ASPECT_RESPECT_MAX_DIMENSION_ONLY, scaleFmt), nil
+		opts.Width = 640
+		opts.Height = 640
+		// thumbnail.ASPECT_RESPECT_MAX_DIMENSION_ONLY
 	case 'h':
-		return thumbnail.NewThumbnailerEx(1024, 1024, cacheSize, outputFmt, thumbnail.ASPECT_RESPECT_MAX_DIMENSION_ONLY, scaleFmt), nil
+		opts.Width = 1024
+		opts.Height = 1024
+		// thumbnail.ASPECT_RESPECT_MAX_DIMENSION_ONLY
 	default:
 		return nil, errors.New("Unsupported thumbnail type (should be s/b/t/m/l/h)")
 	}
+
+	return &opts, nil
 }
 
 func (this *Server) handleThumb(w http.ResponseWriter, r *http.Request, thumbnailType byte, fileId string) {
-	t, err := thumbnailer(thumbnailType)
+	opts, err := getThumbnailerConfig(thumbnailType)
 	if err != nil {
 		log.Printf("%s Thumbnail failed: %s\n", this.remoteIP(r), err.Error())
 		http.Error(w, err.Error(), 400)
 		return
 	}
 
+	t := thumbnail.NewThumbnailerEx(opts)
+
 	err = this.handleThumbInternal(w, t, fileId)
 	if err != nil {
 		log.Printf("%s Thumbnail failed: %s\n", this.remoteIP(r), err.Error())
 
-		w.Header().Set(`Location`, fmt.Sprintf(`/nothumb_%d.png`, t.Height()))
+		w.Header().Set(`Location`, fmt.Sprintf(`/nothumb_%d.png`, opts.Height))
 		w.WriteHeader(302)
 	}
 }
 
-func (this *Server) handleThumbInternal(w http.ResponseWriter, t *thumbnail.Thumbnailer, fileId string) error {
+func (this *Server) handleThumbInternal(w http.ResponseWriter, t thumbnail.Thumbnailer, fileId string) error {
 
 	// Load metadata
 	m, err := this.Metadata(fileId)
@@ -64,7 +78,7 @@ func (this *Server) handleThumbInternal(w http.ResponseWriter, t *thumbnail.Thum
 	}
 
 	filePath := filepath.Join(this.opts.DataDirectory, m.FileHash)
-	thumb, err := t.RenderFile_NoCache_MimeType(filePath, m.MimeType)
+	thumb, err := t.RenderFileAs(filePath, m.MimeType)
 	if err != nil {
 		return err
 	}