Remove current Image Cache implementation

core/artwork.go

@@ -2,18 +2,13 @@ package core
 
 import (
 	"context"
-	"fmt"
 	_ "image/gif"
 	_ "image/png"
 	"io"
-	"sync"
-	"time"
 
-	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/resources"
-	"github.com/navidrome/navidrome/utils/cache"
 	_ "golang.org/x/image/webp"
 )
 
@@ -21,44 +16,14 @@ type Artwork interface {
 	Get(ctx context.Context, id string, size int) (io.ReadCloser, error)
 }
 
-type ArtworkCache cache.FileCache
-
-func NewArtwork(ds model.DataStore, cache ArtworkCache) Artwork {
-	return &artwork{ds: ds, cache: cache}
+func NewArtwork(ds model.DataStore) Artwork {
+	return &artwork{ds: ds}
 }
 
 type artwork struct {
-	ds    model.DataStore
-	cache cache.FileCache
+	ds model.DataStore
 }
 
 func (a *artwork) Get(ctx context.Context, id string, size int) (io.ReadCloser, error) {
 	return resources.FS().Open(consts.PlaceholderAlbumArt)
 }
-
-type imageInfo struct {
-	a          *artwork
-	id         string
-	path       string
-	size       int
-	lastUpdate time.Time
-}
-
-func (ci *imageInfo) Key() string {
-	return fmt.Sprintf("%s.%d.%s.%d", ci.path, ci.size, ci.lastUpdate.Format(time.RFC3339Nano), conf.Server.CoverJpegQuality)
-}
-
-var (
-	onceImageCache     sync.Once
-	instanceImageCache ArtworkCache
-)
-
-func GetImageCache() ArtworkCache {
-	onceImageCache.Do(func() {
-		instanceImageCache = cache.NewFileCache("Image", conf.Server.ImageCacheSize, consts.ImageCacheDir, consts.DefaultImageCacheMaxItems,
-			func(ctx context.Context, arg cache.Item) (io.Reader, error) {
-				return nil, nil
-			})
-	})
-	return instanceImageCache
-}

core/cache_warmer.go

@@ -1,87 +0,0 @@
-package core
-
-import (
-	"context"
-	"io"
-	"time"
-
-	"github.com/navidrome/navidrome/conf"
-	"github.com/navidrome/navidrome/log"
-	"github.com/navidrome/navidrome/utils/pool"
-)
-
-type CacheWarmer interface {
-	AddAlbum(ctx context.Context, albumID string)
-	Flush(ctx context.Context)
-}
-
-func NewCacheWarmer(artwork Artwork, artworkCache ArtworkCache) CacheWarmer {
-	w := &warmer{
-		artwork:      artwork,
-		artworkCache: artworkCache,
-		albums:       map[string]struct{}{},
-	}
-	p, err := pool.NewPool("artwork", 3, w.execute)
-	if err != nil {
-		log.Error(context.Background(), "Error creating pool for Album Artwork Cache Warmer", err)
-	} else {
-		w.pool = p
-	}
-
-	return w
-}
-
-type warmer struct {
-	pool         *pool.Pool
-	artwork      Artwork
-	artworkCache ArtworkCache
-	albums       map[string]struct{}
-}
-
-func (w *warmer) AddAlbum(ctx context.Context, albumID string) {
-	if albumID == "" {
-		return
-	}
-	w.albums[albumID] = struct{}{}
-}
-
-func (w *warmer) waitForCacheReady(ctx context.Context) {
-	for !w.artworkCache.Ready(ctx) {
-		time.Sleep(time.Second)
-	}
-}
-
-func (w *warmer) Flush(ctx context.Context) {
-	if conf.Server.DevPreCacheAlbumArtwork {
-		w.waitForCacheReady(ctx)
-		if w.artworkCache.Available(ctx) {
-			if w.pool == nil || len(w.albums) == 0 {
-				return
-			}
-			log.Info(ctx, "Pre-caching album artworks", "numAlbums", len(w.albums))
-			for id := range w.albums {
-				w.pool.Submit(artworkItem{albumID: id})
-			}
-		} else {
-			log.Warn(ctx, "Cache warmer is not available as ImageCache is DISABLED")
-		}
-	}
-	w.albums = map[string]struct{}{}
-}
-
-func (w *warmer) execute(workload interface{}) {
-	ctx := context.Background()
-	item := workload.(artworkItem)
-	log.Trace(ctx, "Pre-caching album artwork", "albumID", item.albumID)
-	r, err := w.artwork.Get(ctx, item.albumID, 0)
-	if err != nil {
-		log.Warn("Error pre-caching artwork from album", "id", item.albumID, err)
-		return
-	}
-	defer r.Close()
-	_, _ = io.Copy(io.Discard, r)
-}
-
-type artworkItem struct {
-	albumID string
-}

core/wire_providers.go

@@ -11,10 +11,8 @@ var Set = wire.NewSet(
 	NewArtwork,
 	NewMediaStreamer,
 	GetTranscodingCache,
-	GetImageCache,
 	NewArchiver,
 	NewExternalMetadata,
-	NewCacheWarmer,
 	NewPlayers,
 	agents.New,
 	transcoder.New,