Merge pull request #115 from trobrock/ignore-hidden-folders

Ignore hidden folders
play · Mar 30, 2012 · a4a4a2c · a4a4a2c
2 parents 68a3382 + e95bead
commit a4a4a2c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/play/library.rb b/lib/play/library.rb
@@ -17,7 +17,7 @@ def self.monitor
     #
     # Returns an Array of String file paths.
     def self.fs_songs(path)
-      `find -L "#{path}" -type f ! -name '.*'`.split("\n")
+      `find -L "#{path}" -type f ! -path '#{path}/.*' ! -name '.*'`.split("\n")
     end
 
     # Imports an array of songs into the database.

diff --git a/test/library_test.rb b/test/library_test.rb
@@ -5,7 +5,9 @@
   end
 
   test "fs_songs" do
-    FileUtils.mkdir_p '/tmp/play'
+    FileUtils.mkdir_p '/tmp/play/.hidden'
+    FileUtils.touch '/tmp/play/.hidden/song_1'
+    FileUtils.touch '/tmp/play/.song_1'
     FileUtils.touch '/tmp/play/song_1'
     FileUtils.touch '/tmp/play/song_2'
     assert_equal 2, Library.fs_songs('/tmp/play').size