diff --git a/4-seasons.sh b/4-seasons.sh index ceb6c4e..b53df3b 100755 --- a/4-seasons.sh +++ b/4-seasons.sh @@ -62,7 +62,7 @@ fi echo "Images found: $total_images" # ── Prepare output directory ────────────────────────────────────────────────── -output_dir="$base_dir/movies/$CAM_NAME/$ASTRO_YEAR/$SEASON/Mvt$MVT_NUM" +output_dir="$MOVIES_DIR/$CAM_NAME/$ASTRO_YEAR/$SEASON/Mvt$MVT_NUM" mkdir -p "$output_dir" # ── Build sorted image list ─────────────────────────────────────────────────── diff --git a/daily_sunrise_video.sh b/daily_sunrise_video.sh index 04082bd..da5bf51 100644 --- a/daily_sunrise_video.sh +++ b/daily_sunrise_video.sh @@ -11,7 +11,7 @@ output_date=$(date +%Y-%m) image_dir="$BASE_DIR/$CAM_NAME/$current_date" # Set output directory -output_dir="$BASE_DIR/movies/$CAM_NAME/$output_date/sunrise-only" +output_dir="$MOVIES_DIR/$CAM_NAME/$output_date/sunrise-only" # Make sure the output directory exists mkdir -p "$output_dir" diff --git a/fullday-video.sh b/fullday-video.sh index c5418f0..a627b5e 100755 --- a/fullday-video.sh +++ b/fullday-video.sh @@ -20,7 +20,7 @@ base_dir="$BASE_DIR" # ── Date / paths ────────────────────────────────────────────────────────────── yesterday=$(date --date="yesterday" +%Y-%m-%d) image_dir="$base_dir/$CAM_NAME/$yesterday" -output_dir="$base_dir/movies/$CAM_NAME/fullday" +output_dir="$MOVIES_DIR/$CAM_NAME/fullday" mkdir -p "$output_dir" # ── Purge old full-day videos ───────────────────────────────────────────────── diff --git a/montage-mvt.sh b/montage-mvt.sh index 0b9001c..dfcd52a 100755 --- a/montage-mvt.sh +++ b/montage-mvt.sh @@ -43,7 +43,7 @@ eval "$(python3 "$SCRIPT_DIR/season_info.py" ${DATE_ARG:+"$DATE_ARG"})" echo "Season=$SEASON Mvt=$MVT_NUM Year=$ASTRO_YEAR (ref: ${DATE_ARG:-today})" # ── Locate files ────────────────────────────────────────────────────────────── -video_dir="$base_dir/movies/$CAM_NAME/$ASTRO_YEAR/$SEASON/Mvt$MVT_NUM" +video_dir="$MOVIES_DIR/$CAM_NAME/$ASTRO_YEAR/$SEASON/Mvt$MVT_NUM" output_dir="$video_dir/montage" mkdir -p "$output_dir" diff --git a/sky-cam.conf b/sky-cam.conf index c386dd6..2046e92 100644 --- a/sky-cam.conf +++ b/sky-cam.conf @@ -152,6 +152,7 @@ SCRIPT_DIR=/home/motion/drives/local-2tb/sunrise-scripts # ── Storage ─────────────────────────────────────────────────────────────────── BASE_DIR=/home/motion/drives/local-2tb +MOVIES_DIR=$BASE_DIR/movies # override if videos live on a different drive MUSIC_DIR=/home/motion/drives/local-2tb/music/4 Seasons # ── Location & timezone ─────────────────────────────────────────────────────── diff --git a/sunrise2mm.py b/sunrise2mm.py index 6b3c0d0..d4cafe2 100644 --- a/sunrise2mm.py +++ b/sunrise2mm.py @@ -45,7 +45,7 @@ today_date_str = today.strftime("%Y-%m-%d") # e.g., "2024-11-05" today_month_str = today.strftime("%Y-%m") # e.g., "2024-11" # Set the full folder path for today's video -base_video_folder = os.path.join(config.get('BASE_DIR', ''), 'movies', config.get('CAM_NAME', 'sunrise')) +base_video_folder = os.path.join(config.get('MOVIES_DIR', ''), config.get('CAM_NAME', 'sunrise')) output_dir = os.path.join(base_video_folder, today_month_str, "sunrise-only") # Check if the directory exists diff --git a/year-end-join.sh b/year-end-join.sh index 4fda07a..4da4746 100755 --- a/year-end-join.sh +++ b/year-end-join.sh @@ -8,7 +8,7 @@ # 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/$CAM_NAME/$ASTRO_YEAR/$CAM_NAME-$ASTRO_YEAR.mp4 +# Output: $MOVIES_DIR/$CAM_NAME/$ASTRO_YEAR/$CAM_NAME-$ASTRO_YEAR.mp4 set -euo pipefail @@ -23,7 +23,7 @@ fi # Camera name: second argument overrides conf (passed through from montage-mvt.sh). CAM_NAME="${2:-$CAM_NAME}" -year_dir="$BASE_DIR/movies/$CAM_NAME/$ASTRO_YEAR" +year_dir="$MOVIES_DIR/$CAM_NAME/$ASTRO_YEAR" echo "Assembling Four Seasons $ASTRO_YEAR from $year_dir ..."