Update app.py

app.py

@@ -24,20 +24,27 @@ devices_dict = {}
 def get_auth_url():
     return sp_oauth.get_authorize_url()
 
-def complete_login(full_url):
+def try_login(full_url):
     global sp, user_playlists, devices_dict
 
+    if "?code=" not in full_url:
+        return (
+            gr.update(value="🔐 Please login via Spotify to continue."),
+            gr.update(visible=False),
+            gr.update(visible=False),
+        )
+
     try:
         code = full_url.split("?code=")[1].split("&")[0]
-    except IndexError:
+        token = sp_oauth.get_access_token(code, as_dict=True)
+        access_token = token["access_token"]
+    except Exception as e:
         return (
-            gr.update(value="❌ OAuth code not found. Please try again."),
+            gr.update(value=f"❌ OAuth failed: {str(e)}. Please log in again."),
             gr.update(visible=False),
             gr.update(visible=False),
         )
 
-    token = sp_oauth.get_access_token(code, as_dict=True)
-    access_token = token["access_token"]
     sp = spotipy.Spotify(auth=access_token)
 
     playlists = sp.current_user_playlists(limit=50)["items"]
@@ -48,13 +55,13 @@ def complete_login(full_url):
 
     if not devices_dict:
         return (
-            gr.update(value="⚠️ No active Spotify devices found. Open Spotify."),
+            gr.update(value="⚠️ No active Spotify devices found. Open Spotify app."),
             gr.update(visible=False),
             gr.update(visible=False),
         )
 
     return (
-        gr.update(value="✅ Logged in! Choose playlist & device."),
+        gr.update(value="✅ Logged in! Select playlist and device."),
         gr.update(visible=True, choices=list(user_playlists.keys())),
         gr.update(visible=True, choices=list(devices_dict.keys())),
     )
@@ -90,13 +97,13 @@ with gr.Blocks() as demo:
     shuffle_btn = gr.Button("🔀 Shuffle & Play", visible=False)
     result = gr.Markdown()
 
-    redirect_url_box = gr.Textbox(visible=False, elem_id="redirect_url_box")
-    complete_login_btn = gr.Button(visible=False, elem_id="complete_login_btn")
+    url_state = gr.Textbox(visible=False)
 
-    complete_login_btn.click(
-        complete_login,
-        inputs=[redirect_url_box],
-        outputs=[status, playlist_dd, device_dd]
+    demo.load(
+        try_login,
+        inputs=[url_state],
+        outputs=[status, playlist_dd, device_dd],
+        js="() => window.location.href"
     )
 
     playlist_dd.change(lambda: gr.update(visible=True), None, shuffle_btn)
@@ -107,23 +114,6 @@ with gr.Blocks() as demo:
         outputs=[result]
     )
 
-    # Correct automation JavaScript snippet:
-    demo.load(None, None, None, js="""
-    () => {
-        const params = new URLSearchParams(window.location.search);
-        const code = params.get('code');
-        if (code) {
-            const box = document.querySelector("#redirect_url_box textarea");
-            const btn = document.querySelector("#complete_login_btn button");
-            if (box && btn) {
-                box.value = window.location.href;
-                box.dispatchEvent(new Event('input', { bubbles: true }));
-                btn.click();
-            }
-        }
-    }
-    """)
-
 if __name__ == "__main__":
     demo.launch(server_name="0.0.0.0", ssr_mode=False)