- added RepeatActiom

- UI now updates elements every second

Author: bamarc

README.md

@@ -1,13 +1,14 @@
 # Spotify Control for StreamController
 
-This WIP plugin allows you to control Spotify using StreamController.
+This WIP plugin allows you to control Spotify using StreamController. (Spotify Premium required)
 
 It currently only provides actions for:
 
   * play/pause/resume
   * next song
   * previous song
   * switch shuffle mode
+  * switch repeat mode
   * adjust volume in 10% steps
   * show cover-art in play/resume button
 
@@ -27,7 +28,6 @@ It currently only provides actions for:
 
 ## TODO:
 
-- automatic refresh of icons based on spotify state
 - more functions
 - cleanup Code
 

actions/MediaActions/PlayResumeAction.py

@@ -35,6 +35,7 @@ def get_controller(self) -> SpotifyController:
 
     def on_ready(self) -> None:
         self.update_state()
+        self.get_controller.register_update_callback(self.update_state)
 
     def on_key_down(self) -> None:
         print("Key down")
@@ -77,7 +78,7 @@ def merge_icon_on_background_centered(
         Returns:
             A new PIL Image object with the icon composited onto the background.
         """
-        if not background_img or not icon_img:
+        if background_img is None or icon_img is None:
             raise ValueError("Both background and icon images must be provided.")
 
         # Ensure images are in RGBA format to handle transparency properly
@@ -156,15 +157,16 @@ def load_background_media(self) -> Image.Image | None:
         except Exception as e:
             log.error(f"An unexpected error occurred while setting background: {e}")
 
-
-
-    def update_state(self):
-        playing = self.get_controller.is_playing()
+    def update_state(self, state=None):
+        playing = self.get_controller.is_playing(state)
         icon_path = self.play_icon if not playing else self.pause_icon
         background = self.load_background_media()
         icon = self.load_overlay(icon_path)
-        combined = self.merge_icon_on_background_centered(background, icon)
-        self.set_media(image=combined.copy())
+        if background and icon:
+            combined = self.merge_icon_on_background_centered(background, icon)
+            self.set_media(image=combined.copy())
+        elif background is None and icon:
+            self.set_media(image=icon)
 
 
 

actions/MediaActions/RepeatAction.py

@@ -0,0 +1,53 @@
+# Import StreamController modules
+from src.backend.PluginManager.ActionBase import ActionBase
+from src.backend.DeckManagement.DeckController import DeckController
+from src.backend.PageManagement.Page import Page
+from src.backend.PluginManager.PluginBase import PluginBase
+
+# Import python modules
+import os
+from loguru import logger as log
+from GtkHelper.GenerativeUI.EntryRow import EntryRow # For regular text input
+from GtkHelper.GenerativeUI.PasswordEntryRow import PasswordEntryRow # For secrets
+
+# Import gtk modules - used for the config rows
+import gi
+
+from ...utils.SpotifyController import SpotifyController
+
+gi.require_version("Gtk", "4.0")
+gi.require_version("Adw", "1")
+from gi.repository import Gtk, Adw
+
+class Repeat(ActionBase):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.repeat_context_icon = os.path.join(self.plugin_base.PATH, "assets", "repeat.png")
+        self.repeat_one_icon = os.path.join(self.plugin_base.PATH, "assets", "repeat_one.png")
+        self.no_repeat_icon = os.path.join(self.plugin_base.PATH, "assets", "no_repeat.png")
+        self.repeat_states = ["off", "track", "context"]
+        self.icon_paths = [self.no_repeat_icon, self.repeat_one_icon, self.repeat_context_icon]
+
+    @property
+    def get_controller(self) -> SpotifyController:
+        return self.plugin_base.get_controller
+
+    def on_ready(self) -> None:
+        self.on_update()
+        self.get_controller.register_update_callback(self.on_update)
+
+    def on_key_down(self) -> None:
+        repeat = self.get_controller.get_repeat_state()
+        idx = max((self.repeat_states.index(repeat)+1)%3,0)
+        next_state = self.repeat_states[idx]
+        next_state_icon = self.repeat_context_icon[idx]
+        self.get_controller.set_repeat(next_state)
+        self.set_media(media_path=next_state_icon, size=0.75)
+
+    def on_update(self, state=None):
+        repeat_state = self.get_controller.get_repeat_state(state)
+        icon = self.icon_paths[self.repeat_states.index(repeat_state)]
+        self.set_media(media_path=icon, size=0.75)
+
+    def on_key_up(self) -> None:
+        pass

actions/MediaActions/ShuffleAction.py

@@ -31,12 +31,16 @@ def get_controller(self) -> SpotifyController:
         return self.plugin_base.get_controller
 
     def on_ready(self) -> None:
-        shuffle = self.get_controller.get_shuffle_state()
+        self.on_update()
+        self.get_controller.register_update_callback(self.on_update)
+
+    def on_key_down(self) -> None:
+        shuffle = self.get_controller.switch_shuffle()
         icon_path = self.shuffle_icon if shuffle else self.no_shuffle_icon
         self.set_media(media_path=icon_path, size=0.75)
 
-    def on_key_down(self) -> None:
-        shuffle = self.get_controller.shuffle()
+    def on_update(self, state=None):
+        shuffle = self.get_controller.get_shuffle_state(state)
         icon_path = self.shuffle_icon if shuffle else self.no_shuffle_icon
         self.set_media(media_path=icon_path, size=0.75)
 

actions/MediaActions/VolumeActions.py

@@ -60,5 +60,27 @@ def on_key_down(self) -> None:
         self.get_controller.set_volume(max(current_volume - 10, 0))
 
 
+    def on_key_up(self) -> None:
+        pass
+
+class VolumeMute(ActionBase):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.icon = os.path.join(self.plugin_base.PATH, "assets", "volume_down.png")
+
+
+    @property
+    def get_controller(self) -> SpotifyController:
+        return self.plugin_base.get_controller
+
+    def on_ready(self) -> None:
+        icon_path = self.icon
+        self.set_media(media_path=icon_path, size=0.75)
+
+    def on_key_down(self) -> None:
+        current_volume = self.get_controller.get_volume()
+        self.get_controller.set_volume(max(current_volume - 10, 0))
+
+
     def on_key_up(self) -> None:
         pass

assets/mute.png

@@ -8,6 +8,7 @@
 from .actions.MediaActions.NextSongAction import Next
 from .actions.MediaActions.PreviousSongAction import Previous
 from .actions.MediaActions.ShuffleAction import Shuffle
+from .actions.MediaActions.RepeatAction import Repeat
 from .actions.MediaActions.VolumeActions import VolumeDown, VolumeUp
 
 from loguru import logger as log
@@ -60,6 +61,14 @@ def __init__(self):
         )
         self.add_action_holder(self.previous_holder)
 
+        self.previous_holder = ActionHolder(
+            plugin_base=self,
+            action_base=Repeat,
+            action_id="de_outsider_Spotify::Repeat",  # Change this to your own plugin id
+            action_name="Toggle Repeat Mode",
+        )
+        self.add_action_holder(self.previous_holder)
+
         self.previous_holder = ActionHolder(
             plugin_base=self,
             action_base=VolumeUp,
@@ -80,7 +89,7 @@ def __init__(self):
         self.register(
             plugin_name = "Spotify For StreamController",
             github_repo = "https://github.com/bamarc/SpotifyForStreamController",
-            plugin_version = "0.1.0",
+            plugin_version = "0.2.0",
             app_version = "1.5.0-beta-10"
         )
 

main.py

@@ -1,5 +1,5 @@
 {
-    "version": "0.1.0",
+    "version": "0.2.0",
     "thumbnail": "assets/remote.png",
     "id": "de_outsider_Spotify",
     "name": "Spotify for StreamController",