diff options
| author | Michael Olson <mwolson@gnu.org> | 2006-11-19 04:19:00 +0000 |
|---|---|---|
| committer | Michael Olson <mwolson@gnu.org> | 2006-11-19 04:19:00 +0000 |
| commit | 308290aa272fff106c81d1f4ae51b76190d8fe12 (patch) | |
| tree | a9ffb356c26849dcc2bc85e21f58ce96bf861172 | |
| parent | 35728800bcb93f1078d0d3c72b769b9010e2ab8a (diff) | |
Don't add subdirectories for directory and playlist-directory source insert methods
darcs-hash:20061119041900-1bfb2-8adccc41afb392449ac47e4c216d26d640d6b4d5.gz
| -rw-r--r-- | emms-source-file.el | 5 | ||||
| -rw-r--r-- | emms-source-playlist.el | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/emms-source-file.el b/emms-source-file.el index 7a395bd..e3c8a59 100644 --- a/emms-source-file.el +++ b/emms-source-file.el @@ -118,8 +118,9 @@ from the user." emms-source-file-default-directory t))) (mapc (lambda (file) - (unless (let ((case-fold-search nil)) - (string-match emms-source-file-exclude-regexp file)) + (unless (or (let ((case-fold-search nil)) + (string-match emms-source-file-exclude-regexp file)) + (file-directory-p file)) (emms-playlist-insert-track (emms-track 'file (expand-file-name file))))) (directory-files dir t (emms-source-file-regex)))) diff --git a/emms-source-playlist.el b/emms-source-playlist.el index e299e07..a123cf7 100644 --- a/emms-source-playlist.el +++ b/emms-source-playlist.el @@ -450,8 +450,9 @@ If DIR is not specified, it is queried from the user." emms-source-file-default-directory t))) (mapc (lambda (file) - (unless (let ((case-fold-search nil)) - (string-match emms-source-file-exclude-regexp file)) + (unless (or (let ((case-fold-search nil)) + (string-match emms-source-file-exclude-regexp file)) + (file-directory-p file)) (emms-playlist-insert-track (emms-track 'playlist (expand-file-name file))))) (directory-files dir t "^[^.]"))) |