fixed last issues with suspend/resume (hopefully)

1 files changed, 10 insertions, 9 deletions

diff --git a/clerk b/clerk
index 51c68e4..e805ac4 100755
--- a/clerk
+++ b/clerk
@@ -389,7 +389,6 @@ suspendPlaylist () {
     playing=$(! mpc status | grep playing)
     state=$(mpc status | tail -2 | head -1)
     time=$(echo "$state" | awk -F ' ' '{ print $NF }' | sed 's/[)(]//g')
-    song=$(mpc current --format '%file%')
     position=$(mpc current --format '%position%')
     if [[ -z "$playing" ]]; then
         echo "mpd is not playing"
@@ -397,24 +396,26 @@ suspendPlaylist () {
         mpc rm resume
         mpc save resume
         rm -f $HOME/.config/clerk/mpd_saved
-        echo "song="$song"" > $HOME/.config/clerk/mpd_saved
         echo "pos="$position"" >> $HOME/.config/clerk/mpd_saved
         echo "time="$time"" >> $HOME/.config/clerk/mpd_saved
     fi
 }
 
 resumePlaylist () {
-    playing=$(! mpc status | grep playing)
-    state=$(mpc status | tail -2 | head -1)
-    time=$(echo "$state" | awk -F ' ' '{ print $NF }' | sed 's/[)(]//g')
-    song=$(mpc current --format '%file%')
-    position=$(mpc current --format '%position%')
+    http=$(! mpc current --format %file% | grep -eV 'http://')
     source $HOME/.config/clerk/mpd_saved
     mpc clear
     mpc load resume
     mpc play $pos
-    sleep 2
-    mpc seek "$time"
+    mpc toggle
+    if [[ -z "$http" ]]; then
+        sleep 2
+        mpc seek "$time"
+        mpc toggle
+    else
+        mpc seek "$time"
+        mpc toggle
+    fi
 }
 
 dplayQueue () {