From acec2a500c8ddd094157c7a3f41c5d95bc3a2be2 Mon Sep 17 00:00:00 2001
From: Steven Saus <steven@stevesaus.com>
Date: Mon, 7 Dec 2020 14:15:41 -0500
Subject: [PATCH] mpc find instead of mpc search so it stops overmatching

---
 mpdq | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mpdq b/mpdq
index d55df9d..f670579 100755
--- a/mpdq
+++ b/mpdq
@@ -189,11 +189,12 @@ function choose_next_song {
         OkayGenre=""
         while [ -z ${OkayGenre} ] && [ ${counter} -lt ${NUMGENRES} ] ;do 
             ChosenGenre=${ChooseGenre[$RANDOM % ${#ChooseGenre[@]} ]}
+            #echo "$ChosenGenre"
             UsedGenre=$(grep -c "@@@${ChosenGenre}" "${GenreLogFile}")   
             for (( i2 = 0; i2 < ${#ModGenre[@]}; i2++ ));do    
-            #echo "${ChosenGenre}:${UsedGenre} and ${ModGenre[$i2]}:${GenreWeight[$i2]}"          
+            
                 if [[ "${ChosenGenre}" = "${ModGenre[$i2]}" ]];then 
-                    
+                    #echo "${ChosenGenre}:${UsedGenre} and ${ModGenre[$i2]}:${GenreWeight[$i2]}"          
                     if [ "${UsedGenre}" -gt "${GenreWeight[$i2]}" ]; then  
                         echo "${ChosenGenre} already used up this hour, moving on"
                         OkayGenre=""
@@ -213,10 +214,11 @@ function choose_next_song {
     echo "$nowtime@@@${ChosenGenre}" >> "$GenreLogFile"
     echo "Choosing song from $ChosenGenre..."    
 
-    evalme=$(printf "mpc --host %s@%s --port %s search genre \"%s\" | shuf -n1" "$MPD_PASS" "$MPD_HOST" "$MPD_PORT" "${ChosenGenre}")
+    evalme=$(printf "mpc --host %s@%s --port %s find genre \"%s\" | shuf -n1" "$MPD_PASS" "$MPD_HOST" "$MPD_PORT" "$ChosenGenre")
+    #echo "$evalme"
     SongStem=$(eval "$evalme")
     # Changed to deal with more spaces and escaping...
-    #SongStem=$(mpc --host $MPD_PASS@$MPD_HOST --port $MPD_PORT search genre '${ChosenGenre}' | shuf -n1)
+    #SongStem=$(mpc --host $MPD_PASS@$MPD_HOST --port $MPD_PORT find genre '${ChosenGenre}' | shuf -n1)
     SongFile="$MPDBASE/$SongStem"
     #echo "$SongStem"
     #echo "$SongFile"