From 8617248cc07d9d92959efdc9c1eceeea23a7a1e2 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 18 Apr 2026 13:59:48 +0000 Subject: [PATCH] Add year-based folders, attribution overlay, notifications, crontab/systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit season_info.py - Add ASTRO_YEAR: year of the Winter solstice that started the current cycle (Spring/Summer/Autumn 2026 → 2025; Winter Dec-2026 → 2026) 4-seasons.sh - Daily clip output path now includes ASTRO_YEAR: movies/$name/$ASTRO_YEAR/$SEASON/Mvt$N/ montage-mvt.sh (full rewrite) - Attribution is now a drawtext overlay (top 6 s of the video, fade in/out) instead of an appended black card — no frame-size matching needed, and year-end join requires no special handling - Output path mirrors the new year-based folder structure - Sends notification via notify.sh when done - Automatically triggers year-end-join.sh after Autumn Mvt 3 year-end-join.sh (new) - Concatenates all 12 movement montages for a given ASTRO_YEAR - Output: movies/$name/$ASTRO_YEAR/$name-$ASTRO_YEAR.mp4 - Sends notification when done notify.sh + notify_config.txt (new) - Generic best-effort notification helper: ntfy, email, Mattermost text post - All methods disabled by default; user fills in notify_config.txt sky-cam.crontab + systemd/ (new) - Crontab file: sunrise at 09:00, 4-seasons at 01:00, fullday at 02:00 - systemd .service + .timer units for all three daily jobs - montage/year-end triggered internally, not by cron https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ --- 4-seasons.sh | 7 +- montage-mvt.sh | 201 ++++++++++++++++--------------- notify.sh | 74 ++++++++++++ notify_config.txt | 22 ++++ season_info.py | 9 ++ sky-cam.crontab | 26 ++++ systemd/README.txt | 40 ++++++ systemd/sky-cam-4seasons.service | 10 ++ systemd/sky-cam-4seasons.timer | 9 ++ systemd/sky-cam-fullday.service | 8 ++ systemd/sky-cam-fullday.timer | 9 ++ systemd/sky-cam-sunrise.service | 11 ++ systemd/sky-cam-sunrise.timer | 11 ++ year-end-join.sh | 77 ++++++++++++ 14 files changed, 416 insertions(+), 98 deletions(-) create mode 100755 notify.sh create mode 100644 notify_config.txt create mode 100644 sky-cam.crontab create mode 100644 systemd/README.txt create mode 100644 systemd/sky-cam-4seasons.service create mode 100644 systemd/sky-cam-4seasons.timer create mode 100644 systemd/sky-cam-fullday.service create mode 100644 systemd/sky-cam-fullday.timer create mode 100644 systemd/sky-cam-sunrise.service create mode 100644 systemd/sky-cam-sunrise.timer create mode 100755 year-end-join.sh diff --git a/4-seasons.sh b/4-seasons.sh index dea6060..4890c83 100755 --- a/4-seasons.sh +++ b/4-seasons.sh @@ -23,8 +23,9 @@ echo "Processing: $yesterday" # ── Season / movement info from astronomical calculation ────────────────────── eval "$(python3 "$SCRIPT_DIR/season_info.py" "$yesterday")" -# Provides: SEASON MVT_NUM DAY_OF_MVT DAYS_IN_MVT MVT_START MVT_END IS_LAST_DAY -echo "Season=$SEASON Mvt=$MVT_NUM Day=$DAY_OF_MVT/$DAYS_IN_MVT LastDay=$IS_LAST_DAY" +# Provides: SEASON MVT_NUM DAY_OF_MVT DAYS_IN_MVT MVT_START MVT_END +# IS_LAST_DAY ASTRO_YEAR +echo "Season=$SEASON Mvt=$MVT_NUM Year=$ASTRO_YEAR Day=$DAY_OF_MVT/$DAYS_IN_MVT LastDay=$IS_LAST_DAY" # ── Locate music file and get its duration ──────────────────────────────────── music_file=$(find "$music_base_dir" -type f -iname "*${SEASON}*Mvt*${MVT_NUM}*" | sort | head -n 1) @@ -57,7 +58,7 @@ fi echo "Images found: $total_images" # ── Prepare output directory ────────────────────────────────────────────────── -output_dir="$base_dir/movies/$script_name/$SEASON/Mvt$MVT_NUM" +output_dir="$base_dir/movies/$script_name/$ASTRO_YEAR/$SEASON/Mvt$MVT_NUM" mkdir -p "$output_dir" # ── Build sorted image list ─────────────────────────────────────────────────── diff --git a/montage-mvt.sh b/montage-mvt.sh index ebff07c..3159c19 100755 --- a/montage-mvt.sh +++ b/montage-mvt.sh @@ -1,15 +1,20 @@ #!/bin/bash -# 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. +# montage-mvt.sh — compile one Vivaldi movement's daily clips into a montage. +# +# Duration matches the movement's music exactly. Attribution is overlaid as a +# translucent bar across the top of the video for the first ATTR_DUR seconds +# (fade in/out) — no separate card appended, so year-end joining is a plain +# concat with no duplicate attribution concerns. # # 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). +# Can also be run manually for a mid-season preview. +# +# On the last day of Autumn Mvt 3, automatically triggers year-end-join.sh. # # 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-SA 3.0 — creativecommons.org/licenses/by-sa/3.0 +# License: CC BY-SA 3.0 set -euo pipefail @@ -20,33 +25,32 @@ base_dir="/home/motion/drives/local-2tb" music_base_dir="$base_dir/music/4 Seasons" [ ! -d "$music_base_dir" ] && music_base_dir="$SCRIPT_DIR/music" -FADE_DUR=2.0 # seconds for video + audio fade in/out -ATTR_DUR=7 # duration of attribution card in seconds +FADE_DUR=2.0 # video + audio fade in/out (seconds) +ATTR_DUR=6 # attribution overlay duration (seconds from start) +ATTR_FADE=1 # attribution fade in / fade out duration # ── 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})" +# Provides: SEASON MVT_NUM DAY_OF_MVT DAYS_IN_MVT MVT_START MVT_END +# IS_LAST_DAY ASTRO_YEAR +echo "Season=$SEASON Mvt=$MVT_NUM Year=$ASTRO_YEAR (ref: ${DATE_ARG:-today})" # ── Locate files ────────────────────────────────────────────────────────────── script_name=$(basename "$SCRIPT_DIR" | cut -d'-' -f1) -video_dir="$base_dir/movies/$script_name/$SEASON/Mvt$MVT_NUM" +video_dir="$base_dir/movies/$script_name/$ASTRO_YEAR/$SEASON/Mvt$MVT_NUM" output_dir="$video_dir/montage" mkdir -p "$output_dir" 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 $MVT_NUM" + echo "ERROR: Music file not found for $SEASON Mvt $MVT_NUM in $music_base_dir" 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)" +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 in $video_dir" @@ -54,65 +58,13 @@ if [ "${#daily_clips[@]}" -eq 0 ]; then fi echo "Found ${#daily_clips[@]} daily clips" -# ── Detect source resolution from first clip ────────────────────────────────── -# The attribution card is created at this same resolution so nothing is resized. +# ── Source resolution ───────────────────────────────────────────────────────── 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") -printf "file '%s'\n" "${daily_clips[@]}" > "$concat_list" - -# ── 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..." -ffmpeg -loglevel warning \ - -f concat -safe 0 -i "$concat_list" \ - -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 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 music=${music_duration}s)" - -temp_sped=$(mktemp --suffix=.mp4); TMPFILES+=("$temp_sped") -ffmpeg -loglevel warning \ - -i "$temp_concat" \ - -vf "setpts=PTS/$speed_factor" \ - -c:v libx264 -pix_fmt yuv420p -crf 26 -an \ - -t "$music_duration" -y "$temp_sped" -rm "$temp_concat" - -# ── 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: adding music and fades..." - -temp_main=$(mktemp --suffix=.mp4); TMPFILES+=("$temp_main") -ffmpeg -loglevel warning \ - -i "$temp_sped" -i "$music_file" \ - -filter_complex \ -"[0:v]fade=t=in:st=0:d=${FADE_DUR},fade=t=out:st=${fade_out_start}:d=${FADE_DUR}[vout];\ -[1:a]afade=t=in:st=0:d=${FADE_DUR},afade=t=out:st=${fade_out_start}:d=${FADE_DUR}[aout]" \ - -map "[vout]" -map "[aout]" \ - -c:v libx264 -pix_fmt yuv420p -c:a aac -b:a 192k \ - -t "$music_duration" -y "$temp_main" -rm "$temp_sped" - -# ── 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}..." - -FONT="" -FONT_BOLD="" +# ── Font detection ──────────────────────────────────────────────────────────── +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) @@ -128,32 +80,91 @@ if [ -z "$FONT" ]; then fi [ -z "$FONT_BOLD" ] && FONT_BOLD="$FONT" -# 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 files ──────────────────────────────────────────────────────────────── +TMPFILES=() +cleanup() { rm -f "${TMPFILES[@]}" 2>/dev/null || true; } +trap cleanup EXIT -temp_attr=$(mktemp --suffix=.mp4); TMPFILES+=("$temp_attr") +concat_list=$(mktemp --suffix=.txt); TMPFILES+=("$concat_list") +printf "file '%s'\n" "${daily_clips[@]}" > "$concat_list" + +# ── Step 1: Concatenate + normalise resolution ──────────────────────────────── +temp_concat=$(mktemp --suffix=.mp4); TMPFILES+=("$temp_concat") +echo "Step 1/3: concatenating ${#daily_clips[@]} clips..." ffmpeg -loglevel warning \ - -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" \ + -f concat -safe 0 -i "$concat_list" \ + -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 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/3: speed $speed_factor (raw=${concat_dur}s → music=${music_duration}s)" + +temp_sped=$(mktemp --suffix=.mp4); TMPFILES+=("$temp_sped") +ffmpeg -loglevel warning \ + -i "$temp_concat" \ + -vf "setpts=PTS/$speed_factor" \ + -c:v libx264 -pix_fmt yuv420p -crf 26 -an \ + -t "$music_duration" -y "$temp_sped" +rm "$temp_concat" + +# ── Step 3: Music + fades + attribution overlay ─────────────────────────────── +# Attribution overlay: semi-transparent bar across the top for the first +# ATTR_DUR seconds, text fades in over ATTR_FADE s and out over ATTR_FADE s. +# alpha expression: 0→1 over first ATTR_FADE s, 1 in the middle, 1→0 over +# the last ATTR_FADE s before ATTR_DUR. +ATTR_FADE_END=$(echo "$ATTR_DUR - $ATTR_FADE" | bc) +ALPHA="if(lt(t,${ATTR_FADE}),t/${ATTR_FADE},if(gt(t,${ATTR_FADE_END}),(${ATTR_DUR}-t)/${ATTR_FADE},1))" +ENABLE="between(t,0,${ATTR_DUR})" + +fade_out_start=$(echo "scale=3; $music_duration - $FADE_DUR" | bc) +echo "Step 3/3: music + fades + attribution overlay..." + +# Build attribution drawtext filters (box=1 gives a per-line background). +# Colons inside text values are escaped as \: (\\: in bash double-quoted strings). +DT="drawtext=fontfile='${FONT_BOLD}'" +DT="${DT}:text='The Four Seasons \: Antonio Vivaldi'" +DT="${DT}:fontcolor=white:fontsize=h/22:x=(w-text_w)/2:y=h*0.012" +DT="${DT}:box=1:boxcolor=black@0.55:boxborderw=8" +DT="${DT}:alpha='${ALPHA}':enable='${ENABLE}'" + +DT="${DT},drawtext=fontfile='${FONT}'" +DT="${DT}:text='John Harrison / Wichita State University Chamber Players'" +DT="${DT}:fontcolor=0xEEEEEE:fontsize=h/30:x=(w-text_w)/2:y=h*0.068" +DT="${DT}:box=1:boxcolor=black@0.55:boxborderw=6" +DT="${DT}:alpha='${ALPHA}':enable='${ENABLE}'" + +DT="${DT},drawtext=fontfile='${FONT}'" +DT="${DT}:text='Free Music Archive \: freemusicarchive.org \: CC BY-SA 3.0'" +DT="${DT}:fontcolor=0xCCCCCC:fontsize=h/36:x=(w-text_w)/2:y=h*0.113" +DT="${DT}:box=1:boxcolor=black@0.55:boxborderw=5" +DT="${DT}:alpha='${ALPHA}':enable='${ENABLE}'" + +output_file="$output_dir/${MVT_START}_${SEASON}_Mvt${MVT_NUM}-Montage.mp4" + +ffmpeg -loglevel warning \ + -i "$temp_sped" -i "$music_file" \ + -filter_complex \ +"[0:v]fade=t=in:st=0:d=${FADE_DUR},fade=t=out:st=${fade_out_start}:d=${FADE_DUR},${DT}[vout];\ +[1:a]afade=t=in:st=0:d=${FADE_DUR},afade=t=out:st=${fade_out_start}:d=${FADE_DUR}[aout]" \ + -map "[vout]" -map "[aout]" \ -c:v libx264 -pix_fmt yuv420p -c:a aac -b:a 192k \ - -t "$ATTR_DUR" -y "$temp_attr" - -# ── 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${MVT_NUM}-Montage.mp4" -ffmpeg -loglevel warning \ - -f concat -safe 0 -i "$final_list" \ - -c copy -y "$output_file" + -t "$music_duration" -y "$output_file" +rm "$temp_sped" echo "Done: $output_file" + +# ── Notify ──────────────────────────────────────────────────────────────────── +"$SCRIPT_DIR/notify.sh" \ + "Montage ready: $SEASON Mvt $MVT_NUM ($ASTRO_YEAR)" \ + "$(basename "$output_file") — ${music_duration}s" \ + || true # notifications are best-effort + +# ── Trigger year-end join on last Autumn movement ──────────────────────────── +if [ "$SEASON" = "Autumn" ] && [ "$MVT_NUM" = "3" ]; then + echo "Last movement of astronomical year $ASTRO_YEAR — triggering year-end join..." + "$SCRIPT_DIR/year-end-join.sh" "$ASTRO_YEAR" +fi diff --git a/notify.sh b/notify.sh new file mode 100755 index 0000000..fad536c --- /dev/null +++ b/notify.sh @@ -0,0 +1,74 @@ +#!/bin/bash +# notify.sh — send a notification via ntfy, email, and/or Mattermost. +# +# Usage: notify.sh "Title" "Body message" +# +# Reads notify_config.txt from the same directory as this script. +# All methods are independently enabled/disabled in the config. +# Exits 0 even if all methods fail (notifications are best-effort). + +set -euo pipefail + +SCRIPT_DIR="$(dirname "$(realpath "$0")")" +CONFIG="$SCRIPT_DIR/notify_config.txt" + +TITLE="${1:-Sky-Cam notification}" +BODY="${2:-}" + +# ── Load config ─────────────────────────────────────────────────────────────── +if [ ! -f "$CONFIG" ]; then + echo "notify.sh: config not found at $CONFIG — skipping notifications" >&2 + exit 0 +fi + +# Source only the known keys; ignore comments and blank lines. +eval "$(grep -E '^[A-Z_]+=.*' "$CONFIG" | grep -v '^#')" + +NTFY_ENABLED="${NTFY_ENABLED:-false}" +NTFY_URL="${NTFY_URL:-}" + +EMAIL_ENABLED="${EMAIL_ENABLED:-false}" +EMAIL_TO="${EMAIL_TO:-}" +EMAIL_FROM="${EMAIL_FROM:-skycam@localhost}" + +MM_NOTIFY_ENABLED="${MM_NOTIFY_ENABLED:-false}" +MM_NOTIFY_CHANNEL_ID="${MM_NOTIFY_CHANNEL_ID:-}" + +# ── ntfy ───────────────────────────────────────────────────────────────────── +if [ "$NTFY_ENABLED" = "true" ] && [ -n "$NTFY_URL" ]; then + curl -s \ + -H "Title: $TITLE" \ + -d "$BODY" \ + "$NTFY_URL" > /dev/null \ + && echo "notify: ntfy sent" \ + || echo "notify: ntfy failed" >&2 +fi + +# ── Email ───────────────────────────────────────────────────────────────────── +if [ "$EMAIL_ENABLED" = "true" ] && [ -n "$EMAIL_TO" ]; then + echo "$BODY" | mail -s "$TITLE" -r "$EMAIL_FROM" "$EMAIL_TO" \ + && echo "notify: email sent to $EMAIL_TO" \ + || echo "notify: email failed" >&2 +fi + +# ── Mattermost text post ────────────────────────────────────────────────────── +# Uses the same mattermost_config.txt as sunrise2mm.py but posts to +# MM_NOTIFY_CHANNEL_ID (can be the same channel or a private admin channel). +if [ "$MM_NOTIFY_ENABLED" = "true" ] && [ -n "$MM_NOTIFY_CHANNEL_ID" ]; then + MM_CONFIG="/home/motion/drives/local-2tb/sunrise-scripts/mattermost_config.txt" + [ ! -f "$MM_CONFIG" ] && MM_CONFIG="$SCRIPT_DIR/mattermost_config.txt" + if [ -f "$MM_CONFIG" ]; then + eval "$(grep -E '^(mattermost_url|access_token)=' "$MM_CONFIG")" + curl -s \ + -H "Authorization: Bearer $access_token" \ + -H "Content-Type: application/json" \ + -d "{\"channel_id\":\"$MM_NOTIFY_CHANNEL_ID\",\"message\":\"**$TITLE**\n$BODY\"}" \ + "${mattermost_url}/api/v4/posts" > /dev/null \ + && echo "notify: mattermost sent" \ + || echo "notify: mattermost failed" >&2 + else + echo "notify: mattermost_config.txt not found — skipping MM notify" >&2 + fi +fi + +exit 0 diff --git a/notify_config.txt b/notify_config.txt new file mode 100644 index 0000000..c8334d2 --- /dev/null +++ b/notify_config.txt @@ -0,0 +1,22 @@ +# notify_config.txt — sky-cam notification settings +# Each method is independently toggled. Set to true and fill in the value. + +# ── ntfy (push notifications via ntfy.sh or self-hosted ntfy) ───────────────── +# Self-host: https://docs.ntfy.sh/install/ +# Cloud: sign up at https://ntfy.sh, pick a topic name +NTFY_ENABLED=false +NTFY_URL=https://ntfy.sh/your-topic-here + +# ── Email ───────────────────────────────────────────────────────────────────── +# Requires the 'mail' command (e.g. mailutils or s-nail package). +# For outbound SMTP relay, configure /etc/ssmtp/ssmtp.conf or msmtp. +EMAIL_ENABLED=false +EMAIL_TO=you@example.com +EMAIL_FROM=skycam@localhost + +# ── Mattermost text post ────────────────────────────────────────────────────── +# Posts a plain-text notification (no video attachment) to the given channel. +# Reuses the URL and access_token from mattermost_config.txt. +# MM_NOTIFY_CHANNEL_ID can be the same daily-upload channel or a separate one. +MM_NOTIFY_ENABLED=false +MM_NOTIFY_CHANNEL_ID=your-channel-id-here diff --git a/season_info.py b/season_info.py index 8cb13c8..12e267c 100644 --- a/season_info.py +++ b/season_info.py @@ -28,6 +28,9 @@ Outputs (shell-sourceable): SEASON_START YYYY-MM-DD of season start (local date) SEASON_END YYYY-MM-DD of season end (local date) IS_LAST_DAY true | false + ASTRO_YEAR year when the current cycle's Winter solstice occurred + (Spring/Summer/Autumn of 2026 all return 2025 if Winter + started Dec 2025; Winter 2025 itself also returns 2025) """ import sys @@ -148,6 +151,11 @@ def get_info(date: datetime.date, tz_name: str = DEFAULT_TZ) -> dict: else: mvt, mvt_start, mvt_end, days_in_mvt = 3, m2_end + datetime.timedelta(1), m3_end, m3 + # Astronomical year: the calendar year in which the current cycle's Winter + # solstice occurred. Spring/Summer/Autumn belong to the Winter that preceded + # them; Winter belongs to the solstice that started it. + astro_year = s_start.year if season == "Winter" else prev["Winter"].year + return { "SEASON": season, "MVT_NUM": mvt, @@ -158,6 +166,7 @@ def get_info(date: datetime.date, tz_name: str = DEFAULT_TZ) -> dict: "SEASON_START": s_start.isoformat(), "SEASON_END": s_end.isoformat(), "IS_LAST_DAY": str(date == mvt_end).lower(), + "ASTRO_YEAR": str(astro_year), } diff --git a/sky-cam.crontab b/sky-cam.crontab new file mode 100644 index 0000000..1973d05 --- /dev/null +++ b/sky-cam.crontab @@ -0,0 +1,26 @@ +# sky-cam crontab +# +# Install: crontab sky-cam.crontab +# (or append to existing: crontab -l | cat - sky-cam.crontab | crontab -) +# +# Set SCRIPT_DIR to wherever this repo lives on your machine. +# Logs go to /var/log/sky-cam/ — create it first: +# sudo mkdir -p /var/log/sky-cam && sudo chown $USER /var/log/sky-cam + +SCRIPT_DIR=/home/motion/drives/local-2tb/sunrise-scripts +LOGDIR=/var/log/sky-cam + +# ── Daily sunrise video → Mattermost (run after sunrise window ends) ────────── +# sunrise_video.10s.sh processes today's images, so run well after sunrise. +# Adjust the hour to be safely after your latest local sunrise (~09:00 is fine +# for any timezone in the continental US; change to 10:00 if unsure). +0 9 * * * $SCRIPT_DIR/sunrise_video.10s.sh >> $LOGDIR/sunrise.log 2>&1 + +# ── Daily Four Seasons clip (process yesterday's images, 01:00) ─────────────── +# Also triggers montage-mvt.sh automatically on the last day of each movement, +# which in turn triggers year-end-join.sh after the last Autumn movement. +0 1 * * * $SCRIPT_DIR/4-seasons.sh >> $LOGDIR/4-seasons.log 2>&1 + +# ── Full-day timelapse (process yesterday's images, 02:00) ──────────────────── +# Runs after 4-seasons.sh to avoid disk contention. Deletes videos > 10 days. +0 2 * * * $SCRIPT_DIR/fullday-video.sh >> $LOGDIR/fullday.log 2>&1 diff --git a/systemd/README.txt b/systemd/README.txt new file mode 100644 index 0000000..1f1b94a --- /dev/null +++ b/systemd/README.txt @@ -0,0 +1,40 @@ +Installing systemd timers +======================== + +1. Edit the ExecStart paths in each .service file to match where your scripts live. + +2. Copy units to the systemd user directory (no root needed): + + mkdir -p ~/.config/systemd/user + cp sky-cam-*.service sky-cam-*.timer ~/.config/systemd/user/ + + Or system-wide (root required): + + sudo cp sky-cam-*.service sky-cam-*.timer /etc/systemd/system/ + +3. Reload and enable: + + # User-level + systemctl --user daemon-reload + systemctl --user enable --now sky-cam-sunrise.timer + systemctl --user enable --now sky-cam-4seasons.timer + systemctl --user enable --now sky-cam-fullday.timer + + # System-level (replace --user with no flag, add sudo) + sudo systemctl daemon-reload + sudo systemctl enable --now sky-cam-sunrise.timer + ... + +4. Check status: + + systemctl --user list-timers sky-cam-* + journalctl --user -u sky-cam-4seasons.service -f + +Notes +----- +- Persistent=true means missed runs (e.g. system was off at 01:00) are + caught up on next boot, within the same day. +- montage-mvt.sh and year-end-join.sh are NOT scheduled directly — they + are triggered automatically by 4-seasons.sh on the appropriate days. +- notify.sh fires inside montage-mvt.sh and year-end-join.sh; it is not + a separate scheduled job. diff --git a/systemd/sky-cam-4seasons.service b/systemd/sky-cam-4seasons.service new file mode 100644 index 0000000..80c4d4c --- /dev/null +++ b/systemd/sky-cam-4seasons.service @@ -0,0 +1,10 @@ +[Unit] +Description=Sky-Cam Four Seasons daily clip (+ montage trigger on last day) +After=network-online.target +Wants=network-online.target + +[Service] +Type=oneshot +ExecStart=/home/motion/drives/local-2tb/sunrise-scripts/4-seasons.sh +StandardOutput=journal +StandardError=journal diff --git a/systemd/sky-cam-4seasons.timer b/systemd/sky-cam-4seasons.timer new file mode 100644 index 0000000..b6f5928 --- /dev/null +++ b/systemd/sky-cam-4seasons.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Sky-Cam Four Seasons daily clip — 01:00 + +[Timer] +OnCalendar=*-*-* 01:00:00 +Persistent=true + +[Install] +WantedBy=timers.target diff --git a/systemd/sky-cam-fullday.service b/systemd/sky-cam-fullday.service new file mode 100644 index 0000000..f043235 --- /dev/null +++ b/systemd/sky-cam-fullday.service @@ -0,0 +1,8 @@ +[Unit] +Description=Sky-Cam full-day timelapse (10-day retention) + +[Service] +Type=oneshot +ExecStart=/home/motion/drives/local-2tb/sunrise-scripts/fullday-video.sh +StandardOutput=journal +StandardError=journal diff --git a/systemd/sky-cam-fullday.timer b/systemd/sky-cam-fullday.timer new file mode 100644 index 0000000..e47a900 --- /dev/null +++ b/systemd/sky-cam-fullday.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Sky-Cam full-day timelapse — 02:00 + +[Timer] +OnCalendar=*-*-* 02:00:00 +Persistent=true + +[Install] +WantedBy=timers.target diff --git a/systemd/sky-cam-sunrise.service b/systemd/sky-cam-sunrise.service new file mode 100644 index 0000000..707cfa2 --- /dev/null +++ b/systemd/sky-cam-sunrise.service @@ -0,0 +1,11 @@ +[Unit] +Description=Sky-Cam daily sunrise video → Mattermost +After=network-online.target +Wants=network-online.target + +[Service] +Type=oneshot +# ── Edit this path ──────────────────────────────────────────────────────────── +ExecStart=/home/motion/drives/local-2tb/sunrise-scripts/sunrise_video.10s.sh +StandardOutput=journal +StandardError=journal diff --git a/systemd/sky-cam-sunrise.timer b/systemd/sky-cam-sunrise.timer new file mode 100644 index 0000000..f047a2f --- /dev/null +++ b/systemd/sky-cam-sunrise.timer @@ -0,0 +1,11 @@ +[Unit] +Description=Sky-Cam sunrise video — daily at 09:00 + +[Timer] +# Run at 09:00 every day (after sunrise window has ended). +OnCalendar=*-*-* 09:00:00 +# If the system was off at 09:00, run as soon as it boots (within 1 hour). +Persistent=true + +[Install] +WantedBy=timers.target diff --git a/year-end-join.sh b/year-end-join.sh new file mode 100755 index 0000000..61920bf --- /dev/null +++ b/year-end-join.sh @@ -0,0 +1,77 @@ +#!/bin/bash +# year-end-join.sh — concatenate all 12 movement montages for one astronomical +# year into a single "Four Seasons" video. +# +# Called automatically by montage-mvt.sh after the last Autumn movement finishes. +# Can also be run manually: ./year-end-join.sh 2025 +# +# The 12 individual movement videos already carry their own attribution overlay +# (first 6 seconds of each), so no extra card is appended here. +# +# Output: $base_dir/movies/$script_name/$ASTRO_YEAR/$script_name-$ASTRO_YEAR.mp4 + +set -euo pipefail + +SCRIPT_DIR="$(dirname "$(realpath "$0")")" + +ASTRO_YEAR="${1:-}" +if [ -z "$ASTRO_YEAR" ]; then + echo "Usage: $0 (e.g. $0 2025)" + exit 1 +fi + +base_dir="/home/motion/drives/local-2tb" +script_name=$(basename "$SCRIPT_DIR" | cut -d'-' -f1) +year_dir="$base_dir/movies/$script_name/$ASTRO_YEAR" + +echo "Assembling Four Seasons $ASTRO_YEAR from $year_dir ..." + +# ── Collect the 12 montage files in season/movement order ──────────────────── +concat_list=$(mktemp --suffix=.txt) +trap 'rm -f "$concat_list"' EXIT + +missing=0 +for season in Winter Spring Summer Autumn; do + for mvt in 1 2 3; do + mvt_dir="$year_dir/$season/Mvt$mvt/montage" + # Pick the newest (or only) montage file for this movement + f=$(find "$mvt_dir" -maxdepth 1 -name "*-Montage.mp4" 2>/dev/null | sort | tail -1) + if [ -z "$f" ]; then + echo "WARNING: missing montage for $season Mvt$mvt ($mvt_dir)" + missing=$((missing + 1)) + else + echo " $season Mvt$mvt → $(basename "$f")" + printf "file '%s'\n" "$f" >> "$concat_list" + fi + done +done + +found=$(wc -l < "$concat_list") +echo "$found of 12 movements found ($missing missing)" + +if [ "$found" -eq 0 ]; then + echo "ERROR: no montage files found — aborting." + exit 1 +fi + +if [ "$missing" -gt 0 ]; then + echo "WARNING: joining with $missing movement(s) absent." +fi + +# ── Join ────────────────────────────────────────────────────────────────────── +output_file="$year_dir/${script_name}-${ASTRO_YEAR}.mp4" +echo "Output: $output_file" + +ffmpeg -loglevel warning \ + -f concat -safe 0 -i "$concat_list" \ + -c copy -y "$output_file" + +total_dur=$(ffprobe -v error -show_entries format=duration -of csv=p=0 "$output_file") +total_min=$(echo "scale=1; $total_dur / 60" | bc) +echo "Done: $output_file (${total_min} min)" + +# ── Notify ──────────────────────────────────────────────────────────────────── +"$SCRIPT_DIR/notify.sh" \ + "Four Seasons $ASTRO_YEAR complete" \ + "${script_name}-${ASTRO_YEAR}.mp4 — ${total_min} minutes ($found movements)" \ + || true