1 files changed, 6 insertions, 2 deletions
diff --git a/clerk b/clerk
index 4f93f62..e91ef56 100755
--- a/clerk
+++ b/clerk
@@ -131,7 +131,9 @@ browseFilesystem () {
     chose() {
         if [[ -d "$selection" ]]; then
             cd "$selection"
-            selection="$(echo -e "0  Return to Library Menu\n---\n1  Add all music files\n---\n$(ls)" | dmenu_t -p "Chose Directory/Files > ")"
+            dirs="$(find . -maxdepth 1 \( ! -regex '.*/\..*' \) -type d | cut -c 3-)"
+            files="$(find -maxdepth 1 -type f -regex ".*/.*\.\(flac\|mp3\|ogg\|m4a\|wav\|wv\|mpc\|wma\|aac\)" | cut -c 3-)"
+            selection="$(echo -e "0  Return to Library Menu\n---\n1  Add all music files\n---\n..\n$(echo "$dirs")\n$(echo "$files")" | dmenu_t -p "$(realpath .) > ")"
             chose
         elif [[ "$selection" == "1  Add all music files" ]]; then
             comboadd
@@ -144,7 +146,9 @@ browseFilesystem () {
     }
 
     cd ~
-    selection="$(echo -e "0  Return to Library Menu\n---\n1  Add all music files\n---\n$(ls)" | dmenu_t -p "Chose Directory/Files > ")"
+    dirs="$(find . -maxdepth 1 \( ! -regex '.*/\..*' \) -type d | cut -c 3-)"
+    files="$(find -maxdepth 1 -type f -regex ".*/.*\.\(flac\|mp3\|ogg\|m4a\|wav\|wv\|mpc\|wma\|aac\)" | cut -c 3-)"
+    selection="$(echo -e "0  Return to Library Menu\n---\n1  Add all music files\n---\n..\n$(echo "$dirs")\n$(echo "$files")" | dmenu_t -p "$(realpath .) > ")"
     chose
 }