test sabnzd

install/babybuddy-install.sh

@@ -22,7 +22,7 @@ $STD apt-get install -y \
   nginx
 msg_ok "Installed Dependencies"
 
-PYTHON_VERSION="3.12" setup_uv
+setup_uv
 
 msg_info "Installing Babybuddy"
 RELEASE=$(curl -fsSL https://api.github.com/repos/babybuddy/babybuddy/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
@@ -31,6 +31,8 @@ mkdir -p /opt/{babybuddy,data}
 curl -fsSL "https://github.com/babybuddy/babybuddy/archive/refs/tags/v${RELEASE}.tar.gz" -o "$temp_file"
 tar zxf "$temp_file" --strip-components=1 -C /opt/babybuddy
 cd /opt/babybuddy
+setup_uv
+
 $STD uv venv /opt/babybuddy/.venv
 $STD /opt/babybuddy/.venv/bin/python -m ensurepip --upgrade
 $STD /opt/babybuddy/.venv/bin/python -m pip install --upgrade pip

install/sabnzbd-install.sh

@@ -19,8 +19,6 @@ $STD apt-get install -y \
   p7zip-full
 msg_ok "Installed Dependencies"
 
-PYTHON_VERSION="3.12" setup_uv
-
 msg_info "Setup Unrar"
 cat <<EOF >/etc/apt/sources.list.d/non-free.list
 deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware
@@ -37,10 +35,8 @@ cd /opt/sabnzbd
 temp_file=$(mktemp)
 curl -fsSL "https://github.com/sabnzbd/sabnzbd/releases/download/${RELEASE}/SABnzbd-${RELEASE}-src.tar.gz" -o "$temp_file"
 tar -xzf "$temp_file" -C /opt/sabnzbd --strip-components=1
-$STD uv venv /opt/sabnzbd/.venv
+setup_uv VENV_FOLDER="/opt/sabnzbd/.venv" REQUIREMENTS_FILE="requirements.txt" PYTHON_VERSION="3.12" setup_uv_venv
-$STD /opt/sabnzbd/.venv/bin/python -m ensurepip --upgrade
+
-$STD /opt/sabnzbd/.venv/bin/python -m pip install --upgrade pip
-$STD /opt/sabnzbd/.venv/bin/python -m pip install -r requirements.txt
 echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
 msg_ok "Installed SABnzbd"
 

misc/tools.func

@@ -1081,31 +1081,64 @@ function setup_uv() {
   rm -rf "$TMP_DIR"
   ensure_usr_local_bin_persist
   msg_ok "uv $LATEST_VERSION installed"
+}
 
-  # Optional: install specific Python version
+# ------------------------------------------------------------------------------
-  if [[ -n "${PYTHON_VERSION:-}" ]]; then
+# Creates a uv-based venv with optional Python version and installs dependencies
-    $STD msg_info "Ensuring Python $PYTHON_VERSION is available via uv..."
+# ------------------------------------------------------------------------------
 
-    local VERSION_MATCH
+function setup_uv_venv() {
-    VERSION_MATCH=$(uv python list --only-downloads |
+  local VENV_FOLDER="${VENV_FOLDER:-/opt/app/.venv}"
-      grep -E "^cpython-${PYTHON_VERSION//./\\.}\.[0-9]+-linux" |
+  local REQUIREMENTS_FILE="${REQUIREMENTS_FILE:-requirements.txt}"
-      cut -d'-' -f2 | sort -V | tail -n1)
+  local ENABLE_PIP_UPGRADE="${ENABLE_PIP_UPGRADE:-1}"
+  local ENABLE_ENSUREPIP="${ENABLE_ENSUREPIP:-1}"
 
-    if [[ -z "$VERSION_MATCH" ]]; then
+  # Fallback auf globale PYTHON_VERSION
-      msg_error "No matching Python $PYTHON_VERSION.x version found via uv"
+  local PYTHON_VERSION="${PYTHON_VERSION:-}"
+
+  setup_uv || return 1
+
+  # Wenn PYTHON_VERSION gesetzt, installiere gezielt
+  if [[ -n "$PYTHON_VERSION" ]]; then
+    export PYTHON_VERSION="$PYTHON_VERSION"
+    setup_uv || return 1
+  fi
+
+  $STD msg_info "Creating uv venv in $VENV_FOLDER"
+  if ! $STD uv venv "$VENV_FOLDER"; then
+    msg_error "Failed to create uv venv"
+    return 1
+  fi
+
+  local PYTHON="$VENV_FOLDER/bin/python"
+
+  if [[ "$ENABLE_ENSUREPIP" == "1" ]]; then
+    $STD msg_info "Running ensurepip"
+    if ! $STD "$PYTHON" -m ensurepip --upgrade; then
+      msg_error "ensurepip failed"
       return 1
     fi
+  fi
 
-    if uv python list | grep -q "cpython-${VERSION_MATCH}-linux.*uv/python"; then
+  if [[ "$ENABLE_PIP_UPGRADE" == "1" ]]; then
-      $STD msg_ok "Python $VERSION_MATCH already installed via uv"
+    $STD msg_info "Upgrading pip"
-    else
+    if ! $STD "$PYTHON" -m pip install --upgrade pip; then
-      if ! $STD uv python install "$VERSION_MATCH"; then
+      msg_error "pip upgrade failed"
-        msg_error "Failed to install Python $VERSION_MATCH via uv"
+      return 1
-        return 1
-      fi
-      msg_ok "Installed Python $VERSION_MATCH"
     fi
   fi
+
+  if [[ -f "$REQUIREMENTS_FILE" ]]; then
+    $STD msg_info "Installing requirements from $REQUIREMENTS_FILE"
+    if ! $STD "$PYTHON" -m pip install -r "$REQUIREMENTS_FILE"; then
+      msg_error "Failed to install requirements"
+      return 1
+    fi
+  else
+    msg_info "No requirements file found at $REQUIREMENTS_FILE – skipping"
+  fi
+
+  msg_ok "uv venv setup complete in $VENV_FOLDER"
 }
 
 # ------------------------------------------------------------------------------