Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix slow vol set. move user setting to cfg file. message prints optional #159

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix slow vol set. move user setting to cfg file. message prints optional #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 49 additions & 32 deletions spotify
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

USER_CONFIG_DEFAULTS="CLIENT_ID=\"\"\nCLIENT_SECRET=\"\"";
USER_CONFIG_DEFAULTS="CLIENT_ID=\"\"\nCLIENT_SECRET=\"\"\nVOL_INCREMENT=10\nVERBOSE_MODE=True";
USER_CONFIG_FILE="${HOME}/.shpotify.cfg";
if ! [[ -f "${USER_CONFIG_FILE}" ]]; then
touch "${USER_CONFIG_FILE}";
Expand All @@ -35,7 +35,6 @@ fi
source "${USER_CONFIG_FILE}";

# Set the percent change in volume for vol up and vol down
VOL_INCREMENT=10

showAPIHelp() {
echo;
Expand Down Expand Up @@ -98,9 +97,20 @@ showHelp () {
}

cecho(){
bold=$(tput bold);
green=$(tput setaf 2);
reset=$(tput sgr0);
local bold=$(tput bold);
local green=$(tput setaf 2);
local reset=$(tput sgr0);
echo $bold$green"$1"$reset;
}

vecho(){
## Verbose Echo. Can turn on-off with VERBOSE_MODE
if ! $VERBOSE_MODE ; then
return 1
fi
local bold=$(tput bold);
local green=$(tput setaf 2);
local reset=$(tput sgr0);
echo $bold$green"$1"$reset;
}

Expand All @@ -118,7 +128,7 @@ showTrack() {

showStatus () {
state=`osascript -e 'tell application "Spotify" to player state as string'`;
cecho "Spotify is currently $state.";
vecho "Spotify is currently $state.";
duration=`osascript -e 'tell application "Spotify"
set durSec to (duration of current track / 1000) as text
set tM to (round (durSec / 60) rounding down) as text
Expand Down Expand Up @@ -183,7 +193,7 @@ while [ $# -gt 0 ]; do
SPOTIFY_PLAY_URI="";

getAccessToken() {
cecho "Connecting to Spotify's API";
vecho "Connecting to Spotify's API";

SPOTIFY_TOKEN_RESPONSE_DATA=$( \
curl "${SPOTIFY_TOKEN_URI}" \
Expand Down Expand Up @@ -213,7 +223,7 @@ while [ $# -gt 0 ]; do

getAccessToken;

cecho "Searching ${type}s for: $Q";
vecho "Searching ${type}s for: $Q";

SPOTIFY_PLAY_URI=$( \
curl -s -G $SPOTIFY_SEARCH_API \
Expand All @@ -232,7 +242,7 @@ while [ $# -gt 0 ]; do

getAccessToken;

cecho "Searching playlists for: $Q";
vecho "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" -H "Authorization: Bearer ${SPOTIFY_ACCESS_TOKEN}" \
Expand Down Expand Up @@ -265,12 +275,13 @@ while [ $# -gt 0 ]; do

if [ "$SPOTIFY_PLAY_URI" != "" ]; then
if [ "$2" = "uri" ]; then
cecho "Playing Spotify URI: $SPOTIFY_PLAY_URI";
vecho "Playing Spotify URI: $SPOTIFY_PLAY_URI";
else
cecho "Playing ($Q Search) -> Spotify URI: $SPOTIFY_PLAY_URI";
fi

osascript -e "tell application \"Spotify\" to play track \"$SPOTIFY_PLAY_URI\"";
showStatus;

else
cecho "No results when searching for $Q";
Expand All @@ -279,17 +290,17 @@ while [ $# -gt 0 ]; do
else

# play is the only param
cecho "Playing Spotify.";
vecho "Playing Spotify.";
osascript -e 'tell application "Spotify" to play';
fi
break ;;

"pause" )
state=`osascript -e 'tell application "Spotify" to player state as string'`;
if [ $state = "playing" ]; then
cecho "Pausing Spotify.";
vecho "Pausing Spotify.";
else
cecho "Playing Spotify.";
vecho "Playing Spotify.";
fi

osascript -e 'tell application "Spotify" to playpause';
Expand All @@ -298,60 +309,66 @@ while [ $# -gt 0 ]; do
"stop" )
state=`osascript -e 'tell application "Spotify" to player state as string'`;
if [ $state = "playing" ]; then
cecho "Pausing Spotify.";
vecho "Pausing Spotify.";
osascript -e 'tell application "Spotify" to playpause';
else
cecho "Spotify is already stopped."
vecho "Spotify is already stopped."
fi

break ;;

"quit" ) cecho "Quitting Spotify.";
"quit" ) vecho "Quitting Spotify.";
osascript -e 'tell application "Spotify" to quit';
exit 0 ;;

"next" ) cecho "Going to next track." ;
"next" ) vecho "Going to next track." ;
osascript -e 'tell application "Spotify" to next track';
showStatus;
if ! $VERBOSE_MODE; then
showStatus;
fi
break ;;

"prev" ) cecho "Going to previous track.";
"prev" ) vecho "Going to previous track.";
osascript -e '
tell application "Spotify"
set player position to 0
previous track
end tell';
showStatus;
if ! $VERBOSE_MODE; then
showStatus;
fi
break ;;

"replay" ) cecho "Replaying current track.";
"replay" ) vecho "Replaying current track.";
osascript -e 'tell application "Spotify" to set player position to 0'
break ;;

"vol" )
vol=`osascript -e 'tell application "Spotify" to sound volume as integer'`;
if [[ $2 = "" || $2 = "show" ]]; then
vol=`osascript -e 'tell application "Spotify" to sound volume as integer'`;
cecho "Current Spotify volume level is $vol.";
break ;
elif [ "$2" = "up" ]; then
if [ $vol -le $(( 100-$VOL_INCREMENT )) ]; then
vol=`osascript -e 'tell application "Spotify" to sound volume as integer'`;
if [ $vol -le $(( 100-$VOL_INCREMENT )) ]; then
newvol=$(( vol+$VOL_INCREMENT ));
cecho "Increasing Spotify volume to $newvol.";
vecho "Increasing Spotify volume to $newvol.";
else
newvol=100;
cecho "Spotify volume level is at max.";
vecho "Spotify volume level is at max.";
fi
elif [ "$2" = "down" ]; then
vol=`osascript -e 'tell application "Spotify" to sound volume as integer'`;
if [ $vol -ge $(( $VOL_INCREMENT )) ]; then
newvol=$(( vol-$VOL_INCREMENT ));
cecho "Reducing Spotify volume to $newvol.";
vecho "Reducing Spotify volume to $newvol.";
else
newvol=0;
cecho "Spotify volume level is at min.";
vecho "Spotify volume level is at min.";
fi
elif [[ $2 =~ ^[0-9]+$ ]] && [[ $2 -ge 0 && $2 -le 100 ]]; then
newvol=$2;
cecho "Setting Spotify volume level to $newvol";
vecho "Setting Spotify volume level to $newvol";
else
echo "Improper use of 'vol' command"
echo "The 'vol' command should be used as follows:"
Expand All @@ -369,11 +386,11 @@ while [ $# -gt 0 ]; do
if [ "$2" = "shuffle" ]; then
osascript -e 'tell application "Spotify" to set shuffling to not shuffling';
curr=`osascript -e 'tell application "Spotify" to shuffling'`;
cecho "Spotify shuffling set to $curr";
vecho "Spotify shuffling set to $curr";
elif [ "$2" = "repeat" ]; then
osascript -e 'tell application "Spotify" to set repeating to not repeating';
curr=`osascript -e 'tell application "Spotify" to repeating'`;
cecho "Spotify repeating set to $curr";
vecho "Spotify repeating set to $curr";
fi
break ;;

Expand Down Expand Up @@ -437,7 +454,7 @@ while [ $# -gt 0 ]; do
set info to info & "\nRepeating: " & repeating
end tell
return info'`
cecho "$info";
echo "$info";
break ;;

"share" )
Expand All @@ -462,7 +479,7 @@ while [ $# -gt 0 ]; do
break ;;

"pos" )
cecho "Adjusting Spotify play position."
vecho "Adjusting Spotify play position."
osascript -e "tell application \"Spotify\" to set player position to $2";
break ;;

Expand Down