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

fix(scanner): watcher not working with relative MusicFolder

Browse Source 
Signed-off-by: Deluan <deluan@navidrome.org>
This commit is contained in:
Deluan
2025-03-12 18:13:22 -04:00
parent 226be78bf5
commit 5fb1db6031
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scanner/watcher.go
+9 -4
View File
@@ -101,22 +101,27 @@ func watchLib(ctx context.Context, lib model.Library, watchChan chan struct{}) {
log.Error(ctx, "Watcher: Error watching library", "library", lib.ID, "path", lib.Path, err) log.Error(ctx, "Watcher: Error watching library", "library", lib.ID, "path", lib.Path, err)
return return
} }
log.Info(ctx, "Watcher started", "library", lib.ID, "path", lib.Path) absLibPath, err := filepath.Abs(lib.Path)
if err != nil {
log.Error(ctx, "Watcher: Error converting lib.Path to absolute", "library", lib.ID, "path", lib.Path, err)
return
}
log.Info(ctx, "Watcher started", "library", lib.ID, "libPath", lib.Path, "absoluteLibPath", absLibPath)
for { for {
select { select {
case <-ctx.Done(): case <-ctx.Done():
return return
case path := <-c: case path := <-c:
path, err = filepath.Rel(lib.Path, path) path, err = filepath.Rel(absLibPath, path)
if err != nil { if err != nil {
log.Error(ctx, "Watcher: Error getting relative path", "library", lib.ID, "path", path, err) log.Error(ctx, "Watcher: Error getting relative path", "library", lib.ID, "libPath", absLibPath, "path", path, err)
continue continue
} }
if isIgnoredPath(ctx, fsys, path) { if isIgnoredPath(ctx, fsys, path) {
log.Trace(ctx, "Watcher: Ignoring change", "library", lib.ID, "path", path) log.Trace(ctx, "Watcher: Ignoring change", "library", lib.ID, "path", path)
continue continue
} }
log.Trace(ctx, "Watcher: Detected change", "library", lib.ID, "path", path) log.Trace(ctx, "Watcher: Detected change", "library", lib.ID, "path", path, "libPath", absLibPath)
watchChan <- struct{}{} watchChan <- struct{}{}
} }
} }