feat: add maximum image dimension to be processed by the thumbnailer (#9035)

* feat: add maximum image dimension to be processed by the thumbnailer

* chore: make golangci-lint happy

services/thumbnails/pkg/thumbnail/storage/filesystem.go

@@ -31,6 +31,7 @@ type FileSystem struct {
 	logger log.Logger
 }
 
+// Stat returns if a file for the given key exists on the filesystem
 func (s FileSystem) Stat(key string) bool {
 	img := filepath.Join(s.root, filesDir, key)
 	if _, err := os.Stat(img); err != nil {
@@ -39,6 +40,7 @@ func (s FileSystem) Stat(key string) bool {
 	return true
 }
 
+// Get returns the file content for the given key
 func (s FileSystem) Get(key string) ([]byte, error) {
 	img := filepath.Join(s.root, filesDir, key)
 	content, err := os.ReadFile(img)
@@ -51,6 +53,7 @@ func (s FileSystem) Get(key string) ([]byte, error) {
 	return content, nil
 }
 
+// Put stores image data in the file system for the given key
 func (s FileSystem) Put(key string, img []byte) error {
 	imgPath := filepath.Join(s.root, filesDir, key)
 	dir := filepath.Dir(imgPath)

services/thumbnails/pkg/thumbnail/storage/inmemory.go

@@ -1,50 +0,0 @@
-package storage
-
-import (
-	"strings"
-)
-
-// NewInMemoryStorage creates a new InMemory instance.
-func NewInMemoryStorage() InMemory {
-	return InMemory{
-		store: make(map[string][]byte),
-	}
-}
-
-// InMemory represents an in memory storage for thumbnails
-// Can be used during development
-type InMemory struct {
-	store map[string][]byte
-}
-
-func (s InMemory) Stat(key string) bool {
-	_, exists := s.store[key]
-	return exists
-}
-
-// Get loads the thumbnail from memory.
-func (s InMemory) Get(key string) ([]byte, error) {
-	return s.store[key], nil
-}
-
-// Set stores the thumbnail in memory.
-func (s InMemory) Put(key string, thumbnail []byte) error {
-	s.store[key] = thumbnail
-	return nil
-}
-
-// BuildKey generates a unique key to store and retrieve the thumbnail.
-func (s InMemory) BuildKey(r Request) string {
-	parts := []string{
-		r.Checksum,
-		r.Resolution.String(),
-	}
-
-	if r.Characteristic != "" {
-		parts = append(parts, r.Characteristic)
-	}
-
-	parts = append(parts, strings.Join(r.Types, ","))
-
-	return strings.Join(parts, "+")
-}

services/thumbnails/pkg/thumbnail/storage/inmemory_test.go

@@ -1,65 +0,0 @@
-package storage_test
-
-import (
-	"image"
-	"testing"
-
-	tAssert "github.com/stretchr/testify/assert"
-
-	"github.com/owncloud/ocis/v2/services/thumbnails/pkg/thumbnail/storage"
-)
-
-func TestInMemory_BuildKey(t *testing.T) {
-	tests := []struct {
-		r    storage.Request
-		want string
-	}{
-		{
-			r: storage.Request{
-				Checksum: "cs",
-				Types:    []string{"png", "jpg"},
-				Resolution: image.Rectangle{
-					Min: image.Point{
-						X: 1,
-						Y: 2,
-					},
-					Max: image.Point{
-						X: 3,
-						Y: 4,
-					},
-				},
-				Characteristic: "",
-			},
-			want: "cs+(1,2)-(3,4)+png,jpg",
-		},
-		{
-			r: storage.Request{
-				Checksum: "cs",
-				Types:    []string{"png", "jpg"},
-				Resolution: image.Rectangle{
-					Min: image.Point{
-						X: 1,
-						Y: 2,
-					},
-					Max: image.Point{
-						X: 3,
-						Y: 4,
-					},
-				},
-				Characteristic: "fill",
-			},
-			want: "cs+(1,2)-(3,4)+fill+png,jpg",
-		},
-	}
-
-	s := storage.InMemory{}
-	assert := tAssert.New(t)
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run("", func(t *testing.T) {
-			assert.Equal(s.BuildKey(tt.r), tt.want)
-		})
-	}
-
-}

services/thumbnails/pkg/thumbnail/storage/storage.go

@@ -16,7 +16,7 @@ type Request struct {
 	// The resolution of the thumbnail
 	Resolution image.Rectangle
 	// Characteristic defines the different image characteristics,
-	// for example, if its scaled up to fit in the bounding box or not,
+	// for example, if it's scaled up to fit in the bounding box or not,
 	// is it a chroma version of the image, and so on...
 	// the main propose for this is to be able to differentiate between images which have
 	// the same resolution but different characteristics.
@@ -25,8 +25,8 @@ type Request struct {
 
 // Storage defines the interface for a thumbnail store.
 type Storage interface {
-	Stat(string) bool
-	Get(string) ([]byte, error)
-	Put(string, []byte) error
-	BuildKey(Request) string
+	Stat(key string) bool
+	Get(key string) ([]byte, error)
+	Put(key string, img []byte) error
+	BuildKey(r Request) string
 }