[Feature] Improve binary selection #267 (#270)

Author: GioF71

Dockerfile

@@ -211,6 +211,8 @@ ENV AUDIO_BUFFER_SIZE ""
 
 ENV MAX_ADDITIONAL_OUTPUTS_BY_TYPE ""
 
+ENV FORCE_REPO_BINARY ""
+
 ENV STARTUP_DELAY_SEC ""
 
 COPY app/assets/pulse-client-template.conf /app/assets/pulse-client-template.conf

README.md

@@ -142,6 +142,7 @@ MAX_ADDITIONAL_OUTPUTS_BY_TYPE|The maximum number of outputs by type, defaults t
 RESTORE_PAUSED|If set to `yes`, then MPD is put into pause mode instead of starting playback after startup. Default is `no`.
 STATE_FILE_INTERVAL|Auto-save the state file this number of seconds after each state change, defaults to `10` seconds
 ENFORCE_PLAYER_STATE|If set to `yes`, it will remove player state information from the state file, so the player state will only depend on the environment variables. Defaults to `yes`
+FORCE_REPO_BINARY|If set to `yes`, the binary from the distro repository will be used
 STARTUP_DELAY_SEC|Delay before starting the application in seconds, defaults to `0`.
 
 #### SOXR Plugin

app/bin/build-additional.sh

@@ -239,9 +239,17 @@ build_alsa() {
         # see if the ups version must be enforced
         c_integer_upsampling=$(get_named_env "ALSA_OUTPUT_INTEGER_UPSAMPLING" $idx)
         echo "ALSA OUTPUT [$idx] requires INTEGER_UPSAMPLING [${c_integer_upsampling}]"
-        if [[ "${c_integer_upsampling^^}" == "YES" || "${c_integer_upsampling^^}" == "Y" ]]; then
-            echo "Setting mpd_binary to [${UPSAMPLING_MPD_BINARY}]"
-            mpd_binary=$UPSAMPLING_MPD_BINARY
+        if [ ! "${FORCE_REPO_BINARY^^}" == "YES" ]; then
+            if [ -n "${UPSAMPLING_MPD_BINARY}" ]; then
+                if [[ "${c_integer_upsampling^^}" == "YES" || "${c_integer_upsampling^^}" == "Y" ]]; then
+                    echo "Setting mpd_binary to [${UPSAMPLING_MPD_BINARY}]"
+                    mpd_binary=$UPSAMPLING_MPD_BINARY
+                fi
+            else
+                echo "MPD binary with integer upsampling support is not available"
+            fi
+        else
+            echo "MPD binary forced to repo binary"
         fi
     fi
 }

app/bin/run-mpd.sh

@@ -10,10 +10,48 @@
 # 8 Invalid default type
 # 9 Invalid parameter
 # 10 Missing mandatory parameter
+# 11 Missing binaries
+
+CONF_INTEGER_UPSAMPLING_SUPPORT_FILE="/app/conf/integer_upsampling_support.txt"
+COMPILED_MPD_PATH="/app/conf/mpd-compiled-path.txt"
+COMPILED_UPS_MPD_PATH="/app/conf/mpd-compiled-ups-path.txt"
+INTEGER_UPSAMPLING_SUPPORTED="no"
+
+REPO_MPD_BINARY="/usr/bin/mpd"
+REPO_MPD_BINARY_AVAILABLE="no"
+COMPILED_MPD_BINARY=""
+COMPILED_UPS_MPD_BINARY=""
+
+if [ -f "$CONF_INTEGER_UPSAMPLING_SUPPORT_FILE" ]; then
+    INTEGER_UPSAMPLING_SUPPORTED=`cat $CONF_INTEGER_UPSAMPLING_SUPPORT_FILE`
+    if [ -f "$COMPILED_MPD_PATH" ]; then
+        COMPILED_MPD_BINARY=`cat $COMPILED_MPD_PATH`
+    fi
+    if [[ "${INTEGER_UPSAMPLING_SUPPORTED^^}" == "YES" ]]; then
+        if [ -f "$COMPILED_UPS_MPD_PATH" ]; then
+            COMPILED_UPS_MPD_BINARY=`cat $COMPILED_UPS_MPD_PATH`
+        fi
+    fi
+fi
+
+if [ -f "${REPO_MPD_BINARY}" ]; then
+    echo "MPD from repo is available at [${REPO_MPD_BINARY}]"
+    REPO_MPD_BINARY_AVAILABLE="yes"
+else
+    echo "MPD from repo is not available"
+fi
+
+echo "Integer upsampling supported: [${INTEGER_UPSAMPLING_SUPPORTED}]"
+echo "Compiled mpd binary: [${COMPILED_MPD_BINARY}]"
+echo "Compiled mpd ups binary: [${COMPILED_UPS_MPD_BINARY}]"
+
+if [[ -z "${REPO_MPD_BINARY}" && -z "${COMPILED_MPD_BINARY}" ]]; then
+    echo "NO BINARIES AVAILABLE, exiting"
+    exit 11
+fi
 
-STABLE_MPD_BINARY=/app/bin/compiled/mpd
-UPSAMPLING_MPD_BINARY=/app/bin/compiled/mpd-ups
-REPO_MPD_BINARY=/usr/bin/mpd
+STABLE_MPD_BINARY=${COMPILED_MPD_BINARY}
+UPSAMPLING_MPD_BINARY=${COMPILED_UPS_MPD_BINARY}
 
 DEFAULT_MAX_OUTPUTS_BY_TYPE=20
 DEFAULT_OUTPUT_MODE=alsa
@@ -27,7 +65,23 @@ else
 fi
 echo "MAX_OUTPUTS=[$max_outputs_by_type]"
 
-mpd_binary=$STABLE_MPD_BINARY
+if [[ ! "${FORCE_REPO_BINARY^^}" == "YES" ]]; then
+    if [ -n "${STABLE_MPD_BINARY}" ]; then
+        mpd_binary=$STABLE_MPD_BINARY
+    else
+        mpd_binary=$REPO_MPD_BINARY
+    fi
+else
+    # binary repo must be available
+    if [ "${REPO_MPD_BINARY_AVAILABLE^^}" == "YES" ]; then
+        mpd_binary=$REPO_MPD_BINARY
+    else
+        echo "Repo binary forced but not available!"
+        exit 11
+    fi
+fi
+
+echo "Selected binary: [${mpd_binary}]"
 
 declare -A file_dict
 

doc/change-history.md

@@ -2,6 +2,7 @@
 
 Date|Major Changes
 :---|:---
+2023-03-25|Add support for selection of repo binary (`FORCE_REPO_BINARY`)
 2023-03-24|Add armv6 support on debian-based images (see issue [#258](https://github.com/GioF71/mpd-alsa-docker/issues/258))
 2023-03-20|Missing libaudiofile-dev (see issue [#253](https://github.com/GioF71/mpd-alsa-docker/issues/253) issue)
 2023-03-20|Fixed build base image (see issue [#251](https://github.com/GioF71/mpd-alsa-docker/issues/251) issue)