root/sky-cam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14 from outis1one/claude/seasonal-sunrise-montage-nn268

Browse Source 
Claude/seasonal sunrise montage nn268
This commit is contained in:
Outis
2026-04-19 21:03:05 -04:00
committed by GitHub
parent ab211174b4 8b9ad74c58
commit a419320c67
9 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+12 -12
View File
@@ -42,7 +42,7 @@ cd /opt/sky-cam
### 3. Configure ### 3. Configure
```bash ```bash
$EDITOR sky-cam.conf nano sky-cam.conf
``` ```
`SCRIPT_DIR` and `BASE_DIR` are auto-detected — you only need to fill in settings specific to your setup: `SCRIPT_DIR` and `BASE_DIR` are auto-detected — you only need to fill in settings specific to your setup:
@@ -52,7 +52,7 @@ $EDITOR sky-cam.conf
| `BASE_DIR` | Root where camera images live — override if storing on a separate drive (`BASE_DIR/<cam>/<date>/<HH-MM-SS>.jpg`) | | `BASE_DIR` | Root where camera images live — override if storing on a separate drive (`BASE_DIR/<cam>/<date>/<HH-MM-SS>.jpg`) |
| `MOVIES_DIR` | Where finished videos are written (default: `BASE_DIR/movies`) | | `MOVIES_DIR` | Where finished videos are written (default: `BASE_DIR/movies`) |
| `MUSIC_DIR` | Directory containing the 12 Vivaldi Four Seasons MP3 files | | `MUSIC_DIR` | Directory containing the 12 Vivaldi Four Seasons MP3 files |
| `CAMERAS` | Space-separated list of camera names, e.g. `(sunrise north)` | | `CAMERAS` | Space-separated list of camera names, e.g. `(east north south west)` |
| `SUNRISE_CAM` | Which camera faces east and gets the sunrise job | | `SUNRISE_CAM` | Which camera faces east and gets the sunrise job |
| `LATITUDE` / `LONGITUDE` / `TIMEZONE` | Your location for sunrise calculation | | `LATITUDE` / `LONGITUDE` / `TIMEZONE` | Your location for sunrise calculation |
| `CAPTURE_INTERVAL` | Seconds between captured frames (default: 10) | | `CAPTURE_INTERVAL` | Seconds between captured frames (default: 10) |
@@ -72,7 +72,7 @@ $EDITOR .env
```bash ```bash
# RTSP stream URL — one per camera (variable name matches camera name) # RTSP stream URL — one per camera (variable name matches camera name)
CAM_RTSP_sunrise=rtsp://admin:password@192.168.1.100:554/stream1 CAM_RTSP_east=rtsp://admin:password@192.168.1.100:554/stream1
# Mattermost upload # Mattermost upload
mattermost_url=https://your-mattermost.example.com mattermost_url=https://your-mattermost.example.com
@@ -90,8 +90,8 @@ Re-run `./install.sh` any time `sky-cam.conf` changes (schedules, cameras, etc.)
```bash ```bash
# Confirm cameras are capturing # Confirm cameras are capturing
systemctl --user status sky-cam-capture-sunrise.service systemctl --user status sky-cam-capture-east.service
ls BASE_DIR/sunrise/$(date +%Y-%m-%d)/ # images should appear within CAPTURE_INTERVAL seconds ls BASE_DIR/east/$(date +%Y-%m-%d)/ # images should appear within CAPTURE_INTERVAL seconds
# Check all timers are scheduled # Check all timers are scheduled
systemctl --user list-timers 'sky-cam-*' systemctl --user list-timers 'sky-cam-*'
@@ -222,29 +222,29 @@ Attribution data for every file is written to `sunrise-sounds/manifest.json`.
**Re-run a daily seasons clip** for yesterday: **Re-run a daily seasons clip** for yesterday:
```bash ```bash
./4-seasons.sh sunrise ./4-seasons.sh east
``` ```
**Rebuild a movement montage** (e.g. to retry audio after a failure): **Rebuild a movement montage** (e.g. to retry audio after a failure):
```bash ```bash
./montage-mvt.sh # uses today's movement ./montage-mvt.sh # uses today's movement
./montage-mvt.sh 2025-06-15 sunrise # specific date + camera ./montage-mvt.sh 2025-06-15 east # specific date + camera
``` ```
**Rebuild the year-end video**: **Rebuild the year-end video**:
```bash ```bash
./year-end-join.sh 2025 sunrise ./year-end-join.sh 2025 east
``` ```
**Check capture status**: **Check capture status**:
```bash ```bash
systemctl --user status sky-cam-capture-sunrise.service systemctl --user status sky-cam-capture-east.service
journalctl --user -u sky-cam-capture-sunrise.service -f journalctl --user -u sky-cam-capture-east.service -f
``` ```
**Check logs**: **Check logs**:
```bash ```bash
journalctl --user -u sky-cam-sunrise.service journalctl --user -u sky-cam-sunrise.service
journalctl --user -u sky-cam-seasons-sunrise.service journalctl --user -u sky-cam-seasons-east.service
journalctl --user -u sky-cam-fullday-sunrise.service journalctl --user -u sky-cam-fullday-east.service
``` ```
bootstrap.sh
+2 -2
View File
@@ -28,11 +28,11 @@ echo " 2. Edit $TARGET/sky-cam.conf"
echo " — SCRIPT_DIR full path to the directory you'll run scripts from" echo " — SCRIPT_DIR full path to the directory you'll run scripts from"
echo " — BASE_DIR where your camera images live" echo " — BASE_DIR where your camera images live"
echo " — MUSIC_DIR path to your Vivaldi Four Seasons audio files" echo " — MUSIC_DIR path to your Vivaldi Four Seasons audio files"
echo " — CAMERAS list of camera names, e.g. (sunrise)" echo " — CAMERAS list of camera names, e.g. (east) or (east north south west)"
echo " — SUNRISE_CAM which camera faces east (gets the sunrise video job)" echo " — SUNRISE_CAM which camera faces east (gets the sunrise video job)"
echo " — LATITUDE / LONGITUDE / TIMEZONE your location" echo " — LATITUDE / LONGITUDE / TIMEZONE your location"
echo "" echo ""
echo " 3. cd $TARGET && ./install.sh" echo " 3. cd $TARGET && ./install.sh"
echo " This generates .env.example — copy it to .env and add credentials:" echo " This generates .env.example — copy it to .env and add credentials:"
echo " cp $TARGET/.env.example $TARGET/.env" echo " cp $TARGET/.env.example $TARGET/.env"
echo " \$EDITOR $TARGET/.env" echo " nano $TARGET/.env"
daily_sunrise_video.sh
+1 -1
View File
@@ -168,7 +168,7 @@ fade_out=$(echo "scale=1; $SUNRISE_TARGET_SECS - 0.5" | bc)
# ── Pick audio source ───────────────────────────────────────────────────────── # ── Pick audio source ─────────────────────────────────────────────────────────
audio_src="" audio_src=""
audio_offset="0" audio_offset="0" # cam audio is pre-centred on sunrise; library files are trimmed to fit
cam_audio="$image_dir/sunrise-audio.m4a" cam_audio="$image_dir/sunrise-audio.m4a"
if [ "${AUDIO_ENABLED:-false}" = "true" ]; then if [ "${AUDIO_ENABLED:-false}" = "true" ]; then
install.sh
+4 -3
View File
@@ -144,14 +144,15 @@ EOF
done done
# ── Sunrise audio capture ───────────────────────────────────────────────────── # ── Sunrise audio capture ─────────────────────────────────────────────────────
# Triggered at 03:00; waits internally until the right time before recording. # Uses the same schedule as the sunrise video — both start early and wait
# internally for the right moment, so they don't interfere.
if [ "${AUDIO_ENABLED:-false}" = "true" ]; then if [ "${AUDIO_ENABLED:-false}" = "true" ]; then
write_service "sky-cam-audio-capture" \ write_service "sky-cam-audio-capture" \
"$SUNRISE_CAM: sunrise audio capture" \ "$SUNRISE_CAM: sunrise audio capture" \
"sunrise-audio-capture.sh" "sunrise-audio-capture.sh"
write_timer "sky-cam-audio-capture" \ write_timer "sky-cam-audio-capture" \
"$SUNRISE_CAM: sunrise audio capture" \ "$SUNRISE_CAM: sunrise audio capture" \
"03:00:00" "$SCHEDULE_SUNRISE"
timers+=("sky-cam-audio-capture") timers+=("sky-cam-audio-capture")
fi fi
@@ -166,7 +167,7 @@ for cam in "${CAMERAS[@]}"; do
write_service "sky-cam-seasons-${cam}" \ write_service "sky-cam-seasons-${cam}" \
"${cam}: Four Seasons daily clip" \ "${cam}: Four Seasons daily clip" \
"4-seasons.sh ${cam}" \ "4-seasons.sh ${cam}" \
"After=network-online.target\nWants=network-online.target\n" $'After=network-online.target\nWants=network-online.target\n'
write_timer "sky-cam-seasons-${cam}" "${cam}: Four Seasons daily clip" \ write_timer "sky-cam-seasons-${cam}" "${cam}: Four Seasons daily clip" \
"${!sched_seasons_var}" "${!sched_seasons_var}"
timers+=("sky-cam-seasons-${cam}") timers+=("sky-cam-seasons-${cam}")
montage-mvt.sh
+1 -1
View File
@@ -24,7 +24,7 @@ export TIMEZONE # make it visible to season_info.py subprocess
# Args: [date] [camera-name] # Args: [date] [camera-name]
# Camera name: second argument overrides conf (passed through from 4-seasons.sh). # Camera name: second argument overrides conf (passed through from 4-seasons.sh).
CAM_NAME="${2:-$CAM_NAME}" CAM_NAME="${2:-$SUNRISE_CAM}"
# ── Configuration ────────────────────────────────────────────────────────────── # ── Configuration ──────────────────────────────────────────────────────────────
base_dir="$BASE_DIR" base_dir="$BASE_DIR"
notify.sh
+1 -1
View File
@@ -52,7 +52,7 @@ fi
# ── Mattermost text post ────────────────────────────────────────────────────── # ── Mattermost text post ──────────────────────────────────────────────────────
# mattermost_url and access_token come from sky-cam.conf (sourced above). # mattermost_url and access_token come from sky-cam.conf (sourced above).
if [ "$MM_NOTIFY_ENABLED" = "true" ] && [ -n "$MM_NOTIFY_CHANNEL_ID" ]; then if [ "$MM_NOTIFY_ENABLED" = "true" ] && [ -n "$MM_NOTIFY_CHANNEL_ID" ] && [ -n "${mattermost_url:-}" ] && [ -n "${access_token:-}" ]; then
curl -s \ curl -s \
-H "Authorization: Bearer $access_token" \ -H "Authorization: Bearer $access_token" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
sky-cam.conf
+9 -6
View File
@@ -180,8 +180,8 @@ TIMEZONE=America/New_York
# Each name becomes a subfolder under BASE_DIR (images) and BASE_DIR/movies. # Each name becomes a subfolder under BASE_DIR (images) and BASE_DIR/movies.
# To add a camera: add its name here, add its schedules below, re-run install.sh. # To add a camera: add its name here, add its schedules below, re-run install.sh.
# #
CAMERAS=(sunrise) # e.g. CAMERAS=(sunrise north west) CAMERAS=(east) # e.g. CAMERAS=(east north south west)
SUNRISE_CAM=sunrise # which camera faces east (gets the sunrise video job) SUNRISE_CAM=east # which camera faces east (gets the sunrise video job)
# ── Schedules ───────────────────────────────────────────────────────────────── # ── Schedules ─────────────────────────────────────────────────────────────────
# All times are HH:MM:SS (24-hour local time). # All times are HH:MM:SS (24-hour local time).
@@ -207,15 +207,18 @@ SUNRISE_CAM=sunrise # which camera faces east (gets the sunrise v
# #
SCHEDULE_SUNRISE=03:00:00 SCHEDULE_SUNRISE=03:00:00
SCHEDULE_SEASONS_sunrise=01:00:00 SCHEDULE_SEASONS_east=01:00:00
SCHEDULE_FULLDAY_sunrise=02:00:00 SCHEDULE_FULLDAY_east=02:00:00
# Uncomment and fill in for each camera you add to CAMERAS above: # Uncomment and fill in for each camera you add to CAMERAS above:
#SCHEDULE_SEASONS_north=01:30:00 #SCHEDULE_SEASONS_north=01:30:00
#SCHEDULE_FULLDAY_north=02:30:00 #SCHEDULE_FULLDAY_north=02:30:00
# #
#SCHEDULE_SEASONS_west=02:00:00 #SCHEDULE_SEASONS_south=02:00:00
#SCHEDULE_FULLDAY_west=03:00:00 #SCHEDULE_FULLDAY_south=03:00:00
#
#SCHEDULE_SEASONS_west=02:30:00
#SCHEDULE_FULLDAY_west=03:30:00
# ── Sunrise video tuning ────────────────────────────────────────────────────── # ── Sunrise video tuning ──────────────────────────────────────────────────────
# Capture window around sunrise: # Capture window around sunrise:
sunrise-audio-capture.sh
+1
View File
@@ -49,6 +49,7 @@ sunrise_sec=$(time_to_seconds "$sunrise_time_local")
half_pre=$(( SUNRISE_TARGET_SECS / 2 )) # floor — pre-sunrise portion half_pre=$(( SUNRISE_TARGET_SECS / 2 )) # floor — pre-sunrise portion
half_post=$(( SUNRISE_TARGET_SECS - half_pre )) # ceil — post-sunrise gets odd second half_post=$(( SUNRISE_TARGET_SECS - half_pre )) # ceil — post-sunrise gets odd second
record_start_sec=$(( sunrise_sec - half_pre )) record_start_sec=$(( sunrise_sec - half_pre ))
[ "$record_start_sec" -lt 0 ] && record_start_sec=0
record_dur_sec=$SUNRISE_TARGET_SECS record_dur_sec=$SUNRISE_TARGET_SECS
echo "Audio window: ${half_pre}s before → ${half_post}s after sunrise (${record_dur_sec}s total)" echo "Audio window: ${half_pre}s before → ${half_post}s after sunrise (${record_dur_sec}s total)"
year-end-join.sh
+1 -1
View File
@@ -21,7 +21,7 @@ if [ -z "$ASTRO_YEAR" ]; then
exit 1 exit 1
fi fi
# Camera name: second argument overrides conf (passed through from montage-mvt.sh). # Camera name: second argument overrides conf (passed through from montage-mvt.sh).
CAM_NAME="${2:-$CAM_NAME}" CAM_NAME="${2:-$SUNRISE_CAM}"
year_dir="$MOVIES_DIR/$CAM_NAME/$ASTRO_YEAR" year_dir="$MOVIES_DIR/$CAM_NAME/$ASTRO_YEAR"