change seperator handling

1 files changed, 77 insertions, 77 deletions

diff --git a/clerk b/clerk
index f9c9ded..acc5ea7 100755
--- a/clerk
+++ b/clerk
@@ -437,8 +437,8 @@ loadRSS () {
         managePlaylists
     else
         mpc load $(grep "$podcast" $HOME/.config/clerk/podcasts | cut -d '\' -f2)
-        episode=$(mpc playlist --format "%position% $seperator %artist% $seperator %title%" | dmenu_t -p "Choose Episode > ")
-        POS=$(echo "$episode" | awk -F " $seperator " '{ print $1 }')
+        episode=$(mpc playlist --format "%position%$seperator%artist%$seperator%title%" | dmenu_t -p "Choose Episode > ")
+        POS=$(echo "$episode" | awk -F "$seperator" '{ print $1 }')
         mpc play "$POS"
     fi
 }
@@ -482,9 +482,9 @@ resumePlaylist () {
 dplayQueue () {
     while read TRACKDISPLAY
     do
-        TITLE=$(echo "$TRACKDISPLAY" | awk -F " $seperator " '{ print $3 }')
-        ARTIST=$(echo "$TRACKDISPLAY" | awk -F " $seperator " '{ print $2 }')
-        POS=$(echo "$TRACKDISPLAY" | awk -F " $seperator " '{ print $1 }')
+        TITLE=$(echo "$TRACKDISPLAY" | awk -F "$seperator" '{ print $3 }')
+        ARTIST=$(echo "$TRACKDISPLAY" | awk -F "$seperator" '{ print $2 }')
+        POS=$(echo "$TRACKDISPLAY" | awk -F "$seperator" '{ print $1 }')
         if [[ "$TRACKDISPLAY" == "0  Return to Main Menu" ]]; then
             dplayPrompt
         elif [[ "$TRACKDISPLAY" == "Mode: Play" ]]; then
@@ -492,7 +492,7 @@ dplayQueue () {
         else
             mpc play $POS;
         fi
-    done < <(export seperator=$seperator; echo -e "0  Return to Main Menu\n---\nMode: Play\n---\n$(mpc playlist --format "%position% $seperator %artist% $seperator %title%")" | dmenu_t -p "Queue > ")
+    done < <(export seperator=$seperator; echo -e "0  Return to Main Menu\n---\nMode: Play\n---\n$(mpc playlist --format "%position%$seperator%artist%$seperator%title%")" | dmenu_t -p "Queue > ")
     exit
 }
 
@@ -500,9 +500,9 @@ dplayQueue () {
 dplayQueueDelete () {
     while read TRACKDISPLAY
     do
-        TITLE=$(echo "$TRACKDISPLAY" | awk -F " $seperator " '{ print $3 }')
-        ARTIST=$(echo "$TRACKDISPLAY" | awk -F " $seperator " '{ print $2 }')
-        POS=$(echo "$TRACKDISPLAY" | awk -F " $seperator " '{ print $1 }')
+        TITLE=$(echo "$TRACKDISPLAY" | awk -F "$seperator" '{ print $3 }')
+        ARTIST=$(echo "$TRACKDISPLAY" | awk -F "$seperator" '{ print $2 }')
+        POS=$(echo "$TRACKDISPLAY" | awk -F "$seperator" '{ print $1 }')
         if [[ "$TRACKDISPLAY" == "0  Return to Main Menu" ]]; then
             dplayPrompt
         elif [[ "$TRACKDISPLAY" == "Mode: Delete" ]]; then
@@ -513,7 +513,7 @@ dplayQueueDelete () {
             mpc del $POS;
             dplayQueueDelete
         fi
-    done < <(export seperator=$seperator; echo -e "0  Return to Main Menu\n---\nMode: Delete\n---\nManage Playlists\n---\n$(mpc playlist --format "%position% $seperator %artist% $seperator %title%")" | dmenu_t -p "Queue > ")
+    done < <(export seperator=$seperator; echo -e "0  Return to Main Menu\n---\nMode: Delete\n---\nManage Playlists\n---\n$(mpc playlist --format "%position%$seperator%artist%$seperator%title%")" | dmenu_t -p "Queue > ")
     exit
 }
 
@@ -573,8 +573,8 @@ currentAlbums () {
     ARTIST=$(mpc current -f %artist%)
     while read ALBUM
     do
-        ALBUM_FINAL=$(echo "$ALBUM" | awk -F " $seperator " '{print $2}')
-        DATE=$(echo "$ALBUM" | awk -F " $seperator " '{print $1}')
+        ALBUM_FINAL=$(echo "$ALBUM" | awk -F "$seperator" '{print $2}')
+        DATE=$(echo "$ALBUM" | awk -F "$seperator" '{print $1}')
         if [[ "$ALBUM" == "0  Return to current Artist Menu" ]]; then
             currentPrompt;
         else
@@ -584,15 +584,15 @@ currentAlbums () {
                 mpc search "$mpd_artist" "$ARTIST" album "$ALBUM_FINAL" date "$DATE" | mpc add
             fi
        fi
-    done < <(echo -e "0  Return to current Artist Menu\n---\nAdding Mode: Add\n---\n$(mppc search artist "$ARTIST" --format "{date} $seperator {album}" | sort | uniq)" | dmenu_t -p "Albums by $(mpc current --format '%artist%') > ")
+    done < <(echo -e "0  Return to current Artist Menu\n---\nAdding Mode: Add\n---\n$(mppc search artist "$ARTIST" --format "{date}$seperator{album}" | sort | uniq)" | dmenu_t -p "Albums by $(mpc current --format '%artist%') > ")
 }
 
 currentAlbumsInsert () {
     ARTIST=$(mpc current -f %artist%)
     while read ALBUM
     do
-        ALBUM_FINAL=$(echo "$ALBUM" | awk -F " $seperator " '{print $2}')
-        DATE=$(echo "$ALBUM" | awk -F " $seperator " '{print $1}')
+        ALBUM_FINAL=$(echo "$ALBUM" | awk -F "$seperator" '{print $2}')
+        DATE=$(echo "$ALBUM" | awk -F "$seperator" '{print $1}')
         if [[ "$ALBUM" == "0  Return to current Artist Menu" ]]; then
             currentPrompt;
         else
@@ -602,15 +602,15 @@ currentAlbumsInsert () {
                 mpc search "$mpd_artist" "$ARTIST" album "$ALBUM_FINAL" date "$DATE" | mpc insert
             fi
         fi
-    done < <(echo -e "0  Return to current Artist Menu\n---\nAdding Mode: Insert\n---\n$(mppc search artist "$ARTIST" --format "{date} $seperator {album}" | sort | uniq)" | dmenu_t -p "Albums by $(mpc current --format '%artist%') > ")
+    done < <(echo -e "0  Return to current Artist Menu\n---\nAdding Mode: Insert\n---\n$(mppc search artist "$ARTIST" --format "{date}$seperator{album}" | sort | uniq)" | dmenu_t -p "Albums by $(mpc current --format '%artist%') > ")
 }
 
 currentAlbumsReplace () {
     ARTIST=$(mpc current -f %artist%)
     while read ALBUM
     do
-        ALBUM_FINAL=$(echo "$ALBUM" | awk -F " $seperator " '{print $2}')
-        DATE=$(echo "$ALBUM" | awk -F " $seperator " '{print $1}')
+        ALBUM_FINAL=$(echo "$ALBUM" | awk -F "$seperator" '{print $2}')
+        DATE=$(echo "$ALBUM" | awk -F "$seperator" '{print $1}')
         if [[ "$ALBUM" == "0  Return to current Artist Menu" ]]; then
             currentPrompt;
         else
@@ -620,15 +620,15 @@ currentAlbumsReplace () {
                 mpc clear && mpc search "$mpd_artist" "$ARTIST" album "$ALBUM_FINAL" date "$DATE" | mpc add && mpc play
             fi
         fi
-    done < <(echo -e "0  Return to current Artist Menu\n---\nAdding Mode: Replace\n---\n$(mppc search artist "$ARTIST" --format "{date} $seperator {album}" | sort | uniq)" | dmenu_t -p "Albums by $(mpc current --format '%artist%') > ")
+    done < <(echo -e "0  Return to current Artist Menu\n---\nAdding Mode: Replace\n---\n$(mppc search artist "$ARTIST" --format "{date}$seperator{album}" | sort | uniq)" | dmenu_t -p "Albums by $(mpc current --format '%artist%') > ")
 }
 
 currentTracks () {
     while read TRACK
     do
-       TITLE=$(echo "$TRACK" | awk -F " $seperator " '{print $3}')
-       ALBUM=$(echo "$TRACK" | awk -F " $seperator " '{print $1}')
-       TRACKNUMBER=$(echo "$TRACK" | awk -F " $seperator " '{print $2}')
+       TITLE=$(echo "$TRACK" | awk -F "$seperator" '{print $3}')
+       ALBUM=$(echo "$TRACK" | awk -F "$seperator" '{print $1}')
+       TRACKNUMBER=$(echo "$TRACK" | awk -F "$seperator" '{print $2}')
        if [ "$TRACK" = "0  Return to current Artist Menu" ]; then
            currentPrompt;
        else
@@ -638,7 +638,7 @@ currentTracks () {
                mpc findadd album "$ALBUM" title "$TITLE" track "$TRACKNUMBER"
             fi
         fi
-    done < <(echo -e "0  Return to current Artist Menu\n---\nAdding Mode: Add\n---\n$(mppc search artist "$(mpc current -f %artist%)" --format "{album} $seperator {track} $seperator {title}")" | dmenu_t -p "Tracks by $(mpc current --format '%artist%') > ")
+    done < <(echo -e "0  Return to current Artist Menu\n---\nAdding Mode: Add\n---\n$(mppc search artist "$(mpc current -f %artist%)" --format "{album}$seperator{track}$seperator{title}")" | dmenu_t -p "Tracks by $(mpc current --format '%artist%') > ")
 }
 
 currentTracksInsert () {
@@ -646,9 +646,9 @@ currentTracksInsert () {
     random=$(echo "$status" | tail -1 | awk -F ':' '{ print $4 }' | cut -d ' ' -f 2)
     while read TRACK
     do
-        TITLE=$(echo "$TRACK" | awk -F " $seperator " '{print $3}')
-        ALBUM=$(echo "$TRACK" | awk -F " $seperator " '{print $1}')
-        TRACKNUMBER=$(echo "$TRACK" | awk -F " $seperator " '{print $2}')
+        TITLE=$(echo "$TRACK" | awk -F "$seperator" '{print $3}')
+        ALBUM=$(echo "$TRACK" | awk -F "$seperator" '{print $1}')
+        TRACKNUMBER=$(echo "$TRACK" | awk -F "$seperator" '{print $2}')
         if [ "$TRACK" = "0  Return to current Artist Menu" ]; then
             currentPrompt;
         else
@@ -663,7 +663,7 @@ currentTracksInsert () {
                 fi
             fi
         fi
-    done < <(echo -e "0  Return to current Artist Menu\n---\nAdding Mode: Insert\n---\n$(mppc search artist "$(mpc current -f %artist%)" --format "{album} $seperator {track} $seperator {title}")" | dmenu_t -p "Tracks by $(mpc current --format '%artist%') > ")
+    done < <(echo -e "0  Return to current Artist Menu\n---\nAdding Mode: Insert\n---\n$(mppc search artist "$(mpc current -f %artist%)" --format "{album}$seperator{track}$seperator{title}")" | dmenu_t -p "Tracks by $(mpc current --format '%artist%') > ")
 }
 
 escapeSql() {
@@ -838,9 +838,9 @@ addLastMod() {
             if [[ "$ALBUM" == "Adding Mode: Add" ]]
                 then insertLastMod
             else
-                artist=$(echo "$ALBUM" | awk -F " $seperator " '{print $2}')
-                date=$(echo "$ALBUM" | awk -F " $seperator " '{print $1}')
-                album=$(echo "$ALBUM" | awk -F " $seperator " '{print $3}')
+                artist=$(echo "$ALBUM" | awk -F "$seperator" '{print $2}')
+                date=$(echo "$ALBUM" | awk -F "$seperator" '{print $1}')
+                album=$(echo "$ALBUM" | awk -F "$seperator" '{print $3}')
                 mppc searchadd date "$date" album "$album" $mpd_artist "$artist"
             fi
         fi
@@ -859,9 +859,9 @@ insertLastMod() {
                 then replaceLastMod
             else
 export MPD_HOST=127.0.0.1
-                artist=$(echo "$ALBUM" | awk -F " $seperator " '{print $2}')
-                date=$(echo "$ALBUM" | awk -F " $seperator " '{print $1}')
-                album=$(echo "$ALBUM" | awk -F " $seperator " '{print $3}')
+                artist=$(echo "$ALBUM" | awk -F "$seperator" '{print $2}')
+                date=$(echo "$ALBUM" | awk -F "$seperator" '{print $1}')
+                album=$(echo "$ALBUM" | awk -F "$seperator" '{print $3}')
                 mppc search date "$date" album "$album" $mpd_artist "$artist" | mpc insert
             fi
         fi
@@ -879,9 +879,9 @@ replaceLastMod() {
             if [[ "$ALBUM" == "Adding Mode: Replace" ]]
                 then addLastMod
             else
-                artist=$(echo "$ALBUM" | awk -F " $seperator " '{print $2}')
-                date=$(echo "$ALBUM" | awk -F " $seperator " '{print $1}')
-                album=$(echo "$ALBUM" | awk -F " $seperator " '{print $3}')
+                artist=$(echo "$ALBUM" | awk -F "$seperator" '{print $2}')
+                date=$(echo "$ALBUM" | awk -F "$seperator" '{print $1}')
+                album=$(echo "$ALBUM" | awk -F "$seperator" '{print $3}')
                 mpc clear && mppc searchadd date "$date" album "$album" $mpd_artist "$artist" && mpc play
             fi
         fi
@@ -900,9 +900,9 @@ AddAlbumTags() {
             if [[ "$TRACK" == "Adding Mode: Add" ]]
                 then InsertAlbumTags
             else
-                artist=$(echo "$TRACK" | awk -F " $seperator " '{print $1}')
-                date=$(echo "$TRACK" | awk -F " $seperator " '{print $3}')
-                album=$(echo "$TRACK" | awk -F " $seperator " '{print $2}')
+                artist=$(echo "$TRACK" | awk -F "$seperator" '{print $1}')
+                date=$(echo "$TRACK" | awk -F "$seperator" '{print $3}')
+                album=$(echo "$TRACK" | awk -F "$seperator" '{print $2}')
                 mppc searchadd date "$date" album "$album" $mpd_artist "$artist"
             fi
         fi
@@ -924,9 +924,9 @@ InsertAlbumTags() {
             if [[ "$TRACK" == "Adding Mode: Insert" ]]
                 then ReplaceAlbumTags
             else
-                artist=$(echo "$TRACK" | awk -F " $seperator " '{print $1}')
-                date=$(echo "$TRACK" | awk -F " $seperator " '{print $3}')
-                album=$(echo "$TRACK" | awk -F " $seperator " '{print $2}')
+                artist=$(echo "$TRACK" | awk -F "$seperator" '{print $1}')
+                date=$(echo "$TRACK" | awk -F "$seperator" '{print $3}')
+                album=$(echo "$TRACK" | awk -F "$seperator" '{print $2}')
                 mpc search date "$date" album "$album" $mpd_artist "$artist" | mpc insert
             fi
         fi
@@ -944,9 +944,9 @@ ReplaceAlbumTags() {
             if [[ "$TRACK" == "Adding Mode: Replace" ]]
                 then AddAlbumTags
             else
-                artist=$(echo "$TRACK" | awk -F " $seperator " '{print $1}')
-                date=$(echo "$TRACK" | awk -F " $seperator " '{print $3}')
-                album=$(echo "$TRACK" | awk -F " $seperator " '{print $2}')
+                artist=$(echo "$TRACK" | awk -F "$seperator" '{print $1}')
+                date=$(echo "$TRACK" | awk -F "$seperator" '{print $3}')
+                album=$(echo "$TRACK" | awk -F "$seperator" '{print $2}')
                 mpc clear && mpc findadd date "$date" album "$album" $mpd_artist "$artist" && mpc play
             fi
         fi
@@ -1032,10 +1032,10 @@ AddTrackTags() {
             if [[ "$TRACK" == "Adding Mode: Add" ]]
                 then InsertTrackTags
             else
-                artist=$(echo "$TRACK" | awk -F " $seperator " '{print $1}')
-                album=$(echo "$TRACK" | awk -F " $seperator " '{print $4}')
-                track=$(echo "$TRACK" | awk -F " $seperator " '{print $2}')
-                title=$(echo "$TRACK" | awk -F " $seperator " '{print $3}')
+                artist=$(echo "$TRACK" | awk -F "$seperator" '{print $1}')
+                album=$(echo "$TRACK" | awk -F "$seperator" '{print $4}')
+                track=$(echo "$TRACK" | awk -F "$seperator" '{print $2}')
+                title=$(echo "$TRACK" | awk -F "$seperator" '{print $3}')
                 mpc findadd artist "$artist" album "$album" title "$title"
                 if [[ "$add_auto_play" ]]; then
                     mpc play $(mpc playlist | wc -l)
@@ -1057,17 +1057,17 @@ InsertTrackTags() {
                 then ReplaceTrackTags
             else
                 if [[ "$random" == "off" ]]; then
-                    artist=$(echo "$TRACK" | awk -F " $seperator " '{print $1}')
-                    album=$(echo "$TRACK" | awk -F " $seperator " '{print $4}')
-                    track=$(echo "$TRACK" | awk -F " $seperator " '{print $2}')
-                    title=$(echo "$TRACK" | awk -F " $seperator " '{print $3}')
+                    artist=$(echo "$TRACK" | awk -F "$seperator" '{print $1}')
+                    album=$(echo "$TRACK" | awk -F "$seperator" '{print $4}')
+                    track=$(echo "$TRACK" | awk -F "$seperator" '{print $2}')
+                    title=$(echo "$TRACK" | awk -F "$seperator" '{print $3}')
                     mpc find artist "$artist" album "$album" title "$title" | mpc insert
 
                 else
-                    artist=$(echo "$TRACK" | awk -F " $seperator " '{print $1}')
-                    album=$(echo "$TRACK" | awk -F " $seperator " '{print $4}')
-                    track=$(echo "$TRACK" | awk -F " $seperator " '{print $2}')
-                    title=$(echo "$TRACK" | awk -F " $seperator " '{print $3}')
+                    artist=$(echo "$TRACK" | awk -F "$seperator" '{print $1}')
+                    album=$(echo "$TRACK" | awk -F "$seperator" '{print $4}')
+                    track=$(echo "$TRACK" | awk -F "$seperator" '{print $2}')
+                    title=$(echo "$TRACK" | awk -F "$seperator" '{print $3}')
                     mpc findadd artist "$artist" album "$album" title "$title"
                     echo $(( $(mpc playlist|wc -l) - 1 )) | mppc prio
                 fi
@@ -1085,10 +1085,10 @@ ReplaceTrackTags() {
             if [[ "$TRACK" == "Adding Mode: Add" ]]
                 then AddTrackTags
             else
-                artist=$(echo "$TRACK" | awk -F " $seperator " '{print $1}')
-                album=$(echo "$TRACK" | awk -F " $seperator " '{print $4}')
-                track=$(echo "$TRACK" | awk -F " $seperator " '{print $2}')
-                title=$(echo "$TRACK" | awk -F " $seperator " '{print $3}')
+                artist=$(echo "$TRACK" | awk -F "$seperator" '{print $1}')
+                album=$(echo "$TRACK" | awk -F "$seperator" '{print $4}')
+                track=$(echo "$TRACK" | awk -F "$seperator" '{print $2}')
+                title=$(echo "$TRACK" | awk -F "$seperator" '{print $3}')
                 mpc clear && mpc findadd artist "$artist" album "$album" title "$title"
                 mpc play
             fi
@@ -1183,8 +1183,8 @@ browseDateAdd() {
         if [[ "$select" == "0  Return to Date Menu" ]]
             then browseDate
         else
-            artist=$(echo "$select" | awk -F " $seperator " '{print $1}')
-            album=$(echo "$select" | awk -F " $seperator " '{print $2}')
+            artist=$(echo "$select" | awk -F "$seperator" '{print $1}')
+            album=$(echo "$select" | awk -F "$seperator" '{print $2}')
             if [[ "$select" == "Add All" ]]; then
                 mpc findadd date "$date"
             elif [[ "$select" == "Replace All" ]]; then
@@ -1195,7 +1195,7 @@ browseDateAdd() {
                 mpc findadd artist "$artist" album "$album"
             fi
         fi
-    done < <(echo -e "0  Return to Date Menu\n---\nAdding Mode: Add\n---\nAdd All\nReplace All\n---\n$(mppc find date "$date" --format "{$mpd_artist} $seperator {album}" | uniq)" | dmenu_t -dmenu -p "Select Album > ")
+    done < <(echo -e "0  Return to Date Menu\n---\nAdding Mode: Add\n---\nAdd All\nReplace All\n---\n$(mppc find date "$date" --format "{$mpd_artist}$seperator{album}" | uniq)" | dmenu_t -dmenu -p "Select Album > ")
 
     if [[  $seen = 0 ]]
     then
@@ -1211,8 +1211,8 @@ browseDateInsert() {
         if [[ "$select" == "0  Return to Date Menu" ]]
             then browseDate
         else
-            artist=$(echo "$select" | awk -F " $seperator " '{print $1}')
-            album=$(echo "$select" | awk -F " $seperator " '{print $2}')
+            artist=$(echo "$select" | awk -F "$seperator" '{print $1}')
+            album=$(echo "$select" | awk -F "$seperator" '{print $2}')
             if [[ "$select" == "Add All" ]]; then
                 mpc findadd date "$date"
             elif [[ "$select" == "Replace All" ]]; then
@@ -1223,7 +1223,7 @@ browseDateInsert() {
                 mpc find artist "$artist" album "$album" | mpc insert
             fi
         fi
-    done < <(echo -e "0  Return to Date Menu\n---\nAdding Mode: Insert\n---\nAdd All\nReplace All\n---\n$(mppc find date "$date" --format "{$mpd_artist} $seperator {album}" | uniq)" | dmenu_t -dmenu -p "Select Album > ")
+    done < <(echo -e "0  Return to Date Menu\n---\nAdding Mode: Insert\n---\nAdd All\nReplace All\n---\n$(mppc find date "$date" --format "{$mpd_artist}$seperator{album}" | uniq)" | dmenu_t -dmenu -p "Select Album > ")
 
     if [[  $seen = 0 ]]
     then
@@ -1239,8 +1239,8 @@ browseDateReplace() {
         if [[ "$select" == "0  Return to Date Menu" ]]
             then browseDate
         else
-            artist=$(echo "$select" | awk -F " $seperator " '{print $1}')
-            album=$(echo "$select" | awk -F " $seperator " '{print $2}')
+            artist=$(echo "$select" | awk -F "$seperator" '{print $1}')
+            album=$(echo "$select" | awk -F "$seperator" '{print $2}')
             if [[ "$select" == "Add All" ]]; then
                 mpc findadd date "$date"
             elif [[ "$select" == "Replace All" ]]; then
@@ -1251,7 +1251,7 @@ browseDateReplace() {
                 mpc clear && mpc findadd artist "$artist" album "$album" && mpc play
             fi
         fi
-    done < <(echo -e "0  Return to Date Menu\n---\nAdding Mode: Replace\n---\nAdd All\nReplace All\n---\n$(mppc find date "$date" --format "{$mpd_artist} $seperator {album}" | uniq)" | dmenu_t -dmenu -p "Select Album > ")
+    done < <(echo -e "0  Return to Date Menu\n---\nAdding Mode: Replace\n---\nAdd All\nReplace All\n---\n$(mppc find date "$date" --format "{$mpd_artist}$seperator{album}" | uniq)" | dmenu_t -dmenu -p "Select Album > ")
 }
 
 
@@ -1333,8 +1333,8 @@ browseAlbum() {
     while read ALBUM
     do
         seen=1
-        ALBUM_FINAL=$(echo "$ALBUM" | awk -F " $seperator " '{ print $2 }')
-        DATE=$(echo "$ALBUM" | awk -F " $seperator " '{ print $1 }')
+        ALBUM_FINAL=$(echo "$ALBUM" | awk -F "$seperator" '{ print $2 }')
+        DATE=$(echo "$ALBUM" | awk -F "$seperator" '{ print $1 }')
         if [[ "$ALBUM" == "0  Return to Artist Menu" ]]
             then browseArtist
         elif [[ "$ALBUM" == "Replace All" ]]
@@ -1346,7 +1346,7 @@ browseAlbum() {
         else
             browseTrack
         fi
-    done < <(echo -e "0  Return to Artist Menu\n---\nReplace All\nAdd All\nInsert All\n---\n$(mppc find artist "$ARTIST" --format "{date} $seperator {album}" | sort | uniq)" | dmenu_t -dmenu -p "Choose Album > ")
+    done < <(echo -e "0  Return to Artist Menu\n---\nReplace All\nAdd All\nInsert All\n---\n$(mppc find artist "$ARTIST" --format "{date}$seperator{album}" | sort | uniq)" | dmenu_t -dmenu -p "Choose Album > ")
 
     if [[  $seen = 0 ]]
     then
@@ -1359,7 +1359,7 @@ browseTrack() {
     while read TRACK
     do
         seen=1
-        TRACKFINAL=$(echo "$TRACK" | awk -F " $seperator " '{ print $2 }')
+        TRACKFINAL=$(echo "$TRACK" | awk -F "$seperator" '{ print $2 }')
         if [[ "$TRACK" = "0  Return to Album Menu" ]]
             then browseAlbum
         elif [[ "$TRACK" == "Replace All" ]]
@@ -1375,7 +1375,7 @@ browseTrack() {
                 mppc findadd artist "$ARTIST" album "$ALBUM_FINAL" date "$DATE" title "$TRACKFINAL"
             fi
         fi
-    done < <(echo -e "0  Return to Album Menu\n---\nReplace All\nAdd All\nInsert All\n---\n$(mppc find artist "$ARTIST" album "$ALBUM_FINAL" --format "{track} $seperator {title}")" | dmenu_t -dmenu -p "Chose Track > ")
+    done < <(echo -e "0  Return to Album Menu\n---\nReplace All\nAdd All\nInsert All\n---\n$(mppc find artist "$ARTIST" album "$ALBUM_FINAL" --format "{track}$seperator{title}")" | dmenu_t -dmenu -p "Chose Track > ")
 
     if [[  $seen = 0 ]]; then
             exit
@@ -1442,10 +1442,10 @@ browseGenre2() {
         elif [[ "$ALBUM" == "Insert All" ]]
             then mpc find genre "$GENRE" | mpc insert
         else
-            ALBUM=$(echo "$ALBUM" | awk -F " $seperator " '{ print $2 }')
+            ALBUM=$(echo "$ALBUM" | awk -F "$seperator" '{ print $2 }')
             mpc findadd album "$ALBUM" genre "$GENRE" && mpc play
         fi
-    done < <(echo -e "0  Return to Genre Menu\n---\nAdd All\nInsert all\nReplace all\n---\n$(mppc search genre "$GENRE" --format "{$mpd_artist} $seperator {album} $seperator ({date})" | sort | uniq)" | dmenu_t -dmenu -p "Choose Album > ")
+    done < <(echo -e "0  Return to Genre Menu\n---\nAdd All\nInsert all\nReplace all\n---\n$(mppc search genre "$GENRE" --format "{$mpd_artist}$seperator{album}$seperator({date})" | sort | uniq)" | dmenu_t -dmenu -p "Choose Album > ")
 
     if [[  $seen = 0 ]]
     then