Make caches singletons

cmd/wire_gen.go

@@ -29,7 +29,7 @@ func CreateScanner(musicFolder string) scanner.Scanner {
 	dataStore := persistence.New()
 	artworkCache := core.NewImageCache()
 	artwork := core.NewArtwork(dataStore, artworkCache)
-	cacheWarmer := core.NewCacheWarmer(artworkCache, artwork)
+	cacheWarmer := core.NewCacheWarmer(artwork)
 	scannerScanner := scanner.New(dataStore, cacheWarmer)
 	return scannerScanner
 }

core/artwork.go

@@ -12,6 +12,7 @@ import (
 	"io"
 	"os"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/deluan/navidrome/core/cache"
@@ -205,8 +206,14 @@ func readFromFile(path string) ([]byte, error) {
 	return buf.Bytes(), nil
 }
 
+var (
+	onceImageCache sync.Once
+	imageCache     ArtworkCache
+)
+
 func NewImageCache() ArtworkCache {
-	return cache.NewFileCache("Image", conf.Server.ImageCacheSize, consts.ImageCacheDir, consts.DefaultImageCacheMaxItems,
+	onceImageCache.Do(func() {
+		imageCache = cache.NewFileCache("Image", conf.Server.ImageCacheSize, consts.ImageCacheDir, consts.DefaultImageCacheMaxItems,
 			func(ctx context.Context, arg cache.Item) (io.Reader, error) {
 				info := arg.(*imageInfo)
 				reader, err := info.a.getArtwork(ctx, info.id, info.path, info.size)
@@ -216,4 +223,6 @@ func NewImageCache() ArtworkCache {
 				}
 				return reader, nil
 			})
+	})
+	return imageCache
 }

core/cache_warmer.go

@@ -14,10 +14,9 @@ type CacheWarmer interface {
 	Flush(ctx context.Context)
 }
 
-func NewCacheWarmer(cache ArtworkCache, artwork Artwork) CacheWarmer {
+func NewCacheWarmer(artwork Artwork) CacheWarmer {
 	w := &warmer{
 		artwork: artwork,
-		cache:   cache,
 		albums:  map[string]struct{}{},
 	}
 	p, err := pool.NewPool("artwork", 3, &artworkItem{}, w.execute)
@@ -33,7 +32,6 @@ func NewCacheWarmer(cache ArtworkCache, artwork Artwork) CacheWarmer {
 type warmer struct {
 	pool    *pool.Pool
 	artwork Artwork
-	cache   ArtworkCache
 	albums  map[string]struct{}
 }
 

core/media_streamer.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"mime"
 	"os"
+	"sync"
 	"time"
 
 	"github.com/deluan/navidrome/conf"
@@ -167,8 +168,14 @@ func selectTranscodingOptions(ctx context.Context, ds model.DataStore, mf *model
 	return
 }
 
+var (
+	onceTranscodingCache sync.Once
+	transcodingCache     TranscodingCache
+)
+
 func NewTranscodingCache() TranscodingCache {
-	return cache.NewFileCache("Transcoding", conf.Server.TranscodingCacheSize,
+	onceTranscodingCache.Do(func() {
+		transcodingCache = cache.NewFileCache("Transcoding", conf.Server.TranscodingCacheSize,
 			consts.TranscodingCacheDir, consts.DefaultTranscodingCacheMaxItems,
 			func(ctx context.Context, arg cache.Item) (io.Reader, error) {
 				job := arg.(*streamJob)
@@ -184,4 +191,6 @@ func NewTranscodingCache() TranscodingCache {
 				}
 				return out, nil
 			})
+	})
+	return transcodingCache
 }