Update app.py

app.py

@@ -4,7 +4,11 @@ import spotipy
 from spotipy.oauth2 import SpotifyOAuth
 import random
 
+# ——————————————————————————————
+# 1. Hard-code your Redirect URI here:
 REDIRECT_URI = "https://jisaacso219-rng-shuffle.hf.space/"
+
+# 2. Keep only your client creds in Secrets:
 CLIENT_ID     = os.environ["SPOTIFY_CLIENT_ID"]
 CLIENT_SECRET = os.environ["SPOTIFY_CLIENT_SECRET"]
 SCOPE         = (
@@ -28,9 +32,10 @@ def get_auth_url():
     return sp_oauth.get_authorize_url()
 
 def check_login(code: str):
+    """Called on every page-load via demo.load; shows playlist dropdown once code is present."""
     global sp, user_playlists
     if not code:
-        # hide everything until we actually get a code
+        # still waiting for Spotify redirect
         return gr.update(visible=False), gr.update(visible=False, choices=[])
     token = sp_oauth.get_access_token(code, as_dict=False)
     sp = spotipy.Spotify(auth=token)
@@ -55,7 +60,7 @@ def load_playlist_info(pl_name: str):
     return html, gr.update(visible=True)
 
 def shuffle_and_play(pl_name: str):
-    pid = user_playlists[pl_name]
+    pid     = user_playlists[pl_name]
     tracks, results = [], sp.playlist_tracks(pid)
     tracks.extend(results["items"])
     while results["next"]:
@@ -66,6 +71,7 @@ def shuffle_and_play(pl_name: str):
     if not devices:
         return gr.update(value="⚠️ No active device. Open Spotify and try again.", visible=True)
     sp.start_playback(device_id=devices[0]["id"], uris=uris)
+
     now = sp.current_playback()
     if now and now.get("item"):
         it      = now["item"]
@@ -84,32 +90,54 @@ with gr.Blocks() as demo:
     gr.Markdown("## 🎵 RNG Spotify Playlist Shuffler")
     gr.Markdown("Login, pick a playlist, then shuffle & play—all in one flow.")
 
-    # Step 1: Login button
-    login_btn = gr.Button("🔐 Step 1: Login to Spotify", link=get_auth_url())
+    # 1️⃣ Login button: redirect current tab to Spotify auth
+    login_btn = gr.Button("🔐 Step 1: Login to Spotify")
+    login_btn.click(
+        fn=None, inputs=None, outputs=None,
+        js=f"() => window.location.href = '{get_auth_url()}'"
+    )
+
+    # Hidden Textbox to receive the `code` from URL
+    code_box = gr.Textbox(visible=False, elem_id="auth_code")
 
-    # ←–– here’s the hidden Textbox that JS will write into:
-    code_box   = gr.Textbox(visible=False, elem_id="auth_code")
+    # Status + playlist selector (hidden until login completes)
+    status   = gr.Markdown(visible=False)
+    dropdown = gr.Dropdown(choices=[], label="Step 2: Select a Playlist", visible=False)
 
-    status     = gr.Markdown(visible=False)
-    dropdown   = gr.Dropdown(choices=[], label="Step 2: Select a Playlist", visible=False)
-    info_html  = gr.HTML(visible=False)
-    shuffle_btn= gr.Button("🔀 Step 3: Shuffle & Play", visible=False)
-    result     = gr.HTML(visible=False)
+    # Playlist info + shuffle controls
+    info_html   = gr.HTML(visible=False)
+    shuffle_btn = gr.Button("🔀 Step 3: Shuffle & Play", visible=False)
+    result      = gr.HTML(visible=False)
 
-    # On page-load, grab the ?code=… and feed it into `code_box`, then call check_login
+    # 🔄 On every page-load: extract `?code=` and call check_login(code)
     demo.load(
         fn=check_login,
-        inputs=[code_box],              # single input to match check_login(code)
+        inputs=[code_box],
         outputs=[status, dropdown],
         js="""
-          const code = new URLSearchParams(window.location.search).get('code');
-          return code;
+          () => {
+            const params = new URLSearchParams(window.location.search);
+            const code = params.get('code') || "";
+            return code;
+          }
         """
     )
 
-    dropdown.change(load_playlist_info, [dropdown], [info_html, shuffle_btn])
-    shuffle_btn.click(shuffle_and_play, [dropdown], [result])
+    # When a playlist is selected, show its info and reveal the shuffle button
+    dropdown.change(
+        fn=load_playlist_info,
+        inputs=[dropdown],
+        outputs=[info_html, shuffle_btn]
+    )
+
+    # Shuffle & play, then display the currently playing track
+    shuffle_btn.click(
+        fn=shuffle_and_play,
+        inputs=[dropdown],
+        outputs=[result]
+    )
 
 if __name__ == "__main__":
     demo.launch()
 
+