diff --git a/example/config.yaml b/example/config.yaml index 84cdd04..c6dcbc7 100644 --- a/example/config.yaml +++ b/example/config.yaml @@ -1,5 +1,5 @@ name: MPD -version: "0.0.3" +version: "0.0.4" slug: mpd description: MPD Addon url: "https://forgejo.owo.monster/chaos/hass-mpd/src/branch/main/mpd" diff --git a/example/rootfs/etc/s6-overlay/s6-rc.d/mpd/producer-for b/example/rootfs/etc/s6-overlay/s6-rc.d/mpd/producer-for index e69de29..879f581 100644 --- a/example/rootfs/etc/s6-overlay/s6-rc.d/mpd/producer-for +++ b/example/rootfs/etc/s6-overlay/s6-rc.d/mpd/producer-for @@ -0,0 +1 @@ +musicsync diff --git a/example/rootfs/etc/s6-overlay/s6-rc.d/mpd/run b/example/rootfs/etc/s6-overlay/s6-rc.d/mpd/run index 8322b7f..c76ab9f 100644 --- a/example/rootfs/etc/s6-overlay/s6-rc.d/mpd/run +++ b/example/rootfs/etc/s6-overlay/s6-rc.d/mpd/run @@ -1,52 +1,11 @@ #!/command/with-contenv bashio set -e -# Enable Jemalloc for better memory handling export LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" -bashio::log.info 'Setup Folders' - -MEDIA_FOLDER=$(bashio::config 'media_folder') -PLAYLIST_FOLDER=$(bashio::config 'playlist_folder') - mkdir -p /data/database \ - "/media/mpd/media" \ - "/media/mpd/playlists" - -bashio::log.info 'Setup settings' - -if [ "$(bashio::config 'custom_config')" != 'null' ]; then - bashio::log.info 'Use custom config' - cp "$(bashio::config 'custom_config')" '/etc/mpd.conf' -else - bashio::log.info 'Set media folder' - MEDIA_FOLDER=$(bashio::config 'media_folder') - sed -i "s/music_directory.*/music_directory \"${MEDIA_FOLDER//\//\\/}\"/" /etc/mpd.conf - - bashio::log.info 'Set playlist folder' - PLAYLIST_FOLDER=$(bashio::config 'playlist_folder') - sed -i "s/playlist_directory.*/playlist_directory \"${PLAYLIST_FOLDER//\//\\/}\"/" /etc/mpd.conf - - if [ "$(bashio::config 'volume_normalization')" == 'true' ]; then - sed -i "/^#volume_normalization/s/^#//" /etc/mpd.conf - fi - - if [ "$(bashio::config 'verbose')" == 'true' ]; then - sed -i "/^log_level/s/default/verbose/" /etc/mpd.conf - fi - - if [ "$(bashio::config 'httpd_output')" == 'true' ]; then - printf '\n - audio_output { \n - type "httpd" \n - name "HTTPd Output" \n - port "8000" \n - bitrate "192" \n - always_on "yes" \n - }' >> /etc/mpd.conf - bashio::log.info 'HTTPd output enabled' - fi -fi + /media/mpd/media \ + /media/mpd/playlists chown root:root /usr/bin/mpd chown root:root /usr/bin/mpc diff --git a/example/rootfs/etc/s6-overlay/s6-rc.d/musicsync/run b/example/rootfs/etc/s6-overlay/s6-rc.d/musicsync/run index 8322b7f..b6a4c19 100644 --- a/example/rootfs/etc/s6-overlay/s6-rc.d/musicsync/run +++ b/example/rootfs/etc/s6-overlay/s6-rc.d/musicsync/run @@ -1,57 +1,6 @@ #!/command/with-contenv bashio set -e -# Enable Jemalloc for better memory handling export LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" -bashio::log.info 'Setup Folders' - -MEDIA_FOLDER=$(bashio::config 'media_folder') -PLAYLIST_FOLDER=$(bashio::config 'playlist_folder') - -mkdir -p /data/database \ - "/media/mpd/media" \ - "/media/mpd/playlists" - -bashio::log.info 'Setup settings' - -if [ "$(bashio::config 'custom_config')" != 'null' ]; then - bashio::log.info 'Use custom config' - cp "$(bashio::config 'custom_config')" '/etc/mpd.conf' -else - bashio::log.info 'Set media folder' - MEDIA_FOLDER=$(bashio::config 'media_folder') - sed -i "s/music_directory.*/music_directory \"${MEDIA_FOLDER//\//\\/}\"/" /etc/mpd.conf - - bashio::log.info 'Set playlist folder' - PLAYLIST_FOLDER=$(bashio::config 'playlist_folder') - sed -i "s/playlist_directory.*/playlist_directory \"${PLAYLIST_FOLDER//\//\\/}\"/" /etc/mpd.conf - - if [ "$(bashio::config 'volume_normalization')" == 'true' ]; then - sed -i "/^#volume_normalization/s/^#//" /etc/mpd.conf - fi - - if [ "$(bashio::config 'verbose')" == 'true' ]; then - sed -i "/^log_level/s/default/verbose/" /etc/mpd.conf - fi - - if [ "$(bashio::config 'httpd_output')" == 'true' ]; then - printf '\n - audio_output { \n - type "httpd" \n - name "HTTPd Output" \n - port "8000" \n - bitrate "192" \n - always_on "yes" \n - }' >> /etc/mpd.conf - bashio::log.info 'HTTPd output enabled' - fi -fi - -chown root:root /usr/bin/mpd -chown root:root /usr/bin/mpc -chmod 0774 /usr/bin/mpd -chmod 0774 /usr/bin/mpc - -bashio::log.info 'Start MPD' -mpd --stdout --no-daemon +rclone --config /media/rclone.conf sync Music: /media/mpd/music