feat: make loop control work

Malanius · Jan 5, 2024 · a914dce · a914dce
1 parent ab92c08
commit a914dce
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/scripts/spotify.sh b/scripts/spotify.sh
@@ -87,8 +87,8 @@ show_menu() {
         "Play/Pause" p "run -b '$CURRENT_DIR/play_pause.sh'" \
         "Next" n "run -b '$CURRENT_DIR/next_track.sh'" \
         "Previous" b "run -b '$CURRENT_DIR/previous_track.sh" \
-        "$shuffling_label" s "run -b '$CURRENT_DIR/toggle_shuffle.sh $is_shuffle_on" \
-        "$repeating_label" r "run -b 'source \"$CURRENT_DIR/spotify.sh\" && toggle_repeat $is_repeat_on'" \
+        "$shuffling_label" s "run -b '$CURRENT_DIR/toggle_shuffle.sh $is_shuffle_on'" \
+        "$repeating_label" r "run -b '$CURRENT_DIR/toggle_loop.sh $loop_status'" \
         "" \
         "Close menu" q ""
     )

diff --git a/scripts/toggle_loop.sh b/scripts/toggle_loop.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+current_loop=$1
+target=""
+if [[ "$current_loop" == "None" ]]; then
+    target="Playlist"
+elif [[ "$current_loop" == "Playlist" ]]; then
+    target="Track"
+else
+    target="None"
+fi
+
+busctl --user set-property org.mpris.MediaPlayer2.spotify \
+    /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player \
+    LoopStatus s "$target"
diff --git a/scripts/toggle_shuffle.sh b/scripts/toggle_shuffle.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 is_on=$1
-echo "is_on: $is_on"
 target=""
 if [[ "$is_on" == "true" ]]; then
     target="false"
@@ -11,7 +10,6 @@ else
     echo "Invalid argument: $is_on"
     exit 1
 fi
-echo "target: $target"
 
 busctl --user set-property org.mpris.MediaPlayer2.spotify \
     /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player \