Make dependency injection more consistent

2024-05-08 22:21:38 -04:00
parent a0290587b9
commit 677d9947f3
11 changed files with 54 additions and 63 deletions
@@ -13,6 +13,7 @@ import (
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/server/events"
+	"github.com/navidrome/navidrome/utils/singleton"
 )

 type Scanner interface {
@@ -57,18 +58,20 @@ type scanStatus struct {
 	lastUpdate  time.Time
 }

-func New(ds model.DataStore, playlists core.Playlists, cacheWarmer artwork.CacheWarmer, broker events.Broker) Scanner {
-	s := &scanner{
-		ds:          ds,
-		pls:         playlists,
-		broker:      broker,
-		folders:     map[string]FolderScanner{},
-		status:      map[string]*scanStatus{},
-		lock:        &sync.RWMutex{},
-		cacheWarmer: cacheWarmer,
-	}
-	s.loadFolders()
-	return s
+func GetInstance(ds model.DataStore, playlists core.Playlists, cacheWarmer artwork.CacheWarmer, broker events.Broker) Scanner {
+	return singleton.GetInstance(func() *scanner {
+		s := &scanner{
+			ds:          ds,
+			pls:         playlists,
+			broker:      broker,
+			folders:     map[string]FolderScanner{},
+			status:      map[string]*scanStatus{},
+			lock:        &sync.RWMutex{},
+			cacheWarmer: cacheWarmer,
+		}
+		s.loadFolders()
+		return s
+	})
 }

 func (s *scanner) rescan(ctx context.Context, mediaFolder string, fullRescan bool) error {