🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Ignore Recycle Bins in Windows. Fix #1074
Deluan339a6239fdfd
diff --git a/scanner/walk_dir_tree.go b/scanner/walk_dir_tree.goindex 3f8d10f4d..eee0cd5fd 100644--- a/scanner/walk_dir_tree.go+++ b/scanner/walk_dir_tree.go@@ -5,6 +5,7 @@ import ("io/fs""os""path/filepath"+ "runtime""sort""strings""time"@@ -159,10 +160,14 @@ func isDirOrSymlinkToDir(baseDir string, dirEnt fs.DirEntry) (bool, error) {// `ignore` file (named after consts.SkipScanFile)func isDirIgnored(baseDir string, dirEnt fs.DirEntry) bool {// allows Album folders for albums which e.g. start with ellipses- if strings.HasPrefix(dirEnt.Name(), ".") && !strings.HasPrefix(dirEnt.Name(), "..") {+ name := dirEnt.Name()+ if strings.HasPrefix(name, ".") && !strings.HasPrefix(name, "..") {return true}- _, err := os.Stat(filepath.Join(baseDir, dirEnt.Name(), consts.SkipScanFile))+ if runtime.GOOS == "windows" && strings.EqualFold(name, "$RECYCLE.BIN") {+ return true+ }+ _, err := os.Stat(filepath.Join(baseDir, name, consts.SkipScanFile))return err == nil}diff --git a/scanner/walk_dir_tree_test.go b/scanner/walk_dir_tree_test.goindex 170421ab8..aba257739 100644--- a/scanner/walk_dir_tree_test.go+++ b/scanner/walk_dir_tree_test.go@@ -79,6 +79,10 @@ var _ = Describe("walk_dir_tree", func() {dirEntry, _ := getDirEntry(baseDir, "...unhidden_folder")Expect(isDirIgnored(baseDir, dirEntry)).To(BeFalse())})+ It("returns false when folder name is $Recycle.Bin", func() {+ dirEntry, _ := getDirEntry(baseDir, "$Recycle.Bin")+ Expect(isDirIgnored(baseDir, dirEntry)).To(BeFalse())+ })})Describe("fullReadDir", func() {diff --git a/scanner/walk_dir_tree_windows_test.go b/scanner/walk_dir_tree_windows_test.gonew file mode 100644index 000000000..ef88779c9--- /dev/null+++ b/scanner/walk_dir_tree_windows_test.go@@ -0,0 +1,35 @@+package scanner++import (+ "path/filepath"++ . "github.com/onsi/ginkgo/v2"+ . "github.com/onsi/gomega"+)++var _ = Describe("walk_dir_tree_windows", func() {+ baseDir := filepath.Join("tests", "fixtures")++ Describe("isDirIgnored", func() {+ It("returns false for normal dirs", func() {+ dirEntry, _ := getDirEntry(baseDir, "empty_folder")+ Expect(isDirIgnored(baseDir, dirEntry)).To(BeFalse())+ })+ It("returns true when folder contains .ndignore file", func() {+ dirEntry, _ := getDirEntry(baseDir, "ignored_folder")+ Expect(isDirIgnored(baseDir, dirEntry)).To(BeTrue())+ })+ It("returns true when folder name starts with a `.`", func() {+ dirEntry, _ := getDirEntry(baseDir, ".hidden_folder")+ Expect(isDirIgnored(baseDir, dirEntry)).To(BeTrue())+ })+ It("returns false when folder name starts with ellipses", func() {+ dirEntry, _ := getDirEntry(baseDir, "...unhidden_folder")+ Expect(isDirIgnored(baseDir, dirEntry)).To(BeFalse())+ })+ It("returns true when folder name is $Recycle.Bin", func() {+ dirEntry, _ := getDirEntry(baseDir, "$Recycle.Bin")+ Expect(isDirIgnored(baseDir, dirEntry)).To(BeTrue())+ })+ })+})