feat: image gallery (#2)

Reviewed-on: #2

internal/components/gallery/controller.go

@@ -0,0 +1,86 @@
+package gallery
+
+import (
+	"context"
+	"math"
+
+	"github.com/InfinityTools/go-binpack2d"
+)
+
+type Gallery struct {
+	GridWith   int
+	GridHeight int
+	Images     []Image
+}
+type Set struct {
+	SM  Gallery
+	LG  Gallery
+	XLG Gallery
+}
+
+func (s *Service) GetGallerySet(ctx context.Context) (gallerySet Set, err error) {
+	gallerySet.SM, err = s.GetGallery(ctx, 50)
+	if err != nil {
+		return
+	}
+	gallerySet.LG, err = s.GetGallery(ctx, 80)
+	if err != nil {
+		return
+	}
+
+	gallerySet.XLG, err = s.GetGallery(ctx, 120)
+	if err != nil {
+		return
+	}
+
+	return
+}
+
+func (s *Service) GetGallery(ctx context.Context, width int) (gallery Gallery, err error) {
+	imgs, err := s.GetImages(ctx)
+	if err != nil {
+		return
+	}
+
+	packer := binpack2d.Create(width, 999999)
+
+	for len(imgs) > 0 {
+		unused := make([]Image, 0, len(imgs))
+		for _, img := range imgs {
+			adjustImageSize(&img, 200)
+			rect, ok := packer.Insert(img.Width, img.Height, binpack2d.RULE_BEST_SHORT_SIDE_FIT)
+			if !ok {
+				unused = append(unused, img)
+				continue
+			}
+
+			img.X = rect.X
+			img.Y = rect.Y
+
+			gallery.Images = append(gallery.Images, img)
+		}
+		imgs = unused
+	}
+
+	packer.ShrinkBin(false)
+
+	gallery.GridHeight = packer.GetHeight()
+	gallery.GridWith = packer.GetWidth()
+
+	return
+}
+
+// adjustImageSize adjusts the image size so that the aspect ratio stays the same
+// but the image area is the given parameter.
+func adjustImageSize(img *Image, area int) {
+	// Calculate the original aspect ratio (W / H)
+	aspectRatio := float64(img.Width) / float64(img.Height)
+
+	// Calculate new height and width using the derived formulas
+	newHeight := math.Sqrt(float64(area) / aspectRatio)
+	newWidth := newHeight * aspectRatio
+
+	// Round to the nearest integer to minimize precision loss
+	img.Width = int(math.Round(newWidth))
+	img.Height = int(math.Round(newHeight))
+}

internal/components/gallery/dir.go

@@ -0,0 +1,40 @@
+package gallery
+
+import (
+	"os"
+	"path"
+)
+
+type fileWithPath struct {
+	os.FileInfo
+	path string
+}
+
+func (f fileWithPath) Name() string {
+	return path.Join(f.path, f.FileInfo.Name())
+}
+
+func (s *Service) readDirRecursive(path string) (files []os.FileInfo, err error) {
+	return s.readDirRecursiveTo([]os.FileInfo{}, path)
+}
+
+func (s *Service) readDirRecursiveTo(files []os.FileInfo, p ...string) ([]os.FileInfo, error) {
+	localFiles, err := s.fs.ReadDir(path.Join(p...))
+	if err != nil {
+		return files, err
+	}
+
+	for _, file := range localFiles {
+		if file.IsDir() {
+			newP := append(p, file.Name())
+			files, err = s.readDirRecursiveTo(files, newP...)
+			if err != nil {
+				return files, err
+			}
+		} else {
+			files = append(files, fileWithPath{file, path.Join(p[1:]...)})
+		}
+	}
+
+	return files, nil
+}

internal/components/gallery/image.go

@@ -0,0 +1,113 @@
+package gallery
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"hash/fnv"
+	"log/slog"
+	"os"
+	"path"
+	"strings"
+	"time"
+
+	"github.com/valkey-io/valkey-go"
+)
+
+type Image struct {
+	UID    string
+	X      int
+	Y      int
+	Width  int
+	Height int
+}
+
+const (
+	imagesKey = "gallery:images:list"
+	hashKey   = "gallery:images:hash"
+)
+
+func (s *Service) autoRefresh() {
+	t := time.NewTicker(time.Minute)
+	for {
+		ctx, cancle := context.WithTimeout(context.Background(), time.Minute)
+
+		if err := s.assembleImageList(ctx); err != nil {
+			slog.Error("error while refreshing gallery", "err", err)
+		}
+		cancle()
+		<-t.C
+	}
+}
+
+func (s *Service) assembleImageList(ctx context.Context) error {
+	files, err := s.readDirRecursive(s.cfg.Path)
+	if err != nil {
+		return fmt.Errorf("could not read contents of %s: %w", s.cfg.Path, err)
+	}
+	slog.Debug("loaded files", "files", files)
+
+	savedHash, _ := s.cache.Do(ctx, s.cache.B().Get().Key(hashKey).Build()).AsBytes()
+
+	newHash := hashImageList(files)
+
+	if bytes.Equal(savedHash, newHash) {
+		slog.Debug("images up to date no refreshing of gallery", "savedHash", savedHash, "newHash", newHash)
+		return nil
+	}
+
+	slog.Info("starting gallery refresh")
+	defer slog.Info("gallery refresh completed")
+
+	imgs := make([]Image, 0, len(files))
+	for _, file := range files {
+		if strings.HasSuffix(file.Name(), ".md") {
+			continue
+		}
+
+		imagePath := path.Join(s.cfg.Path, file.Name())
+		img, err := s.img.GetImage(imagePath)
+		if err != nil || img.Image == nil {
+			slog.Warn("could not get image for gallery", "err", err, "img", img)
+			continue
+		}
+
+		uid, err := img.UID()
+		if err != nil {
+			continue
+		}
+
+		imgs = append(imgs, Image{
+			UID:    uid,
+			Width:  img.Bounds().Dx(),
+			Height: img.Bounds().Dy(),
+		})
+	}
+
+	if err = s.cache.Do(ctx, s.cache.B().Set().Key(hashKey).Value(valkey.BinaryString(newHash)).Build()).Error(); err != nil {
+		return err
+	}
+
+	if err = s.cache.Do(ctx, s.cache.B().Set().Key(imagesKey).Value(valkey.JSON(imgs)).Build()).Error(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func hashImageList(files []os.FileInfo) []byte {
+	h := fnv.New128()
+
+	for _, file := range files {
+		fmt.Fprint(h, file.ModTime())
+		fmt.Fprint(h, file.Size())
+		fmt.Fprint(h, file.Name())
+	}
+
+	return h.Sum([]byte{})
+}
+
+func (s *Service) GetImages(ctx context.Context) (images []Image, err error) {
+	err = s.cache.Do(ctx, s.cache.B().Get().Key(imagesKey).Build()).DecodeJSON(&images)
+	return
+}

internal/components/gallery/resource.go

@@ -0,0 +1,35 @@
+package gallery
+
+import (
+	"time"
+
+	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/images"
+	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/config"
+	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/filesystem"
+	"github.com/valkey-io/valkey-go"
+)
+
+type getImager interface {
+	GetImage(path string) (img images.Image, err error)
+}
+
+type Service struct {
+	fs    filesystem.FS
+	cfg   *config.Gallery
+	img   getImager
+	cache valkey.Client
+
+	refreshIntervall time.Duration
+}
+
+func New(fs filesystem.FS, cfg *config.Gallery, img getImager, cache valkey.Client) *Service {
+	s := &Service{
+		fs:    fs,
+		cfg:   cfg,
+		img:   img,
+		cache: cache,
+	}
+	go s.autoRefresh()
+
+	return s
+}

internal/components/images/controller.go

@@ -21,7 +21,7 @@ import (
 
 var ErrNotAnImage = errors.New("not an image")
 
-func (s *Service) getMime(path string) (mimeType string, err error) {
+func (s *Service) GetMime(path string) (mimeType string, err error) {
 	info, err := s.fs.Stat(path)
 	if err != nil {
 		err = fmt.Errorf("image file info could not be fetched: %w", err)
@@ -35,13 +35,12 @@ func (s *Service) getMime(path string) (mimeType string, err error) {
 	return
 }
 
-func (s *Service) getImage(uid string) (file []byte, mimeType string, err error) {
-	path, err := PathFromUID(uid)
+func (s *Service) getImage(path string) (file []byte, mimeType string, err error) {
 	if err != nil {
 		err = fmt.Errorf("could not get path: %w", err)
 		return
 	}
-	mimeType, err = s.getMime(path)
+	mimeType, err = s.GetMime(path)
 	if err != nil {
 		return
 	}
@@ -59,7 +58,19 @@ func (s *Service) getImage(uid string) (file []byte, mimeType string, err error)
 	return
 }
 
-func (s *Service) GetImage(ctx context.Context, uid string, options Options) (img io.Reader, mimeType string, err error) {
+func (s *Service) GetImage(path string) (img Image, err error) {
+	rawImage, _, err := s.getImage(path)
+	if err != nil {
+		return
+	}
+
+	img.Path = path
+	img.Image, _, err = image.Decode(bytes.NewBuffer(rawImage))
+
+	return
+}
+
+func (s *Service) GetScaledImage(ctx context.Context, uid string, options Options) (img io.Reader, mimeType string, err error) {
 	if err = s.seph.Acquire(ctx, 1); err != nil {
 		err = fmt.Errorf("could not Acquire semaphore: %w", err)
 		return
@@ -67,7 +78,12 @@ func (s *Service) GetImage(ctx context.Context, uid string, options Options) (im
 	}
 	defer s.seph.Release(1)
 
-	rawImage, mimeType, err := s.getImage(uid)
+	path, err := PathFromUID(uid)
+	if err != nil {
+		return
+	}
+
+	rawImage, mimeType, err := s.getImage(path)
 	if err != nil {
 		return
 	}

internal/components/images/controller_test.go

@@ -15,7 +15,7 @@ import (
 
 func Setup(ctx context.Context, ctrl *gomock.Controller) (*images.Service, *mock.Client) {
 	valkey := mock.NewClient(ctrl)
-	return images.New(testdata.FS(), &config.ImageConfig{Concurency: 1, Quality: 80}, valkey), valkey
+	return images.New(testdata.FS(), &config.Image{Concurency: 1, Quality: 80}, valkey), valkey
 }
 
 func BenchmarkService_GetImage(b *testing.B) {
@@ -29,7 +29,7 @@ func BenchmarkService_GetImage(b *testing.B) {
 	for b.Loop() {
 		valkeyClient.EXPECT().Do(gomock.Any(), gomock.Any()).Return(mock.ErrorResult(errors.New("adf")))
 		valkeyClient.EXPECT().Do(gomock.Any(), gomock.Any()).Return(mock.Result(valkey.ValkeyMessage{}))
-		_, _, err = srv.GetImage(b.Context(), uid, images.Options{Width: 500, Quality: 80})
+		_, _, err = srv.GetScaledImage(b.Context(), uid, images.Options{Width: 500, Quality: 80})
 		if err != nil {
 			b.Error(err)
 		}

internal/components/images/image.go

@@ -0,0 +1,12 @@
+package images
+
+import "image"
+
+type Image struct {
+	image.Image
+	Path string `json:"path"`
+}
+
+func (i Image) UID() (string, error) {
+	return UIDFromPath(i.Path)
+}

internal/components/images/resorce.go

@@ -18,10 +18,10 @@ type Service struct {
 	fs    fileSystem
 	cache valkey.Client
 	seph  *semaphore.Weighted
-	cfg   *config.ImageConfig
+	cfg   *config.Image
 }
 
-func New(fs fileSystem, cfg *config.ImageConfig, cache valkey.Client) *Service {
+func New(fs fileSystem, cfg *config.Image, cache valkey.Client) *Service {
 	return &Service{
 		fs:    fs,
 		cache: cache,

internal/components/page/page.go

@@ -56,9 +56,14 @@ func (s *Service) getPageHeaders(ctx context.Context, uid string) (page PageHead
 		}
 	}
 
-	page.md, err = s.fs.Read(contentMD.Path())
-	if err != nil {
-		return
+	if contentMD != nil {
+
+		page.md, err = s.fs.Read(contentMD.Path())
+		if err != nil {
+			return
+		}
+	} else {
+		page.md = []byte("# ...")
 	}
 
 	title := titleRGX.FindStringSubmatch(string(page.md))

internal/components/translate/context.go

@@ -25,6 +25,7 @@ func SupportedLanguages(ctx context.Context) []string {
 	s, ok := ctx.Value(serviceKey).(*Service)
 	if !ok {
 		slog.Error("could not extract translation service from context for getting supported languages")
+		return []string{}
 	}
 	return s.SupportedLanguages()
 }