From 90cc33b98563803c668632aa899f44fde08531c1 Mon Sep 17 00:00:00 2001 From: Groovylein Date: Mon, 18 Dec 2023 20:01:30 +0100 Subject: [PATCH] Docker bugfixing --- docker/jukebox.Dockerfile | 2 +- resources/{audiofolders => audio}/shutdownsound.mp3 | Bin resources/{audiofolders => audio}/shutdownsound.wav | Bin resources/{audiofolders => audio}/startupsound.mp3 | Bin resources/{audiofolders => audio}/startupsound.wav | Bin .../player/backends/spotify/interfacing_spotify.py | 9 ++++++--- 6 files changed, 7 insertions(+), 4 deletions(-) rename resources/{audiofolders => audio}/shutdownsound.mp3 (100%) rename resources/{audiofolders => audio}/shutdownsound.wav (100%) rename resources/{audiofolders => audio}/startupsound.mp3 (100%) rename resources/{audiofolders => audio}/startupsound.wav (100%) diff --git a/docker/jukebox.Dockerfile b/docker/jukebox.Dockerfile index eccb5dc4e..50a52fc23 100644 --- a/docker/jukebox.Dockerfile +++ b/docker/jukebox.Dockerfile @@ -22,7 +22,7 @@ RUN usermod -aG pulse ${USER} # Install all Jukebox dependencies RUN apt-get update && apt-get install -qq -y \ --allow-downgrades --allow-remove-essential --allow-change-held-packages \ - gcc at wget \ + gcc g++ at wget \ espeak mpc mpg123 git ffmpeg spi-tools netcat \ python3 python3-venv python3-dev python3-mutagen diff --git a/resources/audiofolders/shutdownsound.mp3 b/resources/audio/shutdownsound.mp3 similarity index 100% rename from resources/audiofolders/shutdownsound.mp3 rename to resources/audio/shutdownsound.mp3 diff --git a/resources/audiofolders/shutdownsound.wav b/resources/audio/shutdownsound.wav similarity index 100% rename from resources/audiofolders/shutdownsound.wav rename to resources/audio/shutdownsound.wav diff --git a/resources/audiofolders/startupsound.mp3 b/resources/audio/startupsound.mp3 similarity index 100% rename from resources/audiofolders/startupsound.mp3 rename to resources/audio/startupsound.mp3 diff --git a/resources/audiofolders/startupsound.wav b/resources/audio/startupsound.wav similarity index 100% rename from resources/audiofolders/startupsound.wav rename to resources/audio/startupsound.wav diff --git a/src/jukebox/components/player/backends/spotify/interfacing_spotify.py b/src/jukebox/components/player/backends/spotify/interfacing_spotify.py index ea23875f5..41d6198d6 100644 --- a/src/jukebox/components/player/backends/spotify/interfacing_spotify.py +++ b/src/jukebox/components/player/backends/spotify/interfacing_spotify.py @@ -34,9 +34,12 @@ def __init__(self, player_status): value='http://localhost:3001') spot_scope = "user-read-playback-state,user-modify-playback-state" - self.auth_manager = SpotifyOAuth(open_browser=False, scope=spot_scope, client_id=self.client_id, client_secret=self.client_id, redirect_uri=self.redirect_uri, cache_path=sanitize(self.cache_file)) - self.auth_uri = self.auth_manager.get_authorize_url() - logger.info(f"Please log in here: {self.auth_uri}") + try: + self.auth_manager = SpotifyOAuth(open_browser=False, scope=spot_scope, client_id=self.client_id, client_secret=self.client_id, redirect_uri=self.redirect_uri, cache_path=sanitize(self.cache_file)) + self.auth_uri = self.auth_manager.get_authorize_url() + logger.info(f"Please log in here: {self.auth_uri}") + except Exception as err: + logger.error(err) #self.collection_file_location = cfg.setndefault('playerspot', 'collection_file', # value="../../shared/audio/spotify/spotify_collection.yaml")