Update app.py

app.py

@@ -1,16 +1,15 @@
 import os
 import random
+import time
 import gradio as gr
 import spotipy
 from spotipy.oauth2 import SpotifyOAuth
 
-# Spotify credentials (set in HF Spaces Secrets)
 CLIENT_ID = os.environ["SPOTIFY_CLIENT_ID"]
 CLIENT_SECRET = os.environ["SPOTIFY_CLIENT_SECRET"]
 REDIRECT_URI = "https://jisaacso219-rng-shuffle.hf.space/"
 SCOPE = "user-read-playback-state user-modify-playback-state playlist-read-private"
 
-# OAuth setup
 sp_oauth = SpotifyOAuth(
     client_id=CLIENT_ID,
     client_secret=CLIENT_SECRET,
@@ -23,10 +22,12 @@ sp = None
 user_playlists = {}
 device_map = {}
 
+
 def get_auth_url():
     return sp_oauth.get_authorize_url()
 
-def try_login(current_url):
+
+def try_login(current_url, filter_keyword):
     global sp, user_playlists, device_map
 
     if "?code=" not in current_url:
@@ -42,39 +43,42 @@ def try_login(current_url):
     access_token = token_info["access_token"]
     sp = spotipy.Spotify(auth=access_token)
 
-    # Get playlists
     playlists = sp.current_user_playlists(limit=50)["items"]
-    user_playlists = {p["name"]: p["id"] for p in playlists}
+    user_playlists.clear()
+    for p in playlists:
+        name = p["name"]
+        if not filter_keyword or filter_keyword.lower() in name.lower():
+            user_playlists[name] = p["id"]
 
-    # Get active devices
     devices = sp.devices()["devices"]
-    device_map = {d["name"]: d["id"] for d in devices}
+    device_map.clear()
+    for d in devices:
+        device_map[d["name"]] = d["id"]
 
     if not device_map:
         return (
-            gr.update(value="⚠️ No active Spotify devices found. Open Spotify on your phone or PC."),
+            gr.update(value="⚠️ No active Spotify devices found."),
             gr.update(visible=False),
             gr.update(visible=False),
             gr.update(visible=False),
         )
 
     return (
-        gr.update(value="✅ Logged in! Pick a playlist and device."),
+        gr.update(value="✅ Logged in!"),
         gr.update(visible=True, choices=list(user_playlists.keys())),
         gr.update(visible=True, choices=list(device_map.keys())),
         gr.update(visible=True),
     )
 
+
 def shuffle_and_play(playlist_name, device_name):
     pid = user_playlists.get(playlist_name)
     device_id = device_map.get(device_name)
 
     if not pid or not device_id:
-        return "❌ Invalid playlist or device selection."
+        return "❌ Invalid playlist or device."
 
-    # Fetch and shuffle tracks
-    tracks = []
-    res = sp.playlist_tracks(pid)
+    tracks, res = [], sp.playlist_tracks(pid)
     tracks.extend(res["items"])
     while res["next"]:
         res = sp.next(res)
@@ -84,32 +88,58 @@ def shuffle_and_play(playlist_name, device_name):
     random.shuffle(uris)
 
     try:
-        # Limit to first 100 tracks to avoid 413 error
         sp.start_playback(device_id=device_id, uris=uris[:100])
-        return f"▶️ Now playing: **{playlist_name}** on **{device_name}**"
+        # queue remaining
+        for uri in uris[100:]:
+            sp.add_to_queue(uri, device_id=device_id)
+            time.sleep(0.1)  # avoid rate limit
+        return f"▶️ Now playing **{playlist_name}** on **{device_name}**."
     except Exception as e:
         return f"❌ Playback failed: {str(e)}"
 
+
+def now_playing():
+    try:
+        data = sp.current_playback()
+        if not data or not data.get("is_playing"):
+            return "⚠️ Nothing is currently playing."
+        track = data["item"]
+        name = track["name"]
+        artist = ", ".join([a["name"] for a in track["artists"]])
+        album = track["album"]["name"]
+        image = track["album"]["images"][0]["url"]
+        html = f"""
+        <img src='{image}' width='300'><br>
+        <b>{name}</b> by {artist}<br>
+        <i>{album}</i>
+        """
+        return html
+    except Exception as e:
+        return f"❌ Error fetching current track: {e}"
+
 with gr.Blocks() as demo:
     gr.Markdown("## 🎵 RNG Spotify Playlist Shuffler")
+    gr.HTML(f'<a href="{get_auth_url()}"><button style="width:100%;height:40px;">🔐 Login to Spotify</button></a>')
 
-    gr.HTML(f'<a href="{get_auth_url()}"><button style="width:100%; height:40px;">🔐 Login to Spotify</button></a>')
-
-    url_state   = gr.Textbox(visible=False)
-    status      = gr.Markdown()
+    url_state = gr.Textbox(visible=False)
+    filter_txt = gr.Textbox(label="Optional: Filter Playlists by Keyword")
+    status = gr.Markdown()
     playlist_dd = gr.Dropdown(label="Step 2: Select a Playlist", visible=False)
-    device_dd   = gr.Dropdown(label="Step 3: Select a Device", visible=False)
+    device_dd = gr.Dropdown(label="Step 3: Select a Device", visible=False)
     shuffle_btn = gr.Button("🔀 Step 4: Shuffle & Play", visible=False)
-    result      = gr.Markdown()
+    result = gr.Markdown()
+    now_box = gr.HTML()
+    refresh_btn = gr.Button("🔁 Show Current Track")
 
     demo.load(
         fn=try_login,
-        inputs=[url_state],
+        inputs=[url_state, filter_txt],
         outputs=[status, playlist_dd, device_dd, shuffle_btn],
         js="() => window.location.href"
     )
 
     shuffle_btn.click(shuffle_and_play, [playlist_dd, device_dd], [result])
+    refresh_btn.click(now_playing, outputs=[now_box])
 
 if __name__ == "__main__":
     demo.launch(server_name="0.0.0.0", ssr_mode=False)