ux update and code cleanup
This commit is contained in:
+12
-12
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
# ----------------------------- Daily Sync Orchestrator (v1.5) ----------------------------------
|
||||
# --------------------------------- Daily Sync Orchestrator ------------------------------------
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
# Runs all bulk media shares sequentially. Scheduled via unRAID User Scripts plugin at 1am.
|
||||
# Per-share rsync handled by rsync.sh — this script tracks pass/fail and total time only.
|
||||
@@ -15,19 +15,19 @@ source "$SCRIPT_DIR/../common.sh"
|
||||
RSYNC_SCRIPT="$SCRIPT_DIR/../Rsync/rsync.sh"
|
||||
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
# --- $ICON_GEAR Setup ---
|
||||
# ━━━ $ICON_GEAR Setup ━━━
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
echo ""
|
||||
echo "--- $ICON_GEAR Setup ---"
|
||||
echo "━━━ $ICON_GEAR Setup ━━━"
|
||||
|
||||
detect_hosts
|
||||
resolve_remote_ip
|
||||
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
# --- $ICON_SHIELD Pre-flight Checks ---
|
||||
# ━━━ $ICON_SHIELD Pre-flight Checks ━━━
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
echo ""
|
||||
echo "--- $ICON_SHIELD Pre-flight Checks ---"
|
||||
echo "━━━ $ICON_SHIELD Pre-flight Checks ━━━"
|
||||
|
||||
# Single connectivity and rootfs check upfront — fail fast before attempting all shares
|
||||
# Individual share and disk checks run per-share inside rsync.sh
|
||||
@@ -44,10 +44,10 @@ TOTAL_START=$(date +%s)
|
||||
SHARE_COUNT=${#DAILY_SYNC_SHARES[@]}
|
||||
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
# --- $ICON_SYNC Transfer ---
|
||||
# ━━━ $ICON_SYNC Transfer ━━━
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
echo ""
|
||||
echo "--- $ICON_SYNC Daily Sync Starting — $(date '+%Y-%m-%d %H:%M:%S') ---"
|
||||
echo "━━━ $ICON_SYNC Daily Sync Starting — $(date '+%Y-%m-%d %H:%M:%S') ━━━"
|
||||
echo "$ICON_SUMMARY Shares: $SHARE_COUNT"
|
||||
echo ""
|
||||
|
||||
@@ -58,7 +58,7 @@ for SHARE in "${DAILY_SYNC_SHARES[@]}"; do
|
||||
SHARE_NAME=$(basename "$SHARE")
|
||||
SHARE_START=$(date +%s)
|
||||
|
||||
echo "--- $ICON_SYNC Share $SHARE_INDEX of $SHARE_COUNT: $SHARE_NAME ---"
|
||||
echo "━━━ $ICON_SYNC Share $SHARE_INDEX of $SHARE_COUNT: $SHARE_NAME ━━━"
|
||||
|
||||
if bash "$RSYNC_SCRIPT" "$SHARE"; then
|
||||
SHARE_END=$(date +%s)
|
||||
@@ -79,9 +79,9 @@ TOTAL_END=$(date +%s)
|
||||
TOTAL_DURATION=$((TOTAL_END - TOTAL_START))
|
||||
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
# --- $ICON_SUMMARY Summary ---
|
||||
# ━━━ $ICON_SUMMARY Summary ━━━
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
echo "===== $ICON_SUMMARY DAILY SYNC SUMMARY ====="
|
||||
echo "━━━━━ $ICON_SUMMARY DAILY SYNC SUMMARY ━━━━━"
|
||||
echo "$ICON_TIME Started: $(date -d @$TOTAL_START '+%Y-%m-%d %H:%M:%S')"
|
||||
echo "$ICON_TIME Finished: $(date -d @$TOTAL_END '+%Y-%m-%d %H:%M:%S')"
|
||||
echo ""
|
||||
@@ -91,14 +91,14 @@ for entry in "${SHARE_TIMES[@]}"; do
|
||||
if printf '%s\n' "${FAIL[@]}" | grep -qx "$SHARE_NAME"; then
|
||||
echo " $ICON_ERROR $SHARE_NAME — $(format_duration $DURATION)"
|
||||
else
|
||||
echo " $ICON_DONE $SHARE_NAME — $(format_duration $DURATION)"
|
||||
echo " $ICON_DONE $SHARE_NAME — $(format_duration $DURATION)"
|
||||
fi
|
||||
done
|
||||
echo ""
|
||||
echo " $ICON_SUCCESS Passed: ${#PASS[@]}/$SHARE_COUNT"
|
||||
echo " $ICON_ERROR Failed: ${#FAIL[@]}/$SHARE_COUNT"
|
||||
echo " $ICON_TIME Duration: $(format_duration $TOTAL_DURATION)"
|
||||
echo "========================================="
|
||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
||||
|
||||
[[ ${#FAIL[@]} -gt 0 ]] && exit 1
|
||||
exit 0
|
||||
Reference in New Issue
Block a user