From f49027805e3aad9d2a90b43a1c85c59ceb16a447 Mon Sep 17 00:00:00 2001 From: EduardSkibidiEdger Date: Sat, 18 Jan 2025 21:31:50 +0200 Subject: [PATCH] asf --- __pycache__/app.cpython-312.pyc | Bin 3355 -> 3916 bytes app.py | 23 +++++++++++++--- templates/queue_table.html | 45 ++++++++++++++++++++------------ 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/__pycache__/app.cpython-312.pyc b/__pycache__/app.cpython-312.pyc index 318b4bab793b7d7c7a34d5981d2717857863a5a3..e8726768ed1372ecf898e969ed848a2e71549c24 100644 GIT binary patch delta 994 zcmZ`#O-vI(6y9CBZ1<-{MGM;kVzGvTQj`P&ZI{GoOjVGG6vUrW*&>Bf%5*tEwn0zU zgv5}&VARATMh_Y<_2iXA4>R__rYB?K!CQ$M5-&Qlm4FA|X5YT~-uLGF_C0ZbY;t~Z zI0OpEd201;ljDuEhjG?TYg(o+5a{e6&)YHP3oF_&r3$~_CB`^!AE?XfluFAO0O{T8 z9Cd5TcwzT>7`2LYRGXDql5?zDt+O-STA`sqwG-qC^^D0?>x^3Ib1JWMR{y}hzFnth zcmvs8QQfXrtHM*;OB&DOpsCeq8>Lb?9?Og5LNK^nfRyxFDfQI;}Y>HCCi|9qRlm$4grUAEx}y!4kW$m{?2zAI3^t z9B9d`mIVwxf#WzWH9Lq=lOVvPp zayH<%fkvWIT~R3s792|@)3YV9f>{S+jX&GYfp+4do1{}@ip^$HNevHYun`rIe<)R@ z5^29^?C_lv!ru!PK@x<>&>50~gvCuR0+2{+CCA?)W(jA>vYPh-xCmLa))CXvsO6SVv8{hI0AKZmOpC-h~yDI|vW?K5-|^dM|A0M)f^;$LAy7=iTT?o9SwK z9zm{-jRoX7{rUuQ^_mUA!oa2vg@(35Q51^8(eYyF2E2J2g<>!`0o`%4FnKPv87BQWeVP%DJrutl}5@u3}>KcVO!+cS|QK ox=yzmX(`#jH(QGDG%qg~0}wp<)15BNwUN)9NmwSMq@=(~Uq2^5IWZ?AzqrK8VskLlBi705 zm^qo`7$-Y$_=+3XFr+X_0`(Q?!B{Q~v1*f-aHujePX53tQeVSd!;-=}hiNq<$an?@ zMur{@7KRjtT2`P2Hn3K47%PPd#E0{kLA(?eFbS3cnN!PJ!U-}51X9>*7)!VzY@j|y zm>o5&YdBW3fW=uEf*CY9CkJpz^J_8{$pXc0u_YFjWEPi9e$3^h!d9dW6e=JsTg*ABd75mK1Go)%*^^6)ic<4RirIh?llO2-aytPT7C>BllwtA%?%)I- z!G51kp9NMsq%TUkUgdH7z|J71`GJFhU%0{j2D{(|A=OLlYByxmE~r~wl(F97c2UOp zMAe0;+>8Es7xF7E`d414s=nx7^MQe(j?snbBLhPKqbrCKc4O*bzr!sx*@pKiqtj$1 zJ|)JG$*z2njJlKO^JOY%F)*>VOEyY&*j;9n`pCq?n8Ns(nSn|A1DN?iZn6fy3IHr7 Bbt(V= diff --git a/app.py b/app.py index ce06bc6..09a2188 100644 --- a/app.py +++ b/app.py @@ -13,7 +13,7 @@ app = Flask(__name__) # Spotify API credentials from environment variables CLIENT_ID = os.getenv("CLIENT_ID") CLIENT_SECRET = os.getenv("CLIENT_SECRET") -REDIRECT_URI = "http://localhost:80/callback" +REDIRECT_URI = "http://0.0.0.0/callback" SCOPE = "user-modify-playback-state user-read-playback-state" # Spotipy client @@ -52,7 +52,6 @@ def add_song(): except Exception as e: return jsonify({"error": str(e)}), 500 -# Route to serve the queue table for iframe @app.route("/queue_table") def queue_table(): queue_data = sp.queue() @@ -62,12 +61,28 @@ def queue_table(): for track in queue_data["queue"]: track_name = track["name"] artist_name = track["artists"][0]["name"] - queue.append({"track": track_name, "artist": artist_name}) + artist_uri = track["artists"][0]["uri"] # Get the Spotify URI for the artist + artist_link = f"https://open.spotify.com/artist/{artist_uri.split(':')[-1]}" # Construct the Spotify artist link + track_uri = track["uri"] # Get the Spotify URI for the track + track_link = f"https://open.spotify.com/track/{track_uri.split(':')[-1]}" # Construct the Spotify track link + queue.append({ + "track": track_name, + "artist": artist_name, + "track_link": track_link, + "artist_link": artist_link + }) current = None if queue_data["currently_playing"]: - current = {"track": queue_data["currently_playing"]["name"], "artist": queue_data["currently_playing"]["artists"][0]["name"]} + current_track = queue_data["currently_playing"] + current = { + "track": current_track["name"], + "artist": current_track["artists"][0]["name"], + "track_link": f"https://open.spotify.com/track/{current_track['uri'].split(':')[-1]}", + "artist_link": f"https://open.spotify.com/artist/{current_track['artists'][0]['uri'].split(':')[-1]}" + } return render_template("queue_table.html", queue=queue, length=len(queue), now_playing=current) + # Run the Flask app if __name__ == "__main__": app.run(port=80, host="0.0.0.0", debug=True) diff --git a/templates/queue_table.html b/templates/queue_table.html index 2f377cf..c31945a 100644 --- a/templates/queue_table.html +++ b/templates/queue_table.html @@ -11,22 +11,33 @@ table -
- - - - - - - - - {% for i in range(length) %} - - - - - {% endfor %} - -
TrackArtist
{{ queue[i].track }}{{ queue[i].artist }}
+
+
+ + + + + + + + + {% for i in range(length) %} + + + + + {% endfor %} + +
TrackArtist
+ + {{ queue[i].track }} + + + + {{ queue[i].artist }} + +
+
+