🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Fix ignoring hidden folders when scanning
Deluan4514a547443e
diff --git a/scanner/load_tree.go b/scanner/load_tree.goindex a4b7a3f83..b5befb84c 100644--- a/scanner/load_tree.go+++ b/scanner/load_tree.go@@ -5,6 +5,7 @@ import ("io/ioutil""os""path/filepath"+ "strings""time""github.com/deluan/navidrome/consts"@@ -105,6 +106,9 @@ func isDirOrSymlinkToDir(baseDir string, dirInfo os.FileInfo) (bool, error) {// isDirIgnored returns true if the directory represented by dirInfo contains an// `ignore` file (named after consts.SkipScanFile)func isDirIgnored(baseDir string, dirInfo os.FileInfo) bool {+ if strings.HasPrefix(dirInfo.Name(), ".") {+ return true+ }_, err := os.Stat(filepath.Join(baseDir, dirInfo.Name(), consts.SkipScanFile))return err == nil}diff --git a/scanner/load_tree_test.go b/scanner/load_tree_test.goindex fb16b1c3c..e645e6f9a 100644--- a/scanner/load_tree_test.go+++ b/scanner/load_tree_test.go@@ -38,5 +38,9 @@ var _ = Describe("load_tree", func() {dir, _ := os.Stat(filepath.Join(baseDir, "ignored_folder"))Expect(isDirIgnored(baseDir, dir)).To(BeTrue())})+ It("returns true when folder name starts with a `.`", func() {+ dir, _ := os.Stat(filepath.Join(baseDir, ".hidden_folder"))+ Expect(isDirIgnored(baseDir, dir)).To(BeTrue())+ })})})diff --git a/tests/fixtures/.hidden_folder/.gitkeep b/tests/fixtures/.hidden_folder/.gitkeepnew file mode 100644index 000000000..e69de29bb