Fix season dates, resolution, attribution, retention policies, montage trigger
season_info.py (new): - Computes actual equinox/solstice dates via Jean Meeus approximation - Converts to LOCAL timezone (pytz / zoneinfo) so the calendar date reflects what the camera sees on the ground, including DST transitions - Timezone defaults to America/New_York; override via $TIMEZONE env or 2nd arg - Divides each season into 3 equal movements; handles Winter's year boundary - Outputs IS_LAST_DAY=true on the final day of each movement 4-seasons.sh: - Uses season_info.py for all date/season logic (no hardcoded day-of-year) - Passes $yesterday to season_info.py so astronomical dates are correct - Removed forced 1280x720 scale; clips stay at native camera resolution - Auto-triggers montage-mvt.sh "$yesterday" on last day of movement so the correct movement (not the next day's) is compiled montage-mvt.sh: - Accepts optional YYYY-MM-DD argument (passed by 4-seasons.sh) so it resolves the correct season/movement when run the morning after last day - Detects source resolution from first daily clip via ffprobe; attribution card is generated at that exact resolution — no resizing of main video - Font sizes proportional to frame height so text looks right at any res - License corrected to CC BY-SA 3.0 (was CC BY-NC-SA 4.0) fullday-video.sh: - Removed 30-minute target; video length is natural (num_images / FPS) - Default FULLDAY_FPS=5 (configurable at top of script) - Retains RETENTION_DAYS=10 auto-delete for full-day videos only - Sunrise 10s uploads and montage videos are never auto-deleted https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
This commit is contained in:
Claude
+64
-76
@@ -1,101 +1,88 @@
|
||||
#!/bin/bash
|
||||
# montage-mvt.sh — compile daily sunrise clips into a seasonal movement montage.
|
||||
# Output: daily clips concatenated, speed-adjusted to match music duration,
|
||||
# with 2-second video/audio fade in/out, followed by a 7-second attribution card.
|
||||
# montage-mvt.sh — compile all daily clips for the current Vivaldi movement into
|
||||
# a single montage that exactly matches the music duration, with 2-second
|
||||
# audio/video fade in/out and a 7-second attribution card appended.
|
||||
#
|
||||
# Called automatically by 4-seasons.sh on the last day of each movement.
|
||||
# Can also be run manually (e.g. to build a partial mid-season preview).
|
||||
#
|
||||
# Music: "The Four Seasons" by Antonio Vivaldi
|
||||
# Performed by John Harrison with the Wichita State University Chamber Players
|
||||
# Source: Free Music Archive (freemusicarchive.org)
|
||||
# License: CC BY-NC-SA 4.0 — verify at the URL above before redistribution.
|
||||
# Source: Free Music Archive — freemusicarchive.org
|
||||
# License: CC BY-SA 3.0 — creativecommons.org/licenses/by-sa/3.0
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_DIR="$(dirname "$(realpath "$0")")"
|
||||
|
||||
# ── Configuration ──────────────────────────────────────────────────────────────
|
||||
base_dir="/home/motion/drives/local-2tb"
|
||||
script_name=$(basename "$(dirname "$(realpath "$0")")" | cut -d'-' -f1)
|
||||
music_base_dir="$base_dir/music/4 Seasons"
|
||||
# Fallback: use music/ directory next to this script (repo copy)
|
||||
[ ! -d "$music_base_dir" ] && music_base_dir="$(dirname "$(realpath "$0")")/music"
|
||||
[ ! -d "$music_base_dir" ] && music_base_dir="$SCRIPT_DIR/music"
|
||||
|
||||
TARGET_W=1280
|
||||
TARGET_H=720
|
||||
FADE_DUR=2.0
|
||||
ATTR_DUR=7
|
||||
FADE_DUR=2.0 # seconds for video + audio fade in/out
|
||||
ATTR_DUR=7 # duration of attribution card in seconds
|
||||
|
||||
# ── Season / movement detection ────────────────────────────────────────────────
|
||||
day_of_year=$(date +%j | sed 's/^0*//') # strip leading zeros for arithmetic
|
||||
# ── Season / movement info ────────────────────────────────────────────────────
|
||||
# Optional first argument: YYYY-MM-DD of the last day of the movement to compile.
|
||||
# Used when called automatically from 4-seasons.sh (which processes yesterday's
|
||||
# images the next morning, so "today" would already be the next movement).
|
||||
# When run manually with no argument, uses today — correct for same-day runs.
|
||||
DATE_ARG="${1:-}"
|
||||
eval "$(python3 "$SCRIPT_DIR/season_info.py" ${DATE_ARG:+"$DATE_ARG"})"
|
||||
echo "Season=$SEASON Mvt=$MVT_NUM Day=$DAY_OF_MVT/$DAYS_IN_MVT (ref date: ${DATE_ARG:-today})"
|
||||
|
||||
if [ "$day_of_year" -ge 80 ] && [ "$day_of_year" -le 172 ]; then
|
||||
season="Spring"; season_start=80; days_in_season=93
|
||||
elif [ "$day_of_year" -ge 173 ] && [ "$day_of_year" -le 264 ]; then
|
||||
season="Summer"; season_start=173; days_in_season=92
|
||||
elif [ "$day_of_year" -ge 265 ] && [ "$day_of_year" -le 355 ]; then
|
||||
season="Autumn"; season_start=265; days_in_season=91
|
||||
else
|
||||
season="Winter"; days_in_season=90
|
||||
# Winter straddles the year boundary (day 356–79)
|
||||
if [ "$day_of_year" -ge 356 ]; then season_start=356; else season_start=0; fi
|
||||
fi
|
||||
|
||||
# Day within the season (1-based)
|
||||
if [ "$season" = "Winter" ] && [ "$day_of_year" -lt 80 ]; then
|
||||
day_of_season=$(( day_of_year + 365 - 355 ))
|
||||
elif [ "$season" = "Winter" ]; then
|
||||
day_of_season=$(( day_of_year - 355 ))
|
||||
else
|
||||
day_of_season=$(( day_of_year - season_start + 1 ))
|
||||
fi
|
||||
|
||||
# Each season split into three movements of ~30 days each
|
||||
if [ "$day_of_season" -le 30 ]; then movement_num=1; days_in_movement=30
|
||||
elif [ "$day_of_season" -le 60 ]; then movement_num=2; days_in_movement=30
|
||||
else movement_num=3; days_in_movement=$(( days_in_season - 60 ))
|
||||
fi
|
||||
|
||||
echo "Season=$season Mvt=$movement_num DayOfSeason=$day_of_season DaysInMvt=$days_in_movement"
|
||||
|
||||
# ── Locate input files ─────────────────────────────────────────────────────────
|
||||
video_dir="$base_dir/movies/$script_name/$season/Mvt$movement_num"
|
||||
# ── Locate files ──────────────────────────────────────────────────────────────
|
||||
script_name=$(basename "$SCRIPT_DIR" | cut -d'-' -f1)
|
||||
video_dir="$base_dir/movies/$script_name/$SEASON/Mvt$MVT_NUM"
|
||||
output_dir="$video_dir/montage"
|
||||
mkdir -p "$output_dir"
|
||||
|
||||
music_file=$(find "$music_base_dir" -type f -iname "*${season}*Mvt*${movement_num}*" | sort | head -n 1)
|
||||
music_file=$(find "$music_base_dir" -type f -iname "*${SEASON}*Mvt*${MVT_NUM}*" | sort | head -n 1)
|
||||
if [ -z "$music_file" ]; then
|
||||
echo "ERROR: Music file not found for $season Mvt $movement_num in $music_base_dir"
|
||||
echo "ERROR: Music file not found for $SEASON Mvt $MVT_NUM"
|
||||
exit 1
|
||||
fi
|
||||
music_duration=$(ffprobe -v error -show_entries format=duration -of csv=p=0 "$music_file")
|
||||
echo "Music: $(basename "$music_file") ($music_duration s)"
|
||||
|
||||
# Collect sorted daily clips
|
||||
# ── Collect sorted daily clips ─────────────────────────────────────────────────
|
||||
mapfile -d '' daily_clips < <(find "$video_dir" -maxdepth 1 -name "*-final.mp4" -print0 | sort -z)
|
||||
if [ "${#daily_clips[@]}" -eq 0 ]; then
|
||||
echo "ERROR: No *-final.mp4 clips found in $video_dir"
|
||||
echo "ERROR: No *-final.mp4 clips in $video_dir"
|
||||
exit 1
|
||||
fi
|
||||
echo "Found ${#daily_clips[@]} daily clips"
|
||||
|
||||
# ── Temp-file tracking for cleanup ────────────────────────────────────────────
|
||||
# ── Detect source resolution from first clip ──────────────────────────────────
|
||||
# The attribution card is created at this same resolution so nothing is resized.
|
||||
VIDEO_W=$(ffprobe -v error -select_streams v:0 -show_entries stream=width -of csv=p=0 "${daily_clips[0]}")
|
||||
VIDEO_H=$(ffprobe -v error -select_streams v:0 -show_entries stream=height -of csv=p=0 "${daily_clips[0]}")
|
||||
echo "Source resolution: ${VIDEO_W}x${VIDEO_H}"
|
||||
|
||||
# ── Temp-file tracking ────────────────────────────────────────────────────────
|
||||
TMPFILES=()
|
||||
cleanup() { rm -f "${TMPFILES[@]}" 2>/dev/null || true; }
|
||||
trap cleanup EXIT
|
||||
|
||||
concat_list=$(mktemp --suffix=.txt); TMPFILES+=("$concat_list")
|
||||
concat_list=$(mktemp --suffix=.txt); TMPFILES+=("$concat_list")
|
||||
printf "file '%s'\n" "${daily_clips[@]}" > "$concat_list"
|
||||
|
||||
# ── Step 1: Concatenate + normalise to TARGET_W x TARGET_H ────────────────────
|
||||
# ── Step 1: Concatenate clips, normalising to source resolution ───────────────
|
||||
# Normalise in case any clip differs (e.g. camera settings changed on one day).
|
||||
temp_concat=$(mktemp --suffix=.mp4); TMPFILES+=("$temp_concat")
|
||||
echo "Step 1/5: concatenating ${#daily_clips[@]} clips at ${TARGET_W}x${TARGET_H}..."
|
||||
echo "Step 1/5: concatenating ${#daily_clips[@]} clips..."
|
||||
ffmpeg -loglevel warning \
|
||||
-f concat -safe 0 -i "$concat_list" \
|
||||
-vf "scale=${TARGET_W}:${TARGET_H}:force_original_aspect_ratio=decrease,\
|
||||
pad=${TARGET_W}:${TARGET_H}:(ow-iw)/2:(oh-ih)/2,setsar=1" \
|
||||
-c:v libx264 -pix_fmt yuv420p -crf 26 -an -y "$temp_concat"
|
||||
-vf "scale=${VIDEO_W}:${VIDEO_H}:force_original_aspect_ratio=decrease,\
|
||||
pad=${VIDEO_W}:${VIDEO_H}:(ow-iw)/2:(oh-ih)/2,setsar=1" \
|
||||
-c:v libx264 -pix_fmt yuv420p -crf 26 -an \
|
||||
-y "$temp_concat"
|
||||
|
||||
# ── Step 2: Speed-adjust so total video == music duration ─────────────────────
|
||||
# ── Step 2: Speed-adjust to match music duration exactly ──────────────────────
|
||||
concat_dur=$(ffprobe -v error -show_entries format=duration -of csv=p=0 "$temp_concat")
|
||||
speed_factor=$(echo "scale=6; $concat_dur / $music_duration" | bc)
|
||||
echo "Step 2/5: speed factor $speed_factor (raw=${concat_dur}s target=${music_duration}s)"
|
||||
echo "Step 2/5: speed factor $speed_factor (raw=${concat_dur}s music=${music_duration}s)"
|
||||
|
||||
temp_sped=$(mktemp --suffix=.mp4); TMPFILES+=("$temp_sped")
|
||||
ffmpeg -loglevel warning \
|
||||
@@ -105,9 +92,9 @@ ffmpeg -loglevel warning \
|
||||
-t "$music_duration" -y "$temp_sped"
|
||||
rm "$temp_concat"
|
||||
|
||||
# ── Step 3: Merge with music + video/audio fades ──────────────────────────────
|
||||
# ── Step 3: Merge with music + 2-second video/audio fade in/out ───────────────
|
||||
fade_out_start=$(echo "scale=3; $music_duration - $FADE_DUR" | bc)
|
||||
echo "Step 3/5: merging music + fade in/out (fade=${FADE_DUR}s)..."
|
||||
echo "Step 3/5: adding music and fades..."
|
||||
|
||||
temp_main=$(mktemp --suffix=.mp4); TMPFILES+=("$temp_main")
|
||||
ffmpeg -loglevel warning \
|
||||
@@ -120,15 +107,15 @@ ffmpeg -loglevel warning \
|
||||
-t "$music_duration" -y "$temp_main"
|
||||
rm "$temp_sped"
|
||||
|
||||
# ── Step 4: Create 7-second attribution card ──────────────────────────────────
|
||||
echo "Step 4/5: building attribution card..."
|
||||
# ── Step 4: Create 7-second attribution card at source resolution ─────────────
|
||||
# Resolution matches the video — no resizing of the main montage required.
|
||||
echo "Step 4/5: creating attribution card at ${VIDEO_W}x${VIDEO_H}..."
|
||||
|
||||
# Locate a usable font
|
||||
FONT=""
|
||||
FONT_BOLD=""
|
||||
if command -v fc-match &>/dev/null; then
|
||||
FONT=$(fc-match "DejaVu Sans:style=Regular" --format="%{file}" 2>/dev/null || true)
|
||||
FONT_BOLD=$(fc-match "DejaVu Sans:style=Bold" --format="%{file}" 2>/dev/null || true)
|
||||
FONT_BOLD=$(fc-match "DejaVu Sans:style=Bold" --format="%{file}" 2>/dev/null || true)
|
||||
fi
|
||||
if [ -z "$FONT" ]; then
|
||||
for f in \
|
||||
@@ -141,29 +128,30 @@ if [ -z "$FONT" ]; then
|
||||
fi
|
||||
[ -z "$FONT_BOLD" ] && FONT_BOLD="$FONT"
|
||||
|
||||
# Build drawtext chain (colons in text values escaped as \: → \\: in bash string)
|
||||
DT="drawtext=fontfile='${FONT_BOLD}':text='The Four Seasons - Antonio Vivaldi':fontcolor=white:fontsize=38:x=(w-text_w)/2:y=h*0.18"
|
||||
DT="${DT},drawtext=fontfile='${FONT}':text='Performed by John Harrison':fontcolor=0xDDDDDD:fontsize=28:x=(w-text_w)/2:y=h*0.34"
|
||||
DT="${DT},drawtext=fontfile='${FONT}':text='with the Wichita State University Chamber Players':fontcolor=0xDDDDDD:fontsize=22:x=(w-text_w)/2:y=h*0.44"
|
||||
DT="${DT},drawtext=fontfile='${FONT}':text='Source\\: Free Music Archive':fontcolor=white:fontsize=21:x=(w-text_w)/2:y=h*0.59"
|
||||
DT="${DT},drawtext=fontfile='${FONT}':text='freemusicarchive.org':fontcolor=0xFFFF88:fontsize=21:x=(w-text_w)/2:y=h*0.68"
|
||||
DT="${DT},drawtext=fontfile='${FONT}':text='License\\: CC BY-NC-SA 4.0':fontcolor=0xCCCCCC:fontsize=19:x=(w-text_w)/2:y=h*0.78"
|
||||
DT="${DT},fade=t=in:st=0:d=1,fade=t=out:st=$((ATTR_DUR - 1)):d=1"
|
||||
# Font sizes are proportional to frame height so they look right at any resolution.
|
||||
# Colons inside drawtext text values must be escaped as \: (\\: in bash double-quotes).
|
||||
DT="drawtext=fontfile='${FONT_BOLD}':text='The Four Seasons - Antonio Vivaldi':fontcolor=white:fontsize=h/19:x=(w-text_w)/2:y=h*0.15"
|
||||
DT="${DT},drawtext=fontfile='${FONT}':text='Performed by John Harrison':fontcolor=0xDDDDDD:fontsize=h/26:x=(w-text_w)/2:y=h*0.32"
|
||||
DT="${DT},drawtext=fontfile='${FONT}':text='with the Wichita State University Chamber Players':fontcolor=0xDDDDDD:fontsize=h/30:x=(w-text_w)/2:y=h*0.43"
|
||||
DT="${DT},drawtext=fontfile='${FONT}':text='Source\\: Free Music Archive':fontcolor=white:fontsize=h/32:x=(w-text_w)/2:y=h*0.57"
|
||||
DT="${DT},drawtext=fontfile='${FONT}':text='freemusicarchive.org':fontcolor=0xFFFF88:fontsize=h/32:x=(w-text_w)/2:y=h*0.66"
|
||||
DT="${DT},drawtext=fontfile='${FONT}':text='License\\: CC BY-SA 3.0':fontcolor=0xCCCCCC:fontsize=h/34:x=(w-text_w)/2:y=h*0.76"
|
||||
DT="${DT},fade=t=in:st=0:d=1,fade=t=out:st=$((ATTR_DUR-1)):d=1"
|
||||
|
||||
temp_attr=$(mktemp --suffix=.mp4); TMPFILES+=("$temp_attr")
|
||||
ffmpeg -loglevel warning \
|
||||
-f lavfi -i "color=c=black:s=${TARGET_W}x${TARGET_H}:r=25:d=${ATTR_DUR}" \
|
||||
-f lavfi -i "color=c=black:s=${VIDEO_W}x${VIDEO_H}:r=25:d=${ATTR_DUR}" \
|
||||
-f lavfi -i "anullsrc=r=44100:cl=stereo" \
|
||||
-vf "$DT" \
|
||||
-c:v libx264 -pix_fmt yuv420p -c:a aac -b:a 192k \
|
||||
-t "$ATTR_DUR" -y "$temp_attr"
|
||||
|
||||
# ── Step 5: Concatenate montage + attribution ─────────────────────────────────
|
||||
echo "Step 5/5: appending attribution and writing final file..."
|
||||
# ── Step 5: Join montage + attribution card ───────────────────────────────────
|
||||
echo "Step 5/5: joining montage and attribution card..."
|
||||
final_list=$(mktemp --suffix=.txt); TMPFILES+=("$final_list")
|
||||
printf "file '%s'\n" "$temp_main" "$temp_attr" > "$final_list"
|
||||
|
||||
output_file="$output_dir/$(date +%Y-%m-%d)_${season}_Mvt${movement_num}-Montage.mp4"
|
||||
output_file="$output_dir/$(date +%Y-%m-%d)_${SEASON}_Mvt${MVT_NUM}-Montage.mp4"
|
||||
ffmpeg -loglevel warning \
|
||||
-f concat -safe 0 -i "$final_list" \
|
||||
-c copy -y "$output_file"
|
||||
|
||||
Reference in New Issue
Block a user