arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Add more trace logging to scanner

Browse Source
This commit is contained in:
Deluan
2020-07-12 13:30:03 -04:00
parent 74cf0ee1c1
commit 064da8e034
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scanner/change_detector.go
+11 -7
View File
@@ -1,6 +1,7 @@
package scanner package scanner
import ( import (
"context"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@@ -29,11 +30,12 @@ func NewChangeDetector(rootFolder string) *ChangeDetector {
} }
} }
func (s *ChangeDetector) Scan(lastModifiedSince time.Time) (changed []string, deleted []string, err error) { func (s *ChangeDetector) Scan(ctx context.Context, lastModifiedSince time.Time) (changed []string, deleted []string, err error) {
start := time.Now() start := time.Now()
newMap := make(dirInfoMap) newMap := make(dirInfoMap)
err = s.loadMap(newMap, s.rootFolder, lastModifiedSince, false) err = s.loadMap(ctx, newMap, s.rootFolder, lastModifiedSince, false)
if err != nil { if err != nil {
log.Error("Error reading folder tree", "folder", s.rootFolder, err)
return return
} }
changed, deleted, err = s.checkForUpdates(lastModifiedSince, newMap) changed, deleted, err = s.checkForUpdates(lastModifiedSince, newMap)
@@ -42,20 +44,22 @@ func (s *ChangeDetector) Scan(lastModifiedSince time.Time) (changed []string, de
} }
elapsed := time.Since(start) elapsed := time.Since(start)
log.Trace("Folder analysis complete\n", "total", len(newMap), "changed", len(changed), "deleted", len(deleted), "elapsed", elapsed) log.Trace(ctx, "Folder analysis complete\n", "total", len(newMap), "changed", len(changed), "deleted", len(deleted), "elapsed", elapsed)
s.dirMap = newMap s.dirMap = newMap
return return
} }
func (s *ChangeDetector) loadDir(dirPath string) (children []string, lastUpdated time.Time, err error) { func (s *ChangeDetector) loadDir(ctx context.Context, dirPath string) (children []string, lastUpdated time.Time, err error) {
dirInfo, err := os.Stat(dirPath) dirInfo, err := os.Stat(dirPath)
if err != nil { if err != nil {
log.Error(ctx, "Error stating dir", "path", dirPath)
return return
} }
lastUpdated = dirInfo.ModTime() lastUpdated = dirInfo.ModTime()
files, err := ioutil.ReadDir(dirPath) files, err := ioutil.ReadDir(dirPath)
if err != nil { if err != nil {
log.Error(ctx, "Error reading dir", "path", dirPath)
return return
} }
for _, f := range files { for _, f := range files {
@@ -112,14 +116,14 @@ func isDirReadable(baseDir string, dirInfo os.FileInfo) bool {
return res return res
} }
func (s *ChangeDetector) loadMap(dirMap dirInfoMap, path string, since time.Time, maybe bool) error { func (s *ChangeDetector) loadMap(ctx context.Context, dirMap dirInfoMap, path string, since time.Time, maybe bool) error {
children, lastUpdated, err := s.loadDir(path) children, lastUpdated, err := s.loadDir(ctx, path)
if err != nil { if err != nil {
return err return err
} }
maybe = maybe || lastUpdated.After(since) maybe = maybe || lastUpdated.After(since)
for _, c := range children { for _, c := range children {
err := s.loadMap(dirMap, c, since, maybe) err := s.loadMap(ctx, dirMap, c, since, maybe)
if err != nil { if err != nil {
return err return err
} }
scanner/change_detector_test.go
+9 -9
View File
@@ -27,7 +27,7 @@ var _ = Describe("ChangeDetector", func() {
It("detects changes recursively", func() { It("detects changes recursively", func() {
// Scan empty folder // Scan empty folder
changed, deleted, err := scanner.Scan(lastModifiedSince) changed, deleted, err := scanner.Scan(nil, lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(ConsistOf(".")) Expect(changed).To(ConsistOf("."))
@@ -38,7 +38,7 @@ var _ = Describe("ChangeDetector", func() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
changed, deleted, err = scanner.Scan(lastModifiedSince) changed, deleted, err = scanner.Scan(nil, lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(ConsistOf(".", P("a"))) Expect(changed).To(ConsistOf(".", P("a")))
@@ -49,14 +49,14 @@ var _ = Describe("ChangeDetector", func() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
changed, deleted, err = scanner.Scan(lastModifiedSince) changed, deleted, err = scanner.Scan(nil, lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(ConsistOf(P("a"), P("a/b"), P("a/b/c"))) Expect(changed).To(ConsistOf(P("a"), P("a/b"), P("a/b/c")))
// Scan with no changes // Scan with no changes
lastModifiedSince = nowWithDelay() lastModifiedSince = nowWithDelay()
changed, deleted, err = scanner.Scan(lastModifiedSince) changed, deleted, err = scanner.Scan(nil, lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(BeEmpty()) Expect(changed).To(BeEmpty())
@@ -67,7 +67,7 @@ var _ = Describe("ChangeDetector", func() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
changed, deleted, err = scanner.Scan(lastModifiedSince) changed, deleted, err = scanner.Scan(nil, lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(ConsistOf(P("a/b"))) Expect(changed).To(ConsistOf(P("a/b")))
@@ -78,7 +78,7 @@ var _ = Describe("ChangeDetector", func() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
changed, deleted, err = scanner.Scan(lastModifiedSince) changed, deleted, err = scanner.Scan(nil, lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(ConsistOf(P("a/b"))) Expect(changed).To(ConsistOf(P("a/b")))
@@ -89,7 +89,7 @@ var _ = Describe("ChangeDetector", func() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
changed, deleted, err = scanner.Scan(lastModifiedSince) changed, deleted, err = scanner.Scan(nil, lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(ConsistOf(P("a/b/c"))) Expect(deleted).To(ConsistOf(P("a/b/c")))
Expect(changed).To(ConsistOf(P("a/b"))) Expect(changed).To(ConsistOf(P("a/b")))
@@ -97,7 +97,7 @@ var _ = Describe("ChangeDetector", func() {
// Only returns changes after lastModifiedSince // Only returns changes after lastModifiedSince
lastModifiedSince = nowWithDelay() lastModifiedSince = nowWithDelay()
newScanner := NewChangeDetector(testFolder) newScanner := NewChangeDetector(testFolder)
changed, deleted, err = newScanner.Scan(lastModifiedSince) changed, deleted, err = newScanner.Scan(nil, lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(BeEmpty()) Expect(changed).To(BeEmpty())
@@ -105,7 +105,7 @@ var _ = Describe("ChangeDetector", func() {
f, _ := os.Create(filepath.Join(testFolder, "a", "b", "new.txt")) f, _ := os.Create(filepath.Join(testFolder, "a", "b", "new.txt"))
_ = f.Close() _ = f.Close()
changed, deleted, err = newScanner.Scan(lastModifiedSince) changed, deleted, err = newScanner.Scan(nil, lastModifiedSince)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
Expect(deleted).To(BeEmpty()) Expect(deleted).To(BeEmpty())
Expect(changed).To(ConsistOf(P("a/b"))) Expect(changed).To(ConsistOf(P("a/b")))
scanner/tag_scanner.go
+3 -1
View File
@@ -67,7 +67,9 @@ const (
// Delete all empty albums, delete all empty Artists // Delete all empty albums, delete all empty Artists
func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time) error { func (s *TagScanner) Scan(ctx context.Context, lastModifiedSince time.Time) error {
start := time.Now() start := time.Now()
changed, deleted, err := s.detector.Scan(lastModifiedSince) log.Trace(ctx, "Looking for changes in music folder", "folder", s.rootFolder)
changed, deleted, err := s.detector.Scan(ctx, lastModifiedSince)
if err != nil { if err != nil {
return err return err
} }