nik/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-08-01 07:21:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 645d8be41ca58740ffdfbdd18f2196d3b6a21d5d into 59b6755014be0ec7e722ec94819723b28875e403

Browse Source
This commit is contained in:
吴杨帆 2026-05-29 08:17:22 +08:00 committed by GitHub
commit 8e0c46685c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scanner/walk_dir_tree.go
View File

@ -233,16 +233,13 @@ var ignoredDirs = []string{
"#snapshot",
"@Recycle",
"@Recently-Snapshot",
".git",
".streams",
"lost+found",
}
// isDirIgnored returns true if the directory represented by dirEnt should be ignored
func isDirIgnored(name string) bool {
// allows Album folders for albums which eg start with ellipses
if strings.HasPrefix(name, ".") && !strings.HasPrefix(name, "..") {
return true
}
if slices.ContainsFunc(ignoredDirs, func(s string) bool { return strings.EqualFold(s, name) }) {
return true
}

12
scanner/walk_dir_tree_test.go
View File

@ -45,6 +45,7 @@ var _ = Describe("walk_dir_tree", func() {
"root/d/f3.mp3": {},
"root/e/original/f1.mp3": {},
"root/e/symlink": {Mode: fs.ModeSymlink, Data: []byte("original")},
"root/f/.5 The Gray Chapter/track.mp3": {},
},
}
job = &scanJob{
@ -92,6 +93,10 @@ var _ = Describe("walk_dir_tree", func() {
Expect(folders["root/c"].audioFiles).To(BeEmpty())
Expect(folders["root/c"].imageFiles).To(BeEmpty())
Expect(folders).ToNot(HaveKey("root/d"))
Expect(folders["root/f/.5 The Gray Chapter"].audioFiles).To(SatisfyAll(
HaveLen(1),
HaveKey("track.mp3"),
))
// Symlink specific checks
if followSymlinks {
@ -100,8 +105,8 @@ var _ = Describe("walk_dir_tree", func() {
Expect(folders).ToNot(HaveKey("root/e/symlink"))
}
},
Entry("with symlinks enabled", true, 7),
Entry("with symlinks disabled", false, 6),
Entry("with symlinks enabled", true, 8),
Entry("with symlinks disabled", false, 7),
)
})
@ -270,7 +275,8 @@ var _ = Describe("walk_dir_tree", func() {
Expect(isDirIgnored(dirName)).To(Equal(expected))
},
Entry("normal dir", "empty_folder", false),
Entry("hidden dir", ".hidden_folder", true),
Entry("dot-prefixed album dir", ".5 The Gray Chapter", false),
Entry("hidden system dir", ".git", true),
Entry("dir starting with ellipsis", "...unhidden_folder", false),
Entry("recycle bin", "$Recycle.Bin", true),
Entry("snapshot dir", "#snapshot", true),