Commit Graph
118 Commits
Author SHA1 Message Date
Outis 613c88c837 Merge pull request #32 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
ClDemoe/seasonal sunrise montage nn268
2026-04-21 14:25:32 -04:00
Claude 9707e5ca37 capture.sh: source .env so RTSP credentials are available
CAM_RTSP_<cam> is set in .env, not sky-cam.conf, but capture.sh was
only sourcing sky-cam.conf — causing the service to fail with "not set"
even after credentials were added to .env.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-21 18:24:29 +00:00
Claude 1a1ff1a041 Fix one-frame bug; add --test mode to daily_sunrise_video.sh
Root cause: the concat list had no 'duration' entries, so all JPEG
frames collapsed to timestamp 0 and only one frame survived encoding.
Fix: add 'duration CAPTURE_INTERVAL' per entry in both scripts.

Also add fps=25 to the speed-adjust step so the VFR source is resampled
to a standard frame rate — without this, players see ~6fps and may drop
frames to reach the declared rate.

daily_sunrise_video.sh --test [MINUTES]:
  Skips sunrise.py lookup and capture-window wait. Uses the last MINUTES
  minutes of captured frames (default 2). Overlay shows the mid-point
  frame's timestamp. Audio grabbed live from RTSP immediately.
  Output: <date>-daily-sunrise-test.mp4 — no notifications or upload.

  Usage: ./daily_sunrise_video.sh east --test 2

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-21 17:52:29 +00:00
Claude 4c02de5fd4 Overlay: yellow text, lower-right position; test-sunrise uses captured frames
- fontcolor: white → yellow (both scripts)
- y position: (h-th)/2 → h-th-18 (vertically centered → lower-right corner)
- test-sunrise.sh: reverted to reading last 60 frames from capture directory
  (~10 minutes at 10s interval) instead of live RTSP capture

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-21 17:32:31 +00:00
Claude f3839ce1cf Fix overlay vertical text; test-sunrise captures fresh RTSP frames
Overlay fix (both scripts):
  Switch from text='...\n...' to drawtext's textfile= option. Writing
  each character on its own line eliminates the \n escape ambiguity in
  ffmpeg's filter-string single-quote parser, which was causing 'n' to
  appear literally instead of as a line break.

test-sunrise.sh redesign:
  Now captures NUM_FRAMES fresh RTSP frames (120s at default interval)
  at run time instead of reading pre-existing frames from the capture
  directory. The RTSP URL must be set in .env — the script fails early
  with a clear message if it is not.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-21 17:14:17 +00:00
Outis c25aa1fdf5 Merge pull request #31 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
Fix sunrise overlay vertical text and test-sunrise.sh pipeline bugs
2026-04-21 13:03:26 -04:00
Claude eba8ddd550 Fix sunrise overlay vertical text and test-sunrise.sh pipeline bugs
- Overlay text was showing characters run together (e.g. '1n2n') because
  inside ffmpeg single-quoted filter text, \n is consumed as just 'n'.
  Fix: use \\\\n in bash double-quotes which stores \\n in the variable,
  which ffmpeg then parses as \n, which drawtext renders as a newline.
  Applied to both test-sunrise.sh (MID_VERT) and daily_sunrise_video.sh
  (SR_VERT, replacing the awk one-liner with the same bash approach).

- test-sunrise.sh concat list was missing per-frame duration entries,
  causing 12 frames to encode as 0.48s (25fps default) and then slow
  down instead of compress.  Fixed by writing 'duration INTERVAL' per
  frame so 12 frames × 10s = 120s raw → 12× compression to 10s.

- Removed 2>/dev/null from audio ffmpeg call in test-sunrise.sh so
  capture failures are visible for diagnosis.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-21 16:35:25 +00:00
Outis fac7ef0309 Merge pull request #30 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
Add test-sunrise.sh pipeline smoke test
2026-04-21 12:21:29 -04:00
Claude 84fa60b857 Add test-sunrise.sh pipeline smoke test
Runs the same 4-step pipeline as daily_sunrise_video.sh but uses the
most recent ~2 minutes of captured frames instead of the sunrise window,
grabs live RTSP audio for the audio mix step, and accepts an arbitrary
output path — so it can be run at any time of day to verify the full
pipeline (speed-adjust, audio mix, vertical time overlay) without
waiting for tomorrow's sunrise.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-21 16:20:15 +00:00
Outis 73ebfa0f87 Merge pull request #29 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
Pre-create camera data directories in install.sh
2026-04-21 12:13:44 -04:00
Claude 5c88b12b9f Pre-create camera data directories in install.sh
capture.sh creates the per-day subdirectory at runtime, but BASE_DIR/<cam>
and MOVIES_DIR/<cam> need to exist first. Create them during install so the
capture service works immediately on first start without needing a separate
manual mkdir step.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-21 16:00:48 +00:00
Outis 91d90a9ad0 Merge pull request #28 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
Replace url-encode-password.sh with Python script
2026-04-21 11:35:08 -04:00
Claude 21463c22fc Replace url-encode-password.sh with Python script
The shell version had to pass the password through a shell variable into
a Python subprocess, which is fragile for special characters.

The Python version uses getpass.getpass() which reads directly from the
terminal at the Python level — no shell variable, no quoting issues, no
risk of special characters being mishandled.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-21 15:34:02 +00:00
Outis 60bbff18ba Merge pull request #27 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
Default ENCODE_PRESET/CRF_SEASONS_FINAL in make-finals.sh
2026-04-21 11:27:35 -04:00
Claude 98cef1bcd8 Add url-encode-password.sh helper
Prompts for a password without echoing, URL-encodes it via Python's
urllib.parse.quote, and prints the result with a ready-to-paste .env
snippet.  Password is passed via environment variable to avoid any
shell quoting or injection issues — never written to disk or network.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-21 15:26:42 +00:00
Claude 3c2e413ea2 Expand URL-encoding reference in .env.example
Full number-row special character table with percent codes, safe
characters called out, and a note on : and / which break URL parsing.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-21 15:25:12 +00:00
Claude 9d4d50b91c Fix install.sh for non-login shell environments
- Set XDG_RUNTIME_DIR before systemctl --user calls so daemon-reload
  and enable --now work when run outside a login session (e.g. via SSH
  or sudo)
- Run loginctl enable-linger so user services start at boot without a
  login session
- Update .env.example to use single quotes around RTSP URLs and
  document URL-encoding for special characters in passwords

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-21 15:21:12 +00:00
Claude 37ad990af9 Default ENCODE_PRESET/CRF_SEASONS_FINAL in make-finals.sh
Older sky-cam.conf versions may not define these. Fall back to the
canonical defaults so make-finals.sh works without requiring the user
to update their local conf.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-21 11:27:37 +00:00
Outis 15435d2c20 Merge pull request #26 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
Add --cam/--season/--mvt filters to make-finals.sh
2026-04-21 07:15:17 -04:00
Claude c2b54077a9 Add --cam/--season/--mvt filters to make-finals.sh
Allows processing a single movement without waiting for the full backup
scan, e.g.:
  ./make-finals.sh ~/drives/data2-main --cam north --season Autumn --mvt 1

Filters are applied as soon as the relevant variable is known (cam before
calling season_info.py, season/mvt after) so skipped files cost almost
nothing.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-21 11:11:15 +00:00
Outis ebb9dafff0 Merge pull request #25 from outis1one/claude/seasonal-sunrise-montage-nn268
Fix corrupt-file detection in make-finals.sh
2026-04-21 06:52:06 -04:00
Claude 62f1330d9c Fix corrupt-file detection in make-finals.sh
The previous check used || true which masked ffprobe's non-zero exit
code.  For files with a missing/partial moov atom ffprobe can print a
duration estimate then exit non-zero — the || true let that through.

Now use || raw_dur="" to honour the exit code, and add a second probe
for an actual video stream codec so files that report a duration but
have no decodable stream are also caught.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-21 10:51:29 +00:00
Outis 288ac0dabd Merge pull request #24 from outis1one/claude/seasonal-sunrise-montage-nn268
Claude/seasonal sunrise montage nn268
2026-04-21 06:51:25 -04:00
Claude 0ccfb2dae0 Add MONTAGE_MUSIC_LOOPS per-movement music loop multiplier
Short adagio movements (Summer Mvt 2 at 107s, Winter Mvt 2 at 132s, etc.)
compress each day to only 3-5 seconds of screen time at 1×.  Looping the
music N times multiplies the per-day target duration proportionally so the
footage is less aggressively sped up and more watchable.

- sky-cam.conf: add MONTAGE_MUSIC_LOOPS and per-movement overrides
  (Summer Mvt2=3×, Winter Mvt2=3×, Autumn Mvt2=2×, Summer Mvt3=2×, Spring Mvt2=2×)
- 4-seasons.sh: multiply target_per_clip by loops
- montage-mvt.sh: compute effective_duration, use -stream_loop for audio,
  fix fade_out_start, -t, and post-build duration check
- make-finals.sh: multiply target by loops

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 20:11:10 +00:00
Claude 387b84f367 make-finals.sh: skip corrupt temp files (moov atom not found)
Check ffprobe output before encoding — empty/N/A duration means the
file is corrupt or truncated; skip with a clear message rather than
passing a bad input to ffmpeg.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 20:02:04 +00:00
Outis a7c9e038ee Merge pull request #23 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
Add make-finals.sh — one-off recovery script for backup temp files
2026-04-20 15:57:51 -04:00
Claude 26414f9883 Add make-finals.sh — one-off recovery script for backup temp files
Scans all *-temp.mp4 files under a backup root regardless of directory
structure, infers camera name from path, uses season_info.py for correct
movement sizing, writes finals to MOVIES_DIR. Handles messy nested paths
(south/south/, movies/south/, etc.) and deduplicates via EXISTS check.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 19:57:13 +00:00
Outis 73529cb359 Merge pull request #22 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
Fix reorg-backup.sh camera scoping — prevent 2026/ dir misidentified …
2026-04-20 15:41:08 -04:00
Claude 507ecf32c8 Fix reorg-backup.sh camera scoping — prevent 2026/ dir misidentified as cam
Restructure find loop to iterate known CAMERAS+sunrise in the main shell
so cam_name is visible in the while body. Previously the for loop ran in
a process substitution subshell, making cam_name unavailable and causing
top-level year dirs (e.g. 2026/) to be treated as camera names.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 18:49:34 +00:00
Outis 9dcb83afa8 Merge pull request #21 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
ClDemoe/seasonal sunrise montage nn268
2026-04-20 14:40:48 -04:00
Claude da35dc862c Add reorg-backup.sh — reorganize backup files into astro-YEAR folders
Moves Season/MvtN mp4 files from flat camera dirs into
astro-YEAR/<cam>/Season/MvtN/ using season_info.py for correct
year assignment. Handles cross-year mixing in old backup structure.
Dry-run support; never deletes files.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 18:39:15 +00:00
Claude d4e39a5554 Add resize-temps.sh — re-size backup temp files to correct movement targets
Re-processes *-temp.mp4 files from a backup location using season_info.py
to compute the correct target duration per clip (music_duration / DAYS_IN_MVT),
producing properly-sized *-final.mp4 files without touching the backup source.
Skips finals that already exist. Fixes drift caused by old pipeline sizing clips
to the wrong movement structure.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 18:17:20 +00:00
Claude a395f9baba Encoding: H.265 final montages, slow preset, sunrise retention
- sky-cam.conf: add ENCODE_PRESET=slow (applied to all encodes);
  split CRF_MONTAGE (intermediates, H.264) from CRF_MONTAGE_FINAL=22
  (archive montage, H.265); add SUNRISE_RETENTION_DAYS=10; improve
  CAPTURE_INTERVAL comment with storage/density table
- montage-mvt.sh: steps 1+2 use preset; step 3 final switches to
  libx265 + CRF_MONTAGE_FINAL + -tag:v hvc1 for broad compatibility
- 4-seasons.sh: both encode steps use ENCODE_PRESET
- daily_sunrise_video.sh: all encode steps use ENCODE_PRESET; rolling
  retention deletes sunrise videos older than SUNRISE_RETENTION_DAYS

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 17:27:57 +00:00
Outis b929589f80 Merge pull request #20 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
Fix MUSIC_DIR path quoting — space in '4 Seasons' broke conf sourcing
2026-04-20 12:42:45 -04:00
Claude ab06c1cc2b Fix MUSIC_DIR path quoting — space in '4 Seasons' broke conf sourcing
https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 16:40:55 +00:00
Outis 91d7774a4f Merge pull request #19 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
ClDemoe/seasonal sunrise montage nn268
2026-04-20 12:36:04 -04:00
Claude c4fb086f1d Fix bugs found in post-refactor audit
- verify-mvt.sh: remove dead first _info= line (used MVT_START before
  defined); fix JPEG size loop to accumulate bytes correctly and display
  human-readable total; show size in delete confirmation
- montage-mvt.sh: grep -c uses || echo 0 instead of || true to be
  unambiguous about the no-match value under set -e
- capture.sh, capture-watchdog.sh: require camera name arg, remove
  silent SUNRISE_CAM fallback
- migrate-seasons.sh: require --cam arg, error if missing
- README.md, sky-cam.conf: remove stale fullday-video.sh references;
  README pipeline diagram updated to show verify-mvt.sh

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 16:34:05 +00:00
Claude 8c752fc165 Require camera name explicitly across all seasons scripts
No script defaults to SUNRISE_CAM (east) for the seasons pipeline.
Every direction is treated equally — camera name is a required arg,
not an optional override.

- 4-seasons.sh: $1 required, exits with usage if missing
- montage-mvt.sh: arg order changed to <cam> [date]; $1 required
- year-end-join.sh: $2 (cam) required
- verify-mvt.sh: $4 (cam) required
- migrate-seasons.sh: example commands updated to new arg order
- README.md: montage-mvt.sh examples updated

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 16:28:15 +00:00
Outis 0d0d3e6f24 Merge pull request #18 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
ClDemoe/seasonal sunrise montage nn268
2026-04-20 12:19:00 -04:00
Claude 91006bf5f6 sky-cam.conf: clean up schedule comments, west camera placeholder
Remove stale SCHEDULE_FULLDAY comment block; add commented west camera
slot with instructions so enabling it is a one-line uncomment.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 15:59:12 +00:00
Claude b4019ade9d Add north/south cameras, remove fullday, add verify-mvt.sh
- sky-cam.conf: CAMERAS now includes east, north, south with staggered
  SCHEDULE_SEASONS times (01:00, 01:30, 02:00); fullday schedules and
  tuning removed
- install.sh: fullday service/timer generation removed entirely
- fullday-video.sh + systemd units: deleted
- montage-mvt.sh: post-build technical checks (duration drift, video/audio
  stream presence) added; notification now includes check results and the
  exact verify-mvt.sh command to run
- verify-mvt.sh: new interactive CLI for montage review — shows checks,
  plays video, deletes source JPEG folders on approval, or re-runs montage

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 15:56:12 +00:00
Claude 04809cfe90 migrate-seasons.sh: add --cam flag, include Summer in search
--cam NAME overrides SUNRISE_CAM so the script can be used for any
camera (e.g. north).  Summer is now included in the find targets so
any ASTRO_YEAR=2025 Summer clips (Summer 2026) are also migrated.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 15:05:15 +00:00
Outis bf9d67e5fd Merge pull request #17 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
Fix music file matching: Mvt3 was resolving to Mvt1 for every season
2026-04-20 10:35:57 -04:00
Claude 8ba0619ead Fix music file matching: Mvt3 was resolving to Mvt1 for every season
The old pattern *Mvt*3* matched .mp3 in every MP3 filename, so sort|head-1
always picked track 01 (Mvt1). Fix by finding all files for the season
then filtering with grep -iE "Mvt[^0-9]*N[^0-9]", which requires the
movement number to be surrounded by non-digit characters (space, dot,
underscore) and cannot match digits embedded in .mp3 or track prefixes.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 14:30:32 +00:00
Outis 82a0db4dd9 Merge pull request #16 from outis1one/clDemoe/seasonal-sunrise-montage-nn268
ClDemoe/seasonal sunrise montage nn268
2026-04-20 10:16:52 -04:00
Claude 331bce38c4 Simplify migrate-seasons.sh: migrate all clips, drop quarantine logic
All *-final.mp4 clips are valid footage regardless of what speed factor
the old script used — montage-mvt.sh re-adjusts the full concatenated
video to match music duration anyway, so per-clip speed is irrelevant.

Move every ASTRO_YEAR=2025 clip to the correct new movement directory
based on its date. Spring Mvt1 now gets all 30 clips (Mar 21–Apr 19).

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 14:16:13 +00:00
Claude 7affbc5c54 Revise migrate-seasons.sh: ASTRO_YEAR=2025 only, move not symlink, quarantine bad clips
- Filter to ASTRO_YEAR=2025 (Winter 2025-26 onward); skip Autumn 2025 and earlier
- Move files instead of creating symlinks
- Quarantine clips matching Day<N>of92 (Spring clips from broken script with
  wrong 92-day movement total) to quarantine-old-scripts/ for review + deletion
- Preserve clips with Dayof92 (no day number, old legacy format) — these are
  migrated normally since montage-mvt.sh re-adjusts speed regardless
- Summary shows delete commands for temp files and quarantine folder

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 14:13:12 +00:00
Claude 32b82c7b7d Add one-shot migration script for old-format seasons clips
migrate-seasons.sh uses season_info.py to re-classify every old
*-final.mp4 clip by its YYYY-MM-DD filename prefix, placing a symlink
in the correct new-system directory regardless of how the old system
labelled movements. Handles the boundary mismatches between old and
new movement splits automatically.

Coverage after migration (based on available clips):
  Spring 2026 Mvt1  30/31 days  (missing Day 1 only — excellent)
  Winter Mvt1       ~18/29 days
  Winter Mvt2       ~24/29 days
  Winter Mvt3       ~20/31 days
  Autumn Mvt1       ~24/30 days
  Autumn Mvt3       ~18/30 days
  Autumn Mvt2       absent — year-end join will not fire for 2024 cycle

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 14:01:01 +00:00
Outis f6c52e2133 Merge pull request #15 from outis1one/claude/seasonal-sunrise-montage-nn268
Add per-camera capture watchdog with stall and recovery notifications
2026-04-19 21:15:30 -04:00
Claude 3265ed80fd Add per-camera capture watchdog with stall and recovery notifications
capture-watchdog.sh: long-running script that checks the newest JPEG mtime
in each camera's output directory every CAPTURE_STALE_SECS/3 seconds (min 5s).
Sends a stall notification via notify.sh if no new frame has arrived within
CAPTURE_STALE_SECS. Sends a recovery notification once new frames resume.
Only alerts if the camera was previously working (avoids false positives on
first start or overnight before the first frame of the day).

sky-cam.conf: CAPTURE_STALE_SECS=30 added next to CAPTURE_INTERVAL with a
note that it should be at least 2x the interval.

install.sh: generates sky-cam-watchdog-<cam>.service for every camera that
has a RTSP URL configured. The watchdog service starts after and alongside
the capture service, restarts on failure, and is enabled/started with the
same loop as the capture service.

README.md: note about watchdog and journalctl command for its logs.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
2026-04-20 01:13:49 +00:00