Use vips thumbnail resizing and disable vips cache (#920)

Author: InfiniteStash

pkg/api/routes_image.go

@@ -33,13 +33,17 @@ func (rs imageRoutes) image(w http.ResponseWriter, r *http.Request) {
 	imageRepo := getRepo(r.Context()).Image()
 
 	databaseImage, err := imageRepo.Find(uuid)
-	if err != nil || databaseImage == nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	if databaseImage == nil {
+		http.NotFound(w, r)
 		return
 	}
 
 	service := image.GetService(imageRepo)
-	reader, err := service.Read(*databaseImage)
+	reader, size, err := service.Read(*databaseImage)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusNotFound)
 		return
@@ -69,7 +73,7 @@ func (rs imageRoutes) image(w http.ResponseWriter, r *http.Request) {
 
 	if maxSize != 0 {
 		if databaseImage.Width > int64(maxSize) || databaseImage.Height > int64(maxSize) {
-			data, err := image.Resize(reader, maxSize)
+			data, err := image.Resize(reader, maxSize, databaseImage, size)
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return

pkg/image/file.go

@@ -39,8 +39,14 @@ func (s *FileBackend) DestroyFile(image *models.Image) error {
 	return os.Remove(GetImagePath(config.GetImageLocation(), image.Checksum))
 }
 
-func (s *FileBackend) ReadFile(image models.Image) (io.ReadCloser, error) {
+func (s *FileBackend) ReadFile(image models.Image) (io.ReadCloser, int64, error) {
 	fileDir := config.GetImageLocation()
 	path := GetImagePath(fileDir, image.Checksum)
-	return os.Open(path)
+	stat, err := os.Stat(path)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	file, err := os.Open(path)
+	return file, stat.Size(), err
 }

pkg/image/image_backend.go

@@ -9,5 +9,5 @@ import (
 type Backend interface {
 	WriteFile(file []byte, image *models.Image) error
 	DestroyFile(image *models.Image) error
-	ReadFile(image models.Image) (io.ReadCloser, error)
+	ReadFile(image models.Image) (io.ReadCloser, int64, error)
 }

pkg/image/image_service.go

@@ -13,7 +13,7 @@ type BackendService interface {
 	Destroy(input models.ImageDestroyInput) error
 	DestroyUnusedImages() error
 	DestroyUnusedImage(imageID uuid.UUID) error
-	Read(image models.Image) (io.ReadCloser, error)
+	Read(image models.Image) (io.ReadCloser, int64, error)
 }
 
 func GetService(repo models.ImageRepo) BackendService {

pkg/image/resize_unix.go

@@ -4,27 +4,23 @@ package image
 
 import (
 	"io"
-	"math"
 
 	"github.com/davidbyttow/govips/v2/vips"
 	"github.com/stashapp/stash-box/pkg/manager/config"
+	"github.com/stashapp/stash-box/pkg/models"
 )
 
-func Resize(reader io.Reader, maxSize int) ([]byte, error) {
+func Resize(reader io.Reader, maxSize int, dbimage *models.Image, fileSize int64) ([]byte, error) {
 	defer vips.ShutdownThread()
 
-	image, err := vips.NewImageFromReader(reader)
-	if err != nil {
+	buffer := make([]byte, fileSize)
+	if _, err := io.ReadFull(reader, buffer); err != nil {
 		return nil, err
 	}
 
-	h := image.Height()
-	w := image.Width()
-	scale := float64(maxSize) / math.Max(float64(h), float64(w))
-	if scale < 1 {
-		if err := image.Resize(scale, vips.KernelCubic); err != nil {
-			return nil, err
-		}
+	image, err := vips.NewThumbnailFromBuffer(buffer, maxSize, maxSize, vips.InterestingNone)
+	if err != nil {
+		return nil, err
 	}
 
 	format := image.Format()
@@ -51,5 +47,5 @@ func Resize(reader io.Reader, maxSize int) ([]byte, error) {
 
 func InitResizer() {
 	vips.LoggingSettings(nil, vips.LogLevelWarning)
-	vips.Startup(nil)
+	vips.Startup(&vips.Config{MaxCacheSize: 0, MaxCacheMem: 0})
 }

pkg/image/resize_windows.go

@@ -4,9 +4,11 @@ package image
 
 import (
 	"io"
+
+	"github.com/stashapp/stash-box/pkg/models"
 )
 
-func Resize(reader io.Reader, max int) ([]byte, error) {
+func Resize(reader io.Reader, max int, dbimage *models.Image, fileSize int64) ([]byte, error) {
 	return resizeImage(reader, int64(max))
 }
 

pkg/image/s3.go

@@ -80,7 +80,7 @@ func uploadS3File(client minio.Client, file []byte, bucket string, id string, he
 	return err
 }
 
-func (s *S3Backend) ReadFile(image models.Image) (io.ReadCloser, error) {
+func (s *S3Backend) ReadFile(image models.Image) (io.ReadCloser, int64, error) {
 	ctx := context.TODO()
 
 	s3config := config.GetS3Config()
@@ -89,16 +89,26 @@ func (s *S3Backend) ReadFile(image models.Image) (io.ReadCloser, error) {
 		Secure: true,
 	})
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 
 	id := image.ID.String()
 	path := id[0:2] + "/" + id[2:4] + "/" + id
 
-	return minioClient.GetObject(
+	object, err := minioClient.GetObject(
 		ctx,
 		s3config.Bucket,
 		path,
 		minio.GetObjectOptions{},
 	)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	stat, err := object.Stat()
+	if err != nil {
+		return nil, 0, err
+	}
+
+	return object, stat.Size, err
 }

pkg/image/service.go

@@ -166,6 +166,6 @@ func (s *Service) DestroyUnusedImage(imageID uuid.UUID) error {
 	return nil
 }
 
-func (s *Service) Read(image models.Image) (io.ReadCloser, error) {
+func (s *Service) Read(image models.Image) (io.ReadCloser, int64, error) {
 	return s.Backend.ReadFile(image)
 }