From 5165bb07eaaffb8dd06df75accee0331425cc7c1 Mon Sep 17 00:00:00 2001
From: Harish Narayanan <hnarayanan@gmail.com>
Date: Mon, 11 Dec 2017 14:15:05 +0000
Subject: [PATCH] Merge with the upstream shpotify project

- Fix playlist playback
- Add a 'stop' command
---
 plugins/osx/spotify | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/plugins/osx/spotify b/plugins/osx/spotify
index 344a05a17..69f6c5419 100644
--- a/plugins/osx/spotify
+++ b/plugins/osx/spotify
@@ -72,7 +72,8 @@ showHelp () {
     echo "  prev                         # Returns to the previous song in a playlist.";
     echo "  replay                       # Replays the current track from the begining.";
     echo "  pos <time>                   # Jumps to a time (in secs) in the current song.";
-    echo "  pause                        # Pauses Spotify playback.";
+    echo "  pause                        # Pauses (or resumes) Spotify playback.";
+    echo "  stop                         # Stops playback.";
     echo "  quit                         # Stops playback and quits Spotify.";
     echo;
     echo "  vol up                       # Increases the volume by 10%.";
@@ -162,10 +163,7 @@ while [ $# -gt 0 ]; do
                 SHPOTIFY_CREDENTIALS=$(printf "${CLIENT_ID}:${CLIENT_SECRET}" | base64 | tr -d "\n");
                 SPOTIFY_PLAY_URI="";
 
-                searchAndPlay() {
-                    type="$1"
-                    Q="$2"
-
+                getAccessToken() {
                     cecho "Connecting to Spotify's API";
 
                     SPOTIFY_TOKEN_RESPONSE_DATA=$( \
@@ -188,6 +186,13 @@ while [ $# -gt 0 ]; do
                         | sed 's/"//g' \
                         | sed 's/,.*//g' \
                     )
+                }
+
+                searchAndPlay() {
+                    type="$1"
+                    Q="$2"
+
+                    getAccessToken;
 
                     cecho "Searching ${type}s for: $Q";
 
@@ -207,10 +212,12 @@ while [ $# -gt 0 ]; do
                         _args=${array[@]:2:$len};
                         Q=$_args;
 
+                        getAccessToken;
+
                         cecho "Searching playlists for: $Q";
 
                         results=$( \
-                            curl -s -G $SPOTIFY_SEARCH_API --data-urlencode "q=$Q" -d "type=playlist&limit=10&offset=0" -H "Accept: application/json" \
+                            curl -s -G $SPOTIFY_SEARCH_API --data-urlencode "q=$Q" -d "type=playlist&limit=10&offset=0" -H "Accept: application/json" -H "Authorization: Bearer ${SPOTIFY_ACCESS_TOKEN}" \
                             | grep -E -o "spotify:user:[a-zA-Z0-9_]+:playlist:[a-zA-Z0-9]+" -m 10 \
                         )
 
@@ -270,6 +277,17 @@ while [ $# -gt 0 ]; do
             osascript -e 'tell application "Spotify" to playpause';
             break ;;
 
+        "stop"    )
+            state=`osascript -e 'tell application "Spotify" to player state as string'`;
+            if [ $state = "playing" ]; then
+              cecho "Pausing Spotify.";
+              osascript -e 'tell application "Spotify" to playpause';
+            else
+              cecho "Spotify is already stopped."
+            fi
+
+            break ;;
+
         "quit"    ) cecho "Quitting Spotify.";
             osascript -e 'tell application "Spotify" to quit';
             exit 1 ;;