Multi Player Support

docker/docker-compose.yml

@@ -15,9 +15,9 @@ services:
       - PULSE_SERVER=tcp:host.docker.internal:4713
     restart: unless-stopped
     volumes:
-      - ../shared/audiofolders:/home/pi/RPi-Jukebox-RFID/shared/audiofolders
-      - ../shared/playlists:/home/pi/.config/mpd/playlists
-      - ./config/docker.pulse.mpd.conf://home/pi/.config/mpd/mpd.conf
+      - ../shared/audiofolders:/root/RPi-Jukebox-RFID/shared/audiofolders
+      - ../shared/playlists:/root/.config/mpd/playlists
+      - ./config/docker.pulse.mpd.conf:/root/.config/mpd/mpd.conf
 
   jukebox:
     build:
@@ -41,9 +41,9 @@ services:
     restart: unless-stopped
     tty: true
     volumes:
-      - ../src/jukebox:/home/pi/RPi-Jukebox-RFID/src/jukebox
-      - ../shared:/home/pi/RPi-Jukebox-RFID/shared
-      - ./config/docker.pulse.mpd.conf:/home/pi/.config/mpd/mpd.conf
+      - ../src/jukebox:/root/RPi-Jukebox-RFID/src/jukebox
+      - ../shared:/root/RPi-Jukebox-RFID/shared
+      - ./config/docker.pulse.mpd.conf:/root/.config/mpd/mpd.conf
     command: python run_jukebox.py
 
   webapp:

documentation/builders/spotify.md

@@ -25,11 +25,11 @@ To control the playback (spotipy), you need to create an app as Spotify develope
 
 The spotifyd daemon is using the username and password of your Spotify account.
 
-If the credentials changed, you can update them in the config file located at `/etc/spotifyd.conf`
+If the credentials have changed, you can update them in the config file located at `/etc/spotifyd.conf`
 
 ### spotipy
 
-Spotipy is using `client_id` and `client_secret` to controll the playback of the Phoniebox.
+Spotipy is using `client_id` and `client_secret` to control the playback of the Phoniebox.
 
 To update the credentials, please modify the file located at `~/RPi-Jukebox-RFID/shared/settings/player.yaml`
 

installation/routines/customize_options.sh

@@ -148,12 +148,12 @@ _option_spotify() {
   print_c "---------------------- SPOTIFY ----------------------
 
 Installs an additional player, so that you can
-play music from spotify.
+play music from spotify. You will need to create
+an app in the Spotify developer dashboard to use
+Spotify properly
 
-Note: You need Spotify Premium to run this service!
+Note: Spotify Premium is needed to operate player!
 
-For more information see documentation:
-https://github.com/MiczFlor/RPi-Jukebox-RFID/blob/future3/develop/documentation/builders/spotify.md
 
 Do you want to enable the spotify player? [y/N]"
   read -r response

installation/routines/setup_spotify.sh

@@ -52,7 +52,6 @@ _spotifyd_check() {
     verify_files_exists "${SPOTIFYD_TARGET_FILE}"
 
     verify_file_contains_string "${SPOT_USERNAME}" "${SPOTIFYD_CONFIG_TARGET_FILE}"
-    verify_file_contains_string "${SPOT_PASSWORD}" "${SPOTIFYD_CONFIG_TARGET_FILE}"
 
 }
 

src/jukebox/components/player/backends/mpd/interfacing_mpd.py

@@ -63,7 +63,10 @@ async def _connect(self):
         return await self.client.connect(self.host, self.port)
 
     def connect(self):
-        # May raise: mpd.base.ConnectionError: Can not send command to disconnected client
+        """
+        Connect to the MPD backend
+        :raises: mpd.base.ConnectionError
+        """
         result = asyncio.run_coroutine_threadsafe(self._connect(), self.loop).result()
         logger.debug(f"Connected to MPD version {self.client.mpd_version} @ {self.host}:{self.port}")
         return result