diff --git a/example/CHANGELOG.md b/mpd/CHANGELOG.md similarity index 100% rename from example/CHANGELOG.md rename to mpd/CHANGELOG.md diff --git a/example/DOCS.md b/mpd/DOCS.md similarity index 100% rename from example/DOCS.md rename to mpd/DOCS.md diff --git a/example/Dockerfile b/mpd/Dockerfile similarity index 51% rename from example/Dockerfile rename to mpd/Dockerfile index 2578b14..73fc6a0 100644 --- a/example/Dockerfile +++ b/mpd/Dockerfile @@ -1,9 +1,6 @@ ARG BUILD_FROM FROM $BUILD_FROM -RUN apk add \ - mpc \ - mpd \ - rclone +RUN apk add mpd mpc rclone mpdscribble COPY rootfs / diff --git a/example/README.md b/mpd/README.md similarity index 100% rename from example/README.md rename to mpd/README.md diff --git a/example/build.yaml b/mpd/build.yaml similarity index 100% rename from example/build.yaml rename to mpd/build.yaml diff --git a/example/config.yaml b/mpd/config.yaml similarity index 94% rename from example/config.yaml rename to mpd/config.yaml index 4d60c4e..7af61e2 100644 --- a/example/config.yaml +++ b/mpd/config.yaml @@ -1,5 +1,5 @@ name: MPD -version: "0.0.13" +version: "0.0.14" slug: mpd description: MPD Addon url: "https://forgejo.owo.monster/chaos/hass-mpd/src/branch/main/mpd" diff --git a/example/icon.png b/mpd/icon.png similarity index 100% rename from example/icon.png rename to mpd/icon.png diff --git a/example/logo.png b/mpd/logo.png similarity index 100% rename from example/logo.png rename to mpd/logo.png diff --git a/example/rootfs/etc/mpd.conf b/mpd/rootfs/etc/mpd.conf similarity index 100% rename from example/rootfs/etc/mpd.conf rename to mpd/rootfs/etc/mpd.conf diff --git a/mpd/rootfs/etc/s6-overlay/s6-rc.d/mpd/producer-for b/mpd/rootfs/etc/s6-overlay/s6-rc.d/mpd/producer-for new file mode 100644 index 0000000..85b64ae --- /dev/null +++ b/mpd/rootfs/etc/s6-overlay/s6-rc.d/mpd/producer-for @@ -0,0 +1 @@ +ympd diff --git a/example/rootfs/etc/s6-overlay/s6-rc.d/mpd/run b/mpd/rootfs/etc/s6-overlay/s6-rc.d/mpd/run similarity index 61% rename from example/rootfs/etc/s6-overlay/s6-rc.d/mpd/run rename to mpd/rootfs/etc/s6-overlay/s6-rc.d/mpd/run index a47bac5..c1cdf90 100644 --- a/example/rootfs/etc/s6-overlay/s6-rc.d/mpd/run +++ b/mpd/rootfs/etc/s6-overlay/s6-rc.d/mpd/run @@ -10,10 +10,7 @@ chown root:root /usr/bin/mpc chmod 0774 /usr/bin/mpd chmod 0774 /usr/bin/mpc -bashio::log.info 'Sync Music' -rclone --config /media/rclone.conf -P --stats-one-line -v --transfers=1 --checkers=1 --check-first sync Music: /media/mpd/music - export LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" -bashio::log.info 'Start MPD' +bashio::log.info 'Starting MPD' mpd --stdout --no-daemon diff --git a/example/rootfs/etc/s6-overlay/s6-rc.d/mpd/type b/mpd/rootfs/etc/s6-overlay/s6-rc.d/mpd/type similarity index 100% rename from example/rootfs/etc/s6-overlay/s6-rc.d/mpd/type rename to mpd/rootfs/etc/s6-overlay/s6-rc.d/mpd/type diff --git a/mpd/rootfs/etc/s6-overlay/s6-rc.d/mpdscrobble/run b/mpd/rootfs/etc/s6-overlay/s6-rc.d/mpdscrobble/run new file mode 100644 index 0000000..5a2945b --- /dev/null +++ b/mpd/rootfs/etc/s6-overlay/s6-rc.d/mpdscrobble/run @@ -0,0 +1,7 @@ +#!/command/with-contenv bashio +set -e + +export LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" + +bashio::log.info 'Starting MPD Scrobbler' +mpdscribble -v --log syslog --host 127.0.0.1 --port 6600 -D --config /media/mpdscribble.conf diff --git a/mpd/rootfs/etc/s6-overlay/s6-rc.d/mpdscrobble/type b/mpd/rootfs/etc/s6-overlay/s6-rc.d/mpdscrobble/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/mpd/rootfs/etc/s6-overlay/s6-rc.d/mpdscrobble/type @@ -0,0 +1 @@ +longrun diff --git a/mpd/rootfs/etc/s6-overlay/s6-rc.d/musicsync/run b/mpd/rootfs/etc/s6-overlay/s6-rc.d/musicsync/run new file mode 100644 index 0000000..da6d630 --- /dev/null +++ b/mpd/rootfs/etc/s6-overlay/s6-rc.d/musicsync/run @@ -0,0 +1,8 @@ +#!/command/with-contenv bashio +set -e + +mkdir -p /media/mpd/media \ + /media/mpd/playlists + +bashio::log.info 'Syncing Music' +rclone --config /media/rclone.conf -P --stats-one-line -v --transfers=1 --checkers=1 --check-first sync Music: /media/mpd/music diff --git a/mpd/rootfs/etc/s6-overlay/s6-rc.d/musicsync/type b/mpd/rootfs/etc/s6-overlay/s6-rc.d/musicsync/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/mpd/rootfs/etc/s6-overlay/s6-rc.d/musicsync/type @@ -0,0 +1 @@ +oneshot diff --git a/example/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/mpd b/mpd/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/mpd similarity index 100% rename from example/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/mpd rename to mpd/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/mpd diff --git a/mpd/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/mpdscrobble b/mpd/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/mpdscrobble new file mode 100644 index 0000000..e69de29 diff --git a/mpd/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/musicsync b/mpd/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/musicsync new file mode 100644 index 0000000..e69de29 diff --git a/example/translations/en.yaml b/mpd/translations/en.yaml similarity index 100% rename from example/translations/en.yaml rename to mpd/translations/en.yaml