nik/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-10-18 07:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(scanner): shorten watcher path separator comments

Browse Source 
Signed-off-by: junkerderprovinz <jdp@braethoria.com>
This commit is contained in:
junkerderprovinz 2026-10-09 20:48:48 +02:00
parent a6e37e3ac1
commit 2983e0dd9a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scanner/watcher.go
View File

@ -251,9 +251,8 @@ func (w *watcher) processLibraryEvents(ctx context.Context, lib *model.Library,
log.Error(ctx, "Error getting relative path", "libraryID", lib.ID, "absolutePath", absLibPath, "path", path, err)
continue
}
// fs.FS paths always use "/", but filepath.Rel returns OS separators,
// so normalize before feeding the value to fs lookups and downstream
// notifications (otherwise back-slashes break matching on Windows).
// filepath.Rel returns OS separators, but fs.FS lookups and scan targets
// need "/" (os.DirFS rejects "\" on Windows).
path = filepath.ToSlash(path)
if isIgnoredPath(ctx, fsys, path) {
@ -304,8 +303,7 @@ func resolveFolderPath(fsys fs.FS, p string) string {
// Reached root, scan entire library
return ""
}
// Walk up the tree. fs.FS paths always use "/", so use path.Dir
// (filepath would emit "\" on Windows and never match the slash keys).
// Walk up the tree with path.Dir, since fs.FS paths use "/" on every OS
parent := path.Dir(folderPath)
if parent == "." || parent == folderPath {
return ""