Add scanner status

cmd/root.go

@@ -53,11 +53,8 @@ func runNavidrome() {
 
 	var g run.Group
 	g.Add(startServer())
-	if conf.Server.ScanInterval != 0 {
-		g.Add(startScanner())
-	} else {
-		log.Warn("Scanner is disabled", "interval", conf.Server.ScanInterval)
-	}
+	g.Add(startScanner())
+
 	if err := g.Run(); err != nil {
 		log.Error("Fatal error in Navidrome. Aborting", err)
 	}
@@ -83,25 +80,16 @@ func startScanner() (func() error, func(err error)) {
 	log.Info("Starting scanner", "interval", interval.String())
 	scanner := CreateScanner(conf.Server.MusicFolder)
 
-	ticker := time.NewTicker(interval)
-	done := make(chan bool)
-
 	return func() error {
-			time.Sleep(2 * time.Second) // Wait 2 seconds before the first scan
-			for {
-				if err := scanner.RescanAll(false); err != nil {
-					log.Error("Error scanning media folder", "folder", conf.Server.MusicFolder, err)
-				}
-				select {
-				case <-ticker.C:
-					continue
-				case <-done:
-					return nil
-				}
+			if interval != 0 {
+				go func() {
+					time.Sleep(2 * time.Second) // Wait 2 seconds before the first scan
+					scanner.RescanAll(false)
+				}()
 			}
+			return scanner.Start(interval)
 		}, func(err error) {
-			ticker.Stop()
-			done <- true
+			scanner.Stop()
 			if err != nil {
 				log.Error("Fatal error executing Scanner", err)
 			} else {

cmd/scan.go

@@ -1,8 +1,11 @@
 package cmd
 
 import (
+	"time"
+
 	"github.com/deluan/navidrome/conf"
 	"github.com/deluan/navidrome/log"
+	"github.com/deluan/navidrome/scanner"
 	"github.com/spf13/cobra"
 )
 
@@ -22,12 +25,23 @@ var scanCmd = &cobra.Command{
 	},
 }
 
+func waitScanToFinish(scanner scanner.Scanner) {
+	time.Sleep(500 * time.Millisecond)
+	ticker := time.Tick(100 * time.Millisecond)
+	for {
+		if !scanner.Scanning() {
+			return
+		}
+		<-ticker
+	}
+}
+
 func runScanner() {
 	scanner := CreateScanner(conf.Server.MusicFolder)
-	err := scanner.RescanAll(fullRescan)
-	if err != nil {
-		log.Error("Error scanning media folder", "folder", conf.Server.MusicFolder, err)
-	}
+	go func() { _ = scanner.Start(0) }()
+	scanner.RescanAll(fullRescan)
+	waitScanToFinish(scanner)
+	scanner.Stop()
 	if fullRescan {
 		log.Info("Finished full rescan")
 	} else {

cmd/wire_gen.go

@@ -25,7 +25,7 @@ func CreateServer(musicFolder string) *server.Server {
 	return serverServer
 }
 
-func CreateScanner(musicFolder string) *scanner.Scanner {
+func CreateScanner(musicFolder string) scanner.Scanner {
 	dataStore := persistence.New()
 	scannerScanner := scanner.New(dataStore)
 	return scannerScanner

cmd/wire_injectors.go

@@ -29,7 +29,7 @@ func CreateServer(musicFolder string) *server.Server {
 	))
 }
 
-func CreateScanner(musicFolder string) *scanner.Scanner {
+func CreateScanner(musicFolder string) scanner.Scanner {
 	panic(wire.Build(
 		allProviders,
 	))