Merge branch 'master' of ssh://git.cesium.pw:2335/niku/streamrip-docker

.config/streamrip/config.toml

@@ -20,9 +20,12 @@ quality = 4
 # This will download booklet pdfs that are included with some albums
 download_booklets = true
 
-email = ""
-# This is an md5 hash of the plaintext password
-password = ""
+# Authenticate to Qobuz using auth token? Value can be true/false only
+use_auth_token = true
+# Enter your userid if the above use_auth_token is set to true, else enter your email
+email_or_userid = "${QOBUZ_USERID}"
+# Enter your auth token if the above use_auth_token is set to true, else enter the md5 hash of your plaintext password
+password_or_token = "${QOBUZ_TOKEN}"
 # Do not change
 app_id = ""
 # Do not change
@@ -147,7 +150,7 @@ exclude = []
 add_singles_to_folder = false
 # Available keys: "albumartist", "title", "year", "bit_depth", "sampling_rate",
 # "container", "id", and "albumcomposer"
-folder_format = "{albumartist} - {title} ({year}) [{container}] [{bit_depth}B-{sampling_rate}kHz]"
+folder_format = "{albumartist}/{title} ({year})"
 # Available keys: "tracknumber", "artist", "albumartist", "composer", "title",
 # and "albumcomposer"
 track_format = "{tracknumber}. {artist} - {title}{explicit}"

Dockerfile

@@ -1,9 +1,11 @@
 FROM python:3.11.3-slim-bullseye
 
 WORKDIR /app
-RUN pip install streamrip --upgrade
+RUN apt update && apt install -y git
+#RUN pip install git+https://github.com/hifimusix/streamrip.git --upgrade
+RUN pip install git+https://github.com/nathom/streamrip --upgrade
 COPY .config/streamrip/config.toml /root/.config/streamrip/config.toml
 
 COPY docker-entrypoint.sh ./
 RUN ["chmod", "+x", "/app/docker-entrypoint.sh"]
-ENTRYPOINT [ "/app/docker-entrypoint.sh" ]
+ENTRYPOINT [ "/app/docker-entrypoint.sh" ]

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 niku
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,4 +1,14 @@
 # streamrip-docker
+
+Container image for [nathom's streamrip](https://github.com/nathom/streamrip).
+
 ```sh
-docker run -it -e DEEZER_NUTS=$TOKEN git.cesium.pw/niku/streamrip-docker
-```
+docker run \
+    -e DEEZER_NUTS=$TOKEN \
+    -e QOBUZ_USERID=$QOBUZ_USERID \
+    -e QOBUZ_TOKEN=$QOBUZ_TOKEN \
+    --name streamrip \
+    -d git.cesium.pw/niku/streamrip-docker
+
+docker exec streamrip rip url <url>
+```

docker-entrypoint.sh

@@ -2,4 +2,7 @@
 
 sed -i "s/\${DEEZER_NUTS}/$DEEZER_NUTS/g" /root/.config/streamrip/config.toml
 
-exec "$@"
+sed -i "s/\${QOBUZ_USERID}/$QOBUZ_USERID/g" /root/.config/streamrip/config.toml
+sed -i "s/\${QOBUZ_TOKEN}/$QOBUZ_TOKEN/g" /root/.config/streamrip/config.toml
+
+tail -f /dev/null