From b0d414db9cefd89c9476030e6850db4656b122f4 Mon Sep 17 00:00:00 2001
From: Rasmus Steinke <rasi@xssn.at>
Date: Thu, 18 Sep 2014 11:27:03 +0200
Subject: fixed

---
 clerk | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 4 deletions(-)

(limited to 'clerk')

diff --git a/clerk b/clerk
index 4305d9f..ca49b4a 100755
--- a/clerk
+++ b/clerk
@@ -1399,8 +1399,8 @@ browseGenre2() {
     while read ARTIST
     do
         seen=1
-        export GENRE="$ARTIST"
-        if [[ "$GENRE" == "0  Return to Genre Menu" ]]
+        export ARTIST="$ARTIST"
+        if [[ "$ARTIST" == "0  Return to Genre Menu" ]]
             then browseGenre
         elif [[ "$ARTIST" == "Replace All" ]]
             then mpc clear && mpc add / && mpc play
@@ -1409,9 +1409,36 @@ browseGenre2() {
         elif [[ "$ARTIST" == "Insert All" ]]
             then mpc insert /
         else
-            browseAlbum
+            browseGenre3
+        fi
+    done < <(echo -e "0  Return to Main Menu\n---\nAdd All\nInsert all\nReplace all\n---\n$(mppc list $mpd_artist genre "$GENRE" )" | dmenu_t -dmenu -p "Choose Genre > ")
+
+    if [[  $seen = 0 ]]
+    then
+        exit
+    fi
+}
+
+browseGenre3() {
+    ALBUMS=$(mppc list album "$ARTIST")
+    declare -i seen=0
+    while read ALBUM
+    do
+        seen=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 browseGenre2
+        elif [[ "$ALBUM" == "Replace All" ]]
+            then mpc clear && mppc findadd artist "$ARTIST" && mpc play
+        elif [[ "$ALBUM" == "Add All" ]]
+            then mppc findadd artist "$ARTIST"
+        elif [[ "$ALBUM" == "Insert All" ]]
+            then mppc find artist "$ARTIST" --format '{file}'| mpc insert
+        else
+            browseGenre4
         fi
-    done < <(echo -e "0  Return to Main Menu\n---\nAdd All\nInsert all\nReplace all\n---\n$(mpc list artist genre "$GENRE")" | dmenu_t -dmenu -p "Choose Genre > ")
+    done < <(echo -e "0  Return to Artist Menu\n---\nReplace All\nAdd All\nInsert All\n---\n$(mppc find $mpd_artist "$ARTIST" genre "$GENRE" --format "{date} $seperator {album}" | sort | uniq)" | dmenu_t -dmenu -p "Choose Album > ")
 
     if [[  $seen = 0 ]]
     then
@@ -1419,6 +1446,34 @@ browseGenre2() {
     fi
 }
 
+browseGenre4() {
+    declare -i seen=0
+    while read TRACK
+    do
+        seen=1
+        TRACKFINAL=$(echo "$TRACK" | awk -F " $seperator " '{ print $2 }')
+        if [[ "$TRACK" = "0  Return to Album Menu" ]]
+            then browseGenre3
+        elif [[ "$TRACK" == "Replace All" ]]
+            then mpc clear && mppc findadd artist "$ARTIST" album "$ALBUM_FINAL" date "$DATE" && mpc play
+        elif [[ "$TRACK" == "Add All" ]]
+            then mppc findadd artist "$ARTIST" album "$ALBUM_FINAL" date "$DATE"
+        elif [[ "$TRACK" == "Insert All" ]]
+            then mppc find artist "$ARTIST" album "$ALBUM_FINAL" date "$DATE" --format '{file}' | mpc insert
+        else
+            if [[ $(mpc playlist) == "" ]]; then
+                mppc findadd artist "$ARTIST" album "$ALBUM_FINAL" date "$DATE" title "$TRACKFINAL" && mpc play
+            else
+                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 $mpd_artist "$ARTIST" album "$ALBUM_FINAL" --format "{track} $seperator {title}")" | dmenu_t -dmenu -p "Chose Track > ")
+
+    if [[  $seen = 0 ]]; then
+            exit
+    fi
+}
+
 
 ################################################################################
 
-- 
cgit v1.2.3-24-g4f1b