diff --git a/compose.yaml b/compose.yaml index 534a95d..0658122 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,7 @@ services: slskd: image: slskd/slskd + restart: always ports: - "5030:5030" - "5031:5031" @@ -8,15 +9,18 @@ services: environment: - SLSKD_REMOTE_CONFIGURATION=true volumes: - - ./data/slskd:/app + - ./data/shared:/app - ./etc/slskd.yml:/app/slskd.yml - restart: always - - slsk-batchdl: - image: slsk-batchdl-sldl:latest + slskdecks: + image: registry.ntwl.xyz/slskdecks + build: + context: . + dockerfile: slskdecks.Dockerfile volumes: - - ./data/slskd/shared:/app/data/shared + - ./data/shared:/app/data/shared + - ./src:/app/src/ + - ./etc/sldl.conf:/root/.config/sldl/sldl.conf command: | sleep 10000 diff --git a/etc/sldl.conf b/etc/sldl.conf new file mode 100644 index 0000000..19d6b09 --- /dev/null +++ b/etc/sldl.conf @@ -0,0 +1,14 @@ + +username = "ntwl" +password = "ninety nonsense nights" + +name-format = "{item-name}/{artist( - )title|filename}" + +fast-search = true +interactive = false +concurrent-downloads = 4 + + +pref-format = "mp3" +pref-min-bitrate = 200 +pref-max-bitrate = 2500 diff --git a/justfile b/justfile index 2f49689..cfd4c94 100644 --- a/justfile +++ b/justfile @@ -1,3 +1,5 @@ +set dotenv-load + up: docker compose -f compose.yaml up --remove-orphans @@ -12,3 +14,8 @@ run CTR: exec CTR: docker compose -f compose.yaml exec {{CTR}} bash + +dl TRG: + docker compose -f compose.yaml run \ + --remove-orphans \ + -- slskdecks sldl --user "${SLSK_USER}" --password "$SLSK_PW" {{TRG}} diff --git a/slskdecks.Dockerfile b/slskdecks.Dockerfile new file mode 100644 index 0000000..3b05555 --- /dev/null +++ b/slskdecks.Dockerfile @@ -0,0 +1,24 @@ +FROM denoland/deno:debian + +ENV SLSK_BATCHDL_V "2.4.7" + +RUN apt-get update +RUN apt-get install -y \ + curl \ + unzip \ + libicu-dev + +RUN mkdir -p /tmp/setup +WORKDIR /tmp/setup +RUN curl -L \ + "https://github.com/fiso64/slsk-batchdl/releases/download/v${SLSK_BATCHDL_V}/sldl_linux-x64.zip" \ + -o sldl_linux-x64.zip +RUN unzip sldl_linux-x64.zip +RUN chmod +x sldl +RUN mv sldl /usr/local/bin/ +RUN rm -rf /tmp/setup + +COPY ./src/ /app/src/slskdecks + +WORKDIR /app/data/shared +# CMD npm start