diff --git a/Dockerfile b/Dockerfile index 1e3993f..fccba1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -88,7 +88,8 @@ RUN \ requests \ requests_oauthlib \ typing-extensions \ - unidecode && \ + unidecode \ + drop2beets && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ @@ -103,6 +104,8 @@ ENV BEETSDIR="/config" \ EDITOR="nano" \ HOME="/config" +RUN mkdir /downloads #it freaked out without this :( + # copy local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8ea6829..9b7e349 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -89,7 +89,8 @@ RUN \ requests \ requests_oauthlib \ typing-extensions \ - unidecode && \ + unidecode \ + drop2beets && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ @@ -104,6 +105,8 @@ ENV BEETSDIR="/config" \ EDITOR="nano" \ HOME="/config" +RUN mkdir /downloads #it doesn't start without this :/ + # copy local files COPY root/ / diff --git a/root/defaults/config.yaml b/root/defaults/config.yaml index 00ee525..146d27c 100644 --- a/root/defaults/config.yaml +++ b/root/defaults/config.yaml @@ -1,4 +1,6 @@ -plugins: fetchart embedart convert scrub replaygain lastgenre chroma web +plugins: fetchart embedart convert scrub replaygain lastgenre chroma web drop2beets +drop2beets: + dropbox_path: /downloads directory: /music library: /config/musiclibrary.blb art_filename: albumart @@ -21,8 +23,8 @@ paths: import: write: yes - copy: yes - move: no + copy: no + move: yes resume: ask incremental: yes quiet_fallback: skip diff --git a/root/etc/s6-overlay/s6-rc.d/svc-beets/run b/root/etc/s6-overlay/s6-rc.d/svc-beets/run index 13c6cb3..8120304 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-beets/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-beets/run @@ -1,6 +1,11 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash +if [[ -v DROP_ENABLED ]]; then + echo "dropbox is enabled" + beet dropbox & +fi + if [[ -z ${LSIO_NON_ROOT_USER} ]]; then exec \ s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8337" \