[Maintenance] Support for new Qobuz config parameters #364 (#365)

Author: GioF71

Dockerfile

@@ -122,6 +122,9 @@ ENV QOBUZ_ENABLE no
 ENV QOBUZ_USERNAME qobuz_username
 ENV QOBUZ_PASSWORD qobuz_password
 ENV QOBUZ_FORMAT_ID 5
+ENV QOBUZ_RENUM_TRACKS ""
+ENV QOBUZ_EXPLICIT_ITEM_NUMBERS ""
+ENV QOBUZ_PREPEND_ARTIST_TO_ALBUM ""
 
 ENV HRA_ENABLE no
 ENV HRA_USERNAME hra_username

README.md

@@ -246,6 +246,9 @@ QOBUZ_ENABLE|Set to `yes` to enable Qobuz support, defaults to `no`
 QOBUZ_USERNAME|Your Qobuz account username
 QOBUZ_PASSWORD|Your Qobuz account password
 QOBUZ_FORMAT_ID|Qobuz format id: 5 for mp3, 7 for FLAC, 27 for hi-res, defaults to `5`
+QOBUZ_RENUM_TRACKS|Renum tracks in albums and playlists, mostly for kodi compatibility, defaults to `1`
+QOBUZ_EXPLICIT_ITEM_NUMBERS|Adds numbers in square brackets in list items, mostly for kodi compatibility, defaults to `0`
+QOBUZ_PREPEND_ARTIST_TO_ALBUM|Adds artist name before album title in lists, mostly for kodi compatibility, defaults to `0`
 HRA_ENABLE|Set to `yes` to enable HRA support, defaults to `no`
 HRA_USERNAME|Your HRA account username
 HRA_PASSWORD|Your HRA account password

app/bin/run-upmpdcli.sh

@@ -517,6 +517,36 @@ if [ "${QOBUZ_ENABLE^^}" == "YES" ]; then
     sed -i 's/QOBUZ_USERNAME/'"$QOBUZ_USERNAME"'/g' $CONFIG_FILE;
     sed -i 's/QOBUZ_PASSWORD/'"$QOBUZ_PASSWORD"'/g' $CONFIG_FILE;
     sed -i 's/QOBUZ_FORMAT_ID/'"$QOBUZ_FORMAT_ID"'/g' $CONFIG_FILE;
+    if [[ -n "${QOBUZ_RENUM_TRACKS}" ]]; then
+        qobuz_v=${QOBUZ_RENUM_TRACKS}
+        if [[ "${qobuz_v}" == "0" || "${qobuz_v}" == "1" ]]; then
+            sed -i 's/\#qobuzrenumtracks/qobuzrenumtracks/g' $CONFIG_FILE;
+            sed -i 's/QOBUZ_RENUM_TRACKS/'"$QOBUZ_RENUM_TRACKS"'/g' $CONFIG_FILE;
+        else
+            echo "Invalid QOBUZ_RENUM_TRACKS=[${QOBUZ_RENUM_TRACKS}]"
+            exit 3
+        fi
+    fi
+    if [[ -n "${QOBUZ_EXPLICIT_ITEM_NUMBERS}" ]]; then
+        qobuz_v=${QOBUZ_EXPLICIT_ITEM_NUMBERS}
+        if [[ "${qobuz_v}" == "0" || "${qobuz_v}" == "1" ]]; then
+            sed -i 's/\#qobuzexplicititemnumbers/qobuzexplicititemnumbers/g' $CONFIG_FILE;
+            sed -i 's/QOBUZ_EXPLICIT_ITEM_NUMBERS/'"$QOBUZ_EXPLICIT_ITEM_NUMBERS"'/g' $CONFIG_FILE;
+        else
+            echo "Invalid QOBUZ_EXPLICIT_ITEM_NUMBERS=[${QOBUZ_EXPLICIT_ITEM_NUMBERS}]"
+            exit 3
+        fi
+    fi
+    if [[ -n "${QOBUZ_PREPEND_ARTIST_TO_ALBUM}" ]]; then
+        qobuz_v=${QOBUZ_PREPEND_ARTIST_TO_ALBUM}
+        if [[ "${qobuz_v}" == "0" || "${qobuz_v}" == "1" ]]; then
+            sed -i 's/\#qobuzprependartisttoalbum/qobuzprependartisttoalbum/g' $CONFIG_FILE;
+            sed -i 's/QOBUZ_PREPEND_ARTIST_TO_ALBUM/'"$QOBUZ_PREPEND_ARTIST_TO_ALBUM"'/g' $CONFIG_FILE;
+        else
+            echo "Invalid QOBUZ_PREPEND_ARTIST_TO_ALBUM=[${QOBUZ_PREPEND_ARTIST_TO_ALBUM}]"
+            exit 3
+        fi
+    fi
 fi
 
 echo "HRA Enable [$HRA_ENABLE]"

app/conf/upmpdcli.conf

@@ -63,6 +63,9 @@ logfilename = LOG_DIRECTORY/upmpdcli.log
 #qobuzuser = QOBUZ_USERNAME
 #qobuzpass = QOBUZ_PASSWORD
 #qobuzformatid = QOBUZ_FORMAT_ID
+#qobuzrenumtracks = QOBUZ_RENUM_TRACKS
+#qobuzexplicititemnumbers = QOBUZ_EXPLICIT_ITEM_NUMBERS
+#qobuzprependartisttoalbum = QOBUZ_PREPEND_ARTIST_TO_ALBUM
 #uprcluser = UPRCL_USER
 #uprcltitle = UPRCL_TITLE
 #uprclhostport = UPRCL_HOSTPORT

doc/change-history.md

@@ -2,6 +2,7 @@
 
 Change Date|Major Changes
 ---|---
+2024-01-05|New config parameters for qobuz plugin (see [#364](https://github.com/GioF71/upmpdcli-docker/issues/364))
 2023-12-29|Verify log directory to be writable (see [#362](https://github.com/GioF71/upmpdcli-docker/issues/362))
 2023-12-29|Removed last references to deezer (see [#359](https://github.com/GioF71/upmpdcli-docker/issues/359))
 2023-12-29|Support running as user with `--user` (see [#358](https://github.com/GioF71/upmpdcli-docker/issues/358))