diff --git a/.gitignore b/.gitignore index fc10c07..28b76b4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,7 @@ client_id client_secret code spotify-gui.js.code-workspace -.syncedlyrics/musixmatch_token.json \ No newline at end of file +.syncedlyrics/musixmatch_token.json +__pycache__/_canvas.cpython-310.pyc +protos/__pycache__/canvas_pb2.cpython-310.pyc +__pycache__/_canvas.cpython-310.pyc diff --git a/.syncedlyrics/musixmatch_token.json b/.syncedlyrics/musixmatch_token.json index c5b0e8d..bf89c99 100644 --- a/.syncedlyrics/musixmatch_token.json +++ b/.syncedlyrics/musixmatch_token.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"token": "240508682dd31a29b369cb3e363b37522b3f583074e0a18384854b", "expiration_time": 1715204997} -======= -{"token": "240507dc1c1d721b422f329d191594415da1e4aec72fa0405c547e", "expiration_time": 1715112558} ->>>>>>> parent of d3a4e97 (revert 49cd2b87355a0031b1376f1842d894c19f0f0d67) +{"token": "2405094b2701c575f2a99e2a27bcc795a1413ae719c296da64cae9", "expiration_time": 1715289885} \ No newline at end of file diff --git a/__pycache__/_canvas.cpython-310.pyc b/__pycache__/_canvas.cpython-310.pyc deleted file mode 100644 index cce70f1..0000000 Binary files a/__pycache__/_canvas.cpython-310.pyc and /dev/null differ diff --git a/protos/__pycache__/canvas_pb2.cpython-310.pyc b/protos/__pycache__/canvas_pb2.cpython-310.pyc deleted file mode 100755 index 2ffa0d7..0000000 Binary files a/protos/__pycache__/canvas_pb2.cpython-310.pyc and /dev/null differ diff --git a/spotifycontroller.py b/spotifycontroller.py index cca6a56..43c861c 100644 --- a/spotifycontroller.py +++ b/spotifycontroller.py @@ -4,7 +4,6 @@ from urllib.parse import urlencode import base64 import os import _canvas as SpotifyCanvas -import time import syncedlyrics dev = 0 @@ -92,7 +91,6 @@ def callback(): @app.route('/appdata') def appdata(): global access_token - stime = time.time() try: user_headers = { "Authorization": "Bearer " + access_token, @@ -107,11 +105,9 @@ def appdata(): if currently_playing.content: if "is_playing" in currently_playing.json(): if currently_playing.json()["is_playing"] is True and currently_playing.json()["item"]["id"] == request.args.get('id'): - print("QUICK" + str(time.time() - stime)) return { 'progress_ms': currently_playing.json()["progress_ms"], } elif currently_playing.json()["is_playing"] is True and currently_playing.json()["item"]["id"] != request.args.get('id'): - print("FULL" + str(time.time() - stime)) return { 'id': currently_playing.json()["item"]["id"], 'name': currently_playing.json()["item"]["name"], 'artist': currently_playing.json()["item"]["artists"][0]["name"], @@ -171,7 +167,6 @@ def icons(filename): @app.route('/canvas') def canvas(): - print("CANVAS") id = request.args.get('id') try: return { 'canvas_url': SpotifyCanvas.get_canvas_for_track(SpotifyCanvas.get_access_token(), id) } @@ -184,10 +179,10 @@ def lyrics(): artist = request.args.get('artist') if name and artist is not None: full_lyrics = syncedlyrics.search("[" + name + "] [" + artist + "]") + if full_lyrics is None: + return { 'lyrics': "no lyrics" } else: return { 'lyrics': '' } - if full_lyrics is None: - return { 'lyrics': "no lyrics" } return { 'lyrics': full_lyrics } if __name__ == '__main__': diff --git a/templates/webapp.html b/templates/webapp.html index dfe2547..b3bd637 100644 --- a/templates/webapp.html +++ b/templates/webapp.html @@ -9,26 +9,19 @@
+
+ Close +
+ Swipe
Song Image @@ -244,56 +255,49 @@ const img = document.getElementById('image'); img.crossOrigin = 'Anonymous'; animatedBackground = document.querySelector('.animated-background'); - -document.documentElement.style - .setProperty('--my-variable-name', '100px'); + progressContainer = document.querySelector('.progress-container'); //get property - -getComputedStyle(document.documentElement) - .getPropertyValue('--my-variable-name'); // returns value if (img.complete) { const color = colorThief.getColor(img); - // document.body.style.backgroundColor = 'rgb(' + color + ')'; - // document.body.style.backgroundColor = 'rgb(' + color + ')'; animatedBackground.style.setProperty('--color', 'rgb(' + color + ')'); - animatedBackground.classList.add('update-color'); + progressContainer.style.setProperty('--color', 'rgb(' + color + ')'); getLuminance(color); } else { img.addEventListener('load', function() { const color = colorThief.getColor(img); - // document.body.style.backgroundColor = 'rgb(' + color + ')'; animatedBackground.style.setProperty('--color', 'rgb(' + color + ')'); - animatedBackground.classList.add('update-color'); + progressContainer.style.setProperty('--color', 'rgb(' + color + ')'); getLuminance(color); }); } } function getLuminance(color) { + songText = document.querySelector('.song-text'); + artistText = document.querySelector('.artist-text'); + buttonsDiv = document.querySelector('.buttons'); if (Math.sqrt(0.299 * (color[0] ** 2) + 0.587 * (color[1] ** 2) + 0.114 * (color[2] ** 2)) > 170) { - document.getElementById('name').style.color = 'black'; - document.getElementById('artist').style.color = 'black'; - document.getElementById('lyric').style.color = 'black'; - document.getElementById('previous').style.filter = 'invert(100%)'; - document.getElementById('playpause').style.filter = 'invert(100%)'; - document.getElementById('next').style.filter = 'invert(100%)'; - document.getElementById('like').style.filter = 'invert(100%)'; - document.getElementById('progress_container').style.backgroundColor = 'rgb(' + color + ')'; + songText.style.color = 'black'; + artistText.style.color = 'black'; + buttonsDiv.style.filter = 'invert(100%)'; darkColor = [color[0] - 75, color[1] - 75, color[2] - 75] document.getElementById('progress_bar').style.backgroundColor = 'rgb(' + darkColor + ')'; } else { - document.getElementById('name').style.color = 'white'; - document.getElementById('artist').style.color = 'white'; - document.getElementById('lyric').style.color = 'white'; - document.getElementById('previous').style.filter = ''; - document.getElementById('playpause').style.filter = ''; - document.getElementById('next').style.filter = ''; - document.getElementById('like').style.filter = ''; - document.getElementById('progress_container').style.backgroundColor = 'rgb(' + color + ')'; + songText.style.color = 'white'; + artistText.style.color = 'white'; + buttonsDiv.style.filter = ''; lightColor = [color[0] + 75, color[1] + 75, color[2] + 75] document.getElementById('progress_bar').style.backgroundColor = 'rgb(' + lightColor + ')'; } } + function openNav() { + document.getElementById('leftpage').style.width = "100%"; + document.querySelector('.animated-background').style.marginLeft = "100%"; + } + function closeNav() { + document.getElementById('leftpage').style.width = "0"; + document.querySelector('.animated-background').style.marginLeft = "0"; + } // function getLuminance() { // }