Fix dead/incorrect vars and consolidate duplicated logic into common.sh

Codebase-wide audit pass: fixed real bugs (SSH hangs missing BatchMode,
local-outside-function no-ops, variable name collisions, a truncated
ratio calc, wrong state-dir path, DARK vs NO_INTERNET drift, and more),
then pulled logic that was duplicated across multiple scripts — arr
cleanup safety gates, docker restart ordering, container maintenance
stop/restart, watchdog state-file helpers, partnership role resolution,
cert expiry checks, remote node discovery, and TMDB discovery scoring —
into common.sh so each now has a single implementation.

Tools/container_data_export.sh

@@ -146,17 +146,7 @@ cleanup_on_exit() {
         warn "Removing partial archive: $ARCHIVE_PATH"
         rm -f "$ARCHIVE_PATH" 2>/dev/null
     fi
-    # Always restart container if it was running
-    if [[ "$CONTAINER_WAS_RUNNING" == true && "$DRY_RUN" == false ]]; then
-        local status
-        status=$(timeout "$DOCKER_TIMEOUT" docker inspect -f '{{.State.Running}}' \
-            "$CONTAINER_NAME" 2>/dev/null)
-        if [[ "$status" != "true" ]]; then
-            warn "Restarting $CONTAINER_NAME (cleanup)..."
-            timeout "$DOCKER_TIMEOUT" docker start "$CONTAINER_NAME" >/dev/null 2>&1 || \
-                error "Failed to restart $CONTAINER_NAME — start it manually"
-        fi
-    fi
+    container_force_restart_if_needed "$CONTAINER_NAME" "$CONTAINER_WAS_RUNNING"
 }
 trap cleanup_on_exit EXIT
 
@@ -166,35 +156,10 @@ trap cleanup_on_exit EXIT
 echo ""
 echo "━━━ $ICON_STOP Stop Container ━━━"
 
-STATUS=$(timeout "$DOCKER_TIMEOUT" docker inspect -f '{{.State.Running}}' \
-    "$CONTAINER_NAME" 2>/dev/null)
-
-case "$STATUS" in
-    true)
-        CONTAINER_WAS_RUNNING=true
-        log "Stopping $CONTAINER_NAME for clean export..."
-        if [[ "$DRY_RUN" == false ]]; then
-            if timeout "$DOCKER_TIMEOUT" docker stop "$CONTAINER_NAME" >/dev/null 2>&1; then
-                echo "$CONTAINER_NAME stopped ✅"
-            else
-                error "Failed to stop $CONTAINER_NAME — aborting export"
-                exit 1
-            fi
-        else
-            warn "DRY RUN — would stop $CONTAINER_NAME"
-        fi
-        ;;
-    false)
-        echo "$CONTAINER_NAME is not running — archiving as-is (was stopped state respected)"
-        ;;
-    "")
-        error "$CONTAINER_NAME not found — check container name"
-        exit 1
-        ;;
-    *)
-        warn "$CONTAINER_NAME status: $STATUS — proceeding with caution"
-        ;;
-esac
+container_stop_for_maintenance "$CONTAINER_NAME" CONTAINER_WAS_RUNNING \
+    "Stopping $CONTAINER_NAME for clean export..." log || exit 1
+[[ "$CONTAINER_WAS_RUNNING" == false ]] && \
+    echo "$CONTAINER_NAME is not running — archiving as-is (was stopped state respected)"
 
 # ==============================================================================================
 # ━━━ Archive ━━━
@@ -249,37 +214,7 @@ END=$(date +%s)
 echo ""
 echo "━━━ $ICON_START Restart Container ━━━"
 
-RESTART_OK=false
-
-if [[ "$CONTAINER_WAS_RUNNING" == true ]]; then
-    log "Restarting $CONTAINER_NAME..."
-    if [[ "$DRY_RUN" == false ]]; then
-        if timeout "$DOCKER_TIMEOUT" docker start "$CONTAINER_NAME" >/dev/null 2>&1; then
-            # Brief settle then verify
-            sleep 3
-            POST_STATUS=$(timeout "$DOCKER_TIMEOUT" docker inspect -f \
-                '{{.State.Running}}' "$CONTAINER_NAME" 2>/dev/null)
-            if [[ "$POST_STATUS" == "true" ]]; then
-                echo "$CONTAINER_NAME restarted and running ✅"
-                RESTART_OK=true
-            else
-                error "$CONTAINER_NAME started but crashed immediately — check container logs"
-                notify "$CONTAINER_NAME failed to stay running after export on $(hostname)" \
-                    "Container Export" "warning"
-            fi
-        else
-            error "Failed to restart $CONTAINER_NAME — start it manually"
-            notify "$CONTAINER_NAME failed to restart after export on $(hostname)" \
-                "Container Export" "warning"
-        fi
-    else
-        warn "DRY RUN — would restart $CONTAINER_NAME"
-        RESTART_OK=true
-    fi
-else
-    echo "$CONTAINER_NAME was not running — leaving stopped (state respected) ✅"
-    RESTART_OK=true
-fi
+container_restart_after_maintenance "$CONTAINER_NAME" "$CONTAINER_WAS_RUNNING" 3 "Container Export"
 
 # Clear trap — clean exit, cleanup_on_exit no longer needed
 trap - EXIT

Tools/emby_database_repair.sh

@@ -171,16 +171,7 @@ EMBY_WAS_RUNNING=false
 
 cleanup_on_exit() {
     local exit_code=$?
-    if [[ "$EMBY_WAS_RUNNING" == true && "$DRY_RUN" == false ]]; then
-        local status
-        status=$(timeout "$DOCKER_TIMEOUT" docker inspect -f '{{.State.Running}}' \
-            "$EMBY_CONTAINER" 2>/dev/null)
-        if [[ "$status" != "true" ]]; then
-            warn "Restarting $EMBY_CONTAINER (cleanup)..."
-            timeout "$DOCKER_TIMEOUT" docker start "$EMBY_CONTAINER" >/dev/null 2>&1 || \
-                error "Failed to restart $EMBY_CONTAINER — start it manually"
-        fi
-    fi
+    container_force_restart_if_needed "$EMBY_CONTAINER" "$EMBY_WAS_RUNNING"
 }
 
 trap cleanup_on_exit EXIT
@@ -191,36 +182,10 @@ trap cleanup_on_exit EXIT
 echo ""
 echo "━━━ $ICON_STOP Stop Emby ━━━"
 
-STATUS=$(timeout "$DOCKER_TIMEOUT" docker inspect -f '{{.State.Running}}' \
-    "$EMBY_CONTAINER" 2>/dev/null)
-
-case "$STATUS" in
-    true)
-        EMBY_WAS_RUNNING=true
-        warn "Stopping $EMBY_CONTAINER — active sessions will be interrupted"
-        if [[ "$DRY_RUN" == false ]]; then
-            if timeout "$DOCKER_TIMEOUT" docker stop "$EMBY_CONTAINER" >/dev/null 2>&1; then
-                echo "$EMBY_CONTAINER stopped ✅"
-                sleep 3  # let file handles release
-            else
-                error "Failed to stop $EMBY_CONTAINER — aborting"
-                exit 1
-            fi
-        else
-            warn "DRY RUN — would stop $EMBY_CONTAINER"
-        fi
-        ;;
-    false)
-        log "$EMBY_CONTAINER is not running — proceeding with checks"
-        ;;
-    "")
-        error "$EMBY_CONTAINER not found — check container name"
-        exit 1
-        ;;
-    *)
-        warn "$EMBY_CONTAINER status: $STATUS — proceeding with caution"
-        ;;
-esac
+container_stop_for_maintenance "$EMBY_CONTAINER" EMBY_WAS_RUNNING \
+    "Stopping $EMBY_CONTAINER — active sessions will be interrupted" warn 3 || exit 1
+[[ "$EMBY_WAS_RUNNING" == false ]] && \
+    log "$EMBY_CONTAINER is not running — proceeding with checks"
 
 # ==============================================================================================
 # ━━━ Database Integrity Check ━━━
@@ -301,37 +266,8 @@ END=$(date +%s)
 echo ""
 echo "━━━ $ICON_START Restart Emby ━━━"
 
-RESTART_OK=false
-
-if [[ "$EMBY_WAS_RUNNING" == true ]]; then
-    if [[ "$DRY_RUN" == false ]]; then
-        log "Restarting $EMBY_CONTAINER..."
-        if timeout "$DOCKER_TIMEOUT" docker start "$EMBY_CONTAINER" >/dev/null 2>&1; then
-            sleep 5  # Emby takes longer to initialise than most containers
-            POST_STATUS=$(timeout "$DOCKER_TIMEOUT" docker inspect -f \
-                '{{.State.Running}}' "$EMBY_CONTAINER" 2>/dev/null)
-            if [[ "$POST_STATUS" == "true" ]]; then
-                echo "$EMBY_CONTAINER restarted and running ✅"
-                RESTART_OK=true
-            else
-                error "$EMBY_CONTAINER started but crashed — database may be corrupt"
-                error "Check Docker logs: docker logs $EMBY_CONTAINER"
-                notify "$EMBY_CONTAINER crashed on restart — possible database corruption on $(hostname)" \
-                    "Emby DB Repair" "warning"
-            fi
-        else
-            error "Failed to restart $EMBY_CONTAINER — start it manually"
-            notify "$EMBY_CONTAINER failed to restart after integrity check on $(hostname)" \
-                "Emby DB Repair" "warning"
-        fi
-    else
-        warn "DRY RUN — would restart $EMBY_CONTAINER"
-        RESTART_OK=true
-    fi
-else
-    echo "$EMBY_CONTAINER was not running — leaving stopped (state respected) ✅"
-    RESTART_OK=true
-fi
+container_restart_after_maintenance "$EMBY_CONTAINER" "$EMBY_WAS_RUNNING" 5 "Emby DB Repair"
+[[ "$RESTART_OK" == false ]] && error "Check Docker logs: docker logs $EMBY_CONTAINER"
 
 # Clear EXIT trap — clean exit
 trap - EXIT

Tools/smart_long_test.sh

@@ -138,11 +138,8 @@ _build_drive_list() {
             [[ ! -e "$drive" ]] && continue
             local drive_name
             drive_name=$(basename "$drive")
-            local ignored=false
-            for ignore in "${SMART_IGNORE_DRIVES[@]:-}"; do
-                [[ "$drive_name" == "$ignore" ]] && ignored=true && break
-            done
-            [[ "$ignored" == true ]] && { log "Skipping $drive_name (SMART_IGNORE_DRIVES)"; continue; }
+            is_in_list "$drive_name" "${SMART_IGNORE_DRIVES[@]:-}" && \
+                { log "Skipping $drive_name (SMART_IGNORE_DRIVES)"; continue; }
             if ! smartctl -i "$drive" 2>/dev/null | grep -q "SMART support is: Enabled"; then
                 log "Skipping $drive_name — SMART not enabled"
                 continue
@@ -166,11 +163,7 @@ if [[ "$SHOW_STATUS" == true ]]; then
         drive_name=$(basename "$drive")
         local_result=$(smartctl -l selftest "$drive" 2>/dev/null | \
             grep -m1 "Extended" | awk '{print $NF}')
-        ignored=false
-        for ignore in "${SMART_IGNORE_DRIVES[@]:-}"; do
-            [[ "$drive_name" == "$ignore" ]] && ignored=true && break
-        done
-        if [[ "$ignored" == true ]]; then
+        if is_in_list "$drive_name" "${SMART_IGNORE_DRIVES[@]:-}"; then
             echo "  $ICON_WARN $drive_name — ignored"
         else
             echo "  $ICON_SMART $drive_name — last extended: ${local_result:-no result}"