refactor: return scan context from scanner

sentriz · Feb 24, 2022 · 10e8d18 · 10e8d18
1 parent b0d5861
commit 10e8d18
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 101 deletions.
diff --git a/server/ctrladmin/handlers.go b/server/ctrladmin/handlers.go
@@ -18,7 +18,7 @@ import (
 
 func doScan(scanner *scanner.Scanner, opts scanner.ScanOptions) {
 	go func() {
-		if err := scanner.ScanAndClean(opts); err != nil {
+		if _, err := scanner.ScanAndClean(opts); err != nil {
 			log.Printf("error while scanning: %v\n", err)
 		}
 	}()

diff --git a/server/ctrlsubsonic/handlers_common.go b/server/ctrlsubsonic/handlers_common.go
@@ -82,7 +82,7 @@ func (c *Controller) ServeGetMusicFolders(r *http.Request) *spec.Response {
 
 func (c *Controller) ServeStartScan(r *http.Request) *spec.Response {
 	go func() {
-		if err := c.Scanner.ScanAndClean(scanner.ScanOptions{}); err != nil {
+		if _, err := c.Scanner.ScanAndClean(scanner.ScanOptions{}); err != nil {
 			log.Printf("error while scanning: %v\n", err)
 		}
 	}()

diff --git a/server/mockfs/mockfs.go b/server/mockfs/mockfs.go
@@ -67,10 +67,12 @@ func new(t testing.TB, dirs []string) *MockFS {
 func (m *MockFS) DB() *db.DB     { return m.db }
 func (m *MockFS) TmpDir() string { return m.dir }
 
-func (m *MockFS) ScanAndClean() {
-	if err := m.scanner.ScanAndClean(scanner.ScanOptions{}); err != nil {
+func (m *MockFS) ScanAndClean() *scanner.Context {
+	ctx, err := m.scanner.ScanAndClean(scanner.ScanOptions{})
+	if err != nil {
 		m.t.Fatalf("error scan and cleaning: %v", err)
 	}
+	return ctx
 }
 
 func (m *MockFS) ResetDates() {