outsourced threaded random to own function, removed code

1 files changed, 8 insertions, 21 deletions

diff --git a/clerk b/clerk
index 3354e36..dd49874 100755
--- a/clerk
+++ b/clerk
@@ -726,21 +726,21 @@ playRandomAlbum () {
 }
 
 playRandomTracks () {
+    addRandomT () {
+        artist="$(mpc list "$mpd_artist" | shuf -n 1)"
+        album="$(mpc list album "$mpd_artist" "$artist" | shuf -n 1)"
+        title="$(mpc list title album "$album" "$mpd_artist" "$artist" | shuf -n 1)"
+        mpc find album "$album" "$mpd_artist" "$artist" title "$title" | mpc add
+    }
     mpc clear
-    artist="$(mpc list "$mpd_artist" | shuf -n 1)"
-    album="$(mpc list album "$mpd_artist" "$artist" | shuf -n 1)"
-    title="$(mpc list title album "$album" "$mpd_artist" "$artist" | shuf -n 1)"
-    mpc find album "$album" "$mpd_artist" "$artist" title "$title" | mpc add
+    addRandomT
     mpc play
 
     nThreads=4
 
     for (( i=0, j=1; i<value; i++, j++ )); do
         {
-            artist="$(mpc list "$mpd_artist" | shuf -n 1)"
-            album="$(mpc list album "$mpd_artist" "$artist" | shuf -n 1)"
-            title="$(mpc list title album "$album" "$mpd_artist" "$artist" | shuf -n 1)"
-            mpc find album "$album" "$mpd_artist" "$artist" title "$title" | mpc add
+            addRandomT
         } &
 
         if [ $j -eq $nThreads ]; then
@@ -752,19 +752,6 @@ playRandomTracks () {
 
     wait
     mpc play
-#    mpc clear
-#    artist="$(mpc list "$mpd_artist" | shuf -n 1)"
-#    album="$(mpc list album "$mpd_artist" "$artist" | shuf -n 1)"
-#    title="$(mpc list title album "$album" "$mpd_artist" "$artist" | shuf -n 1)"
-#    mpc find album "$album" "$mpd_artist" "$artist" title "$title" | mpc add
-#    mpc play
-#    n=0; while (( n++ < $value -1 ));
-#    do
-#        artist="$(mpc list "$mpd_artist" | shuf -n 1)"
-#        album="$(mpc list album "$mpd_artist" "$artist" | shuf -n 1)"
-#        title="$(mpc list title album "$album" "$mpd_artist" "$artist" | shuf -n 1)"
-#        mpc find album "$album" "$mpd_artist" "$artist" title "$title" | mpc add
-#    done
 }
 
 addLastMod() {