fixed ttypos

2026-04-19 11:44:58 -04:00
parent f48752afb9
commit 804a435b31
8 changed files with 406 additions and 10 deletions
@@ -41,7 +41,21 @@ PASS=()
 FAIL=()
 SHARE_TIMES=()
 TOTAL_START=$(date +%s)
-SHARE_COUNT=${#DAILY_SYNC_SHARES[@]}
+
+# Build combined share list — media shares + personal shares for this host
+ALL_SHARES=("${DAILY_SYNC_SHARES[@]}")
+
+if [[ "$LOCAL_SERVER_NAME" == "$HOST1" ]]; then
+    for share in "${HOST1_PERSONAL_SHARES[@]}"; do
+        [[ -n "$share" ]] && ALL_SHARES+=("$share")
+    done
+elif [[ "$LOCAL_SERVER_NAME" == "$HOST2" ]]; then
+    for share in "${HOST2_PERSONAL_SHARES[@]}"; do
+        [[ -n "$share" ]] && ALL_SHARES+=("$share")
+    done
+fi
+
+SHARE_COUNT=${#ALL_SHARES[@]}

 # -----------------------------------------------------------------------------------------------
 # ━━━ $ICON_SYNC Transfer ━━━
@@ -53,7 +67,7 @@ echo ""

 SHARE_INDEX=0

-for SHARE in "${DAILY_SYNC_SHARES[@]}"; do
+for SHARE in "${ALL_SHARES[@]}"; do
    SHARE_INDEX=$((SHARE_INDEX + 1))
    SHARE_NAME=$(basename "$SHARE")
    SHARE_START=$(date +%s)
@@ -0,0 +1,184 @@
+#!/bin/bash
+# -----------------------------------------------------------------------------------------------
+# --------------------------------- Transcode Management ---------------------------------------
+# -----------------------------------------------------------------------------------------------
+# Runs transcode cleanup then transcode manager in the correct order every cycle.
+# Cleanup runs first — clears stale files so manager sees accurate usage.
+# Manager runs after — threshold decisions based on real current usage post-cleanup.
+#
+# Running cleanup before manager prevents unnecessary SSD flips caused by stale
+# segment files from ended sessions inflating the ramdisk usage reading.
+#
+# Also tracks daily transcode statistics to a bounded log for weekly_health_digest.sh:
+#   Peak ramdisk usage per day
+#   Total flip count per day
+#   Ramdisk vs SSD session ratio
+#   Files cleaned per day
+#
+# Scheduled as: */3 * * * *  (every 3 minutes)
+# Replace individual transcode_manager and transcode_cleanup cron entries with this.
+#
+# All configuration in Master.conf under Transcode Manager section.
+# Supports --dry-run — passes through to both child scripts.
+# -----------------------------------------------------------------------------------------------
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+source "$SCRIPT_DIR/../Master.conf"
+source "$SCRIPT_DIR/../common.sh"
+
+parse_args "$@"
+
+# -----------------------------------------------------------------------------------------------
+# State and log files
+# -----------------------------------------------------------------------------------------------
+TRANSCODE_DAILY_LOG="/boot/config/transcode_daily.db"
+TRANSCODE_STATE_FILE="/tmp/transcode_state.db"
+
+# Bounded log — keeps last 90 days
+TRANSCODE_LOG_RETENTION=90
+
+touch "$TRANSCODE_DAILY_LOG" 2>/dev/null
+
+# -----------------------------------------------------------------------------------------------
+# ━━━ $ICON_GEAR Setup ━━━
+# -----------------------------------------------------------------------------------------------
+if [[ "$EUID" -ne 0 ]]; then
+    error "Must be run as root"
+    exit 1
+fi
+
+[[ "$DRY_RUN" == true ]] && warn "DRY RUN — passing to child scripts"
+
+# -----------------------------------------------------------------------------------------------
+# HELPERS
+# -----------------------------------------------------------------------------------------------
+
+# Read a value from transcode state file
+state_get() {
+    grep "^${1}=" "$TRANSCODE_STATE_FILE" 2>/dev/null | cut -d= -f2
+}
+
+# Get today's date key
+today() {
+    date '+%Y-%m-%d'
+}
+
+# Update daily log entry for today
+# Format: YYYY-MM-DD|peak_gb|flip_count|ram_sessions|ssd_sessions|files_cleaned
+update_daily_log() {
+    local peak_gb="$1"
+    local flips="$2"
+    local ram_sessions="$3"
+    local ssd_sessions="$4"
+    local files_cleaned="$5"
+    local today_key
+    today_key=$(today)
+
+    local existing
+    existing=$(grep "^${today_key}|" "$TRANSCODE_DAILY_LOG" 2>/dev/null)
+
+    if [[ -z "$existing" ]]; then
+        # New entry for today
+        echo "${today_key}|${peak_gb}|${flips}|${ram_sessions}|${ssd_sessions}|${files_cleaned}" \
+            >> "$TRANSCODE_DAILY_LOG"
+    else
+        # Update existing — keep highest peak, accumulate flips, sessions, files
+        local old_peak old_flips old_ram old_ssd old_files
+        old_peak=$(echo "$existing" | cut -d'|' -f2)
+        old_flips=$(echo "$existing" | cut -d'|' -f3)
+        old_ram=$(echo "$existing" | cut -d'|' -f4)
+        old_ssd=$(echo "$existing" | cut -d'|' -f5)
+        old_files=$(echo "$existing" | cut -d'|' -f6)
+
+        # Peak — keep highest
+        local new_peak
+        new_peak=$(awk "BEGIN {print ($peak_gb > $old_peak) ? $peak_gb : $old_peak}")
+
+        # Accumulate
+        local new_flips=$(( old_flips + flips ))
+        local new_ram=$(( old_ram + ram_sessions ))
+        local new_ssd=$(( old_ssd + ssd_sessions ))
+        local new_files=$(( old_files + files_cleaned ))
+
+        # Replace line
+        sed -i "s|^${today_key}|.*|${today_key}|${new_peak}|${new_flips}|${new_ram}|${new_ssd}|${new_files}|" \
+            "$TRANSCODE_DAILY_LOG" 2>/dev/null || {
+            # sed replacement failed — remove and re-add
+            sed -i "/^${today_key}|/d" "$TRANSCODE_DAILY_LOG"
+            echo "${today_key}|${new_peak}|${new_flips}|${new_ram}|${new_ssd}|${new_files}" \
+                >> "$TRANSCODE_DAILY_LOG"
+        }
+    fi
+
+    # Purge old entries beyond retention
+    local cutoff
+    cutoff=$(date -d "${TRANSCODE_LOG_RETENTION} days ago" '+%Y-%m-%d')
+    awk -F'|' -v cutoff="$cutoff" '$1 >= cutoff' \
+        "$TRANSCODE_DAILY_LOG" > "${TRANSCODE_DAILY_LOG}.tmp" && \
+        mv "${TRANSCODE_DAILY_LOG}.tmp" "$TRANSCODE_DAILY_LOG"
+}
+
+# -----------------------------------------------------------------------------------------------
+# ━━━ $ICON_SYNC Run Cleanup ━━━
+# -----------------------------------------------------------------------------------------------
+CLEANUP_SCRIPT="$SCRIPT_DIR/transcode_cleanup.sh"
+MANAGER_SCRIPT="$SCRIPT_DIR/transcode_manager.sh"
+
+if [[ ! -f "$CLEANUP_SCRIPT" ]]; then
+    error "transcode_cleanup.sh not found: $CLEANUP_SCRIPT"
+    exit 1
+fi
+
+if [[ ! -f "$MANAGER_SCRIPT" ]]; then
+    error "transcode_manager.sh not found: $MANAGER_SCRIPT"
+    exit 1
+fi
+
+# Capture cleanup output for file count
+CLEANUP_OUTPUT=$(bash "$CLEANUP_SCRIPT" ${DRY_RUN:+--dry-run} 2>&1)
+CLEANUP_EXIT=$?
+echo "$CLEANUP_OUTPUT"
+
+# Extract files cleaned from cleanup output
+FILES_CLEANED=$(echo "$CLEANUP_OUTPUT" | grep -oE "Removed [0-9]+ file" | grep -oE "[0-9]+" | head -1)
+FILES_CLEANED="${FILES_CLEANED:-0}"
+
+# -----------------------------------------------------------------------------------------------
+# ━━━ $ICON_WATCHDOG Run Manager ━━━
+# -----------------------------------------------------------------------------------------------
+MANAGER_OUTPUT=$(bash "$MANAGER_SCRIPT" ${DRY_RUN:+--dry-run} 2>&1)
+MANAGER_EXIT=$?
+echo "$MANAGER_OUTPUT"
+
+# -----------------------------------------------------------------------------------------------
+# Collect stats for daily log
+# -----------------------------------------------------------------------------------------------
+# Ramdisk usage from state file
+RAMDISK_USED_GB=$(state_get "ramdisk_used_gb" 2>/dev/null || echo "0")
+[[ -z "$RAMDISK_USED_GB" || "$RAMDISK_USED_GB" == "0" ]] && \
+    RAMDISK_USED_GB=$(df "$RAMDISK_PATH" --output=used 2>/dev/null | tail -1 | \
+        awk '{printf "%.2f", $1/1048576}' || echo "0")
+
+# Flip count from state file
+FLIP_COUNT=$(state_get "flip_count_hour" 2>/dev/null || echo "0")
+FLIP_COUNT="${FLIP_COUNT:-0}"
+
+# Session counts from manager output
+RAM_SESSIONS=$(echo "$MANAGER_OUTPUT" | grep -oE "ramdisk \([0-9]+\)" | grep -oE "[0-9]+" | head -1)
+SSD_SESSIONS=$(echo "$MANAGER_OUTPUT" | grep -oE "SSD \([0-9]+\)" | grep -oE "[0-9]+" | head -1)
+RAM_SESSIONS="${RAM_SESSIONS:-0}"
+SSD_SESSIONS="${SSD_SESSIONS:-0}"
+
+# Update daily log
+if [[ "$DRY_RUN" == false ]]; then
+    update_daily_log "$RAMDISK_USED_GB" "$FLIP_COUNT" "$RAM_SESSIONS" "$SSD_SESSIONS" "$FILES_CLEANED"
+fi
+
+# -----------------------------------------------------------------------------------------------
+# Exit with worst exit code
+# -----------------------------------------------------------------------------------------------
+if [[ "$CLEANUP_EXIT" -ne 0 || "$MANAGER_EXIT" -ne 0 ]]; then
+    exit 1
+fi
+exit 0