From 6f3426c481f03f5beeed9171b3280f0070798844 Mon Sep 17 00:00:00 2001 From: Christopher Warner Date: Tue, 13 Oct 2026 15:07:53 -0400 Subject: feat: package portable Aerial screensaver for sharing Add install/uninstall scripts, XDG config, portable VAAPI detection, fetch-aerial-recent helper, and a LocalSend-ready zip without Apple video assets. Co-authored-by: Cursor --- bin/encode-aerial-lite | 130 ++++++++++++++++++++++++++++++++++++++++++++++++ bin/fetch-aerial-recent | 112 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 242 insertions(+) create mode 100755 bin/encode-aerial-lite create mode 100755 bin/fetch-aerial-recent (limited to 'bin') diff --git a/bin/encode-aerial-lite b/bin/encode-aerial-lite new file mode 100755 index 0000000..58976af --- /dev/null +++ b/bin/encode-aerial-lite @@ -0,0 +1,130 @@ +#!/usr/bin/env bash +# Downsample Aerial masters into ~/Videos/Screensavers/Aerial: +# 1920x1080, 24fps, 8-bit HEVC via VAAPI (~2 Mb/s). +# +# Usage: +# encode-aerial-lite /path/to/4k-sources +# SRC_DIR=/path/to/4k DST_DIR=~/Videos/Screensavers/Aerial encode-aerial-lite +set -euo pipefail + +SRC_DIR="${1:-${SRC_DIR:-}}" +DST_DIR="${DST_DIR:-$HOME/Videos/Screensavers/Aerial}" +CONFIG_FILE="${XDG_CONFIG_HOME:-$HOME/.config}/aerial-screensaver/config" +BITRATE="${BITRATE:-2M}" +MAXRATE="${MAXRATE:-2.5M}" + +detect_vaapi() { + if [[ -n "${VAAPI_DEVICE:-}" && -e "$VAAPI_DEVICE" ]]; then + printf '%s\n' "$VAAPI_DEVICE" + return 0 + fi + if [[ -f "$CONFIG_FILE" ]]; then + local from_cfg + from_cfg="$(awk -F= '/^VAAPI_DEVICE=/{print $2; exit}' "$CONFIG_FILE" | tr -d '"' || true)" + if [[ -n "$from_cfg" && -e "$from_cfg" ]]; then + printf '%s\n' "$from_cfg" + return 0 + fi + fi + local p + if [[ -d /dev/dri/by-path ]]; then + for p in /dev/dri/by-path/*-render; do + [[ -e "$p" ]] || continue + [[ "$(basename "$p")" == *usb* ]] && continue + printf '%s\n' "$p" + return 0 + done + fi + for p in /dev/dri/renderD*; do + [[ -e "$p" ]] || continue + printf '%s\n' "$p" + return 0 + done + return 1 +} + +if [[ -z "$SRC_DIR" ]]; then + echo "Usage: encode-aerial-lite /path/to/4k-source-folder" >&2 + echo "Encodes into: $DST_DIR" >&2 + exit 1 +fi + +VAAPI_DEVICE="$(detect_vaapi)" || { + echo "No VAAPI render node found. Set VAAPI_DEVICE=/dev/dri/renderD128" >&2 + exit 1 +} + +mkdir -p "$DST_DIR" +shopt -s nullglob nocaseglob + +encode_one() { + local src="$1" + local base dest tmp + base="$(basename "$src")" + base="${base%.*}" + dest="$DST_DIR/${base}.mp4" + + if [[ -f "$dest" ]]; then + echo "SKIP $base (exists)" + return 0 + fi + + echo "ENCODE $base" + tmp="$DST_DIR/.${base}.partial.mp4" + rm -f "$tmp" + + if ffmpeg -y -hide_banner -loglevel error -stats \ + -hwaccel vaapi -hwaccel_device "$VAAPI_DEVICE" -hwaccel_output_format vaapi \ + -i "$src" \ + -vf "fps=24,scale_vaapi=w=1920:h=1080:format=nv12" \ + -c:v hevc_vaapi -b:v "$BITRATE" -maxrate "$MAXRATE" -bufsize 4M \ + -an -movflags +faststart \ + "$tmp"; then + mv -f "$tmp" "$dest" + echo "OK $base ($(du -h "$dest" | cut -f1))" + else + echo "FAIL $base — retrying with software decode" >&2 + rm -f "$tmp" + if ffmpeg -y -hide_banner -loglevel error -stats \ + -vaapi_device "$VAAPI_DEVICE" \ + -i "$src" \ + -vf "fps=24,scale=1920:1080:flags=bicubic,format=nv12,hwupload" \ + -c:v hevc_vaapi -b:v "$BITRATE" -maxrate "$MAXRATE" -bufsize 4M \ + -an -movflags +faststart \ + "$tmp"; then + mv -f "$tmp" "$dest" + echo "OK $base (sw-decode, $(du -h "$dest" | cut -f1))" + else + rm -f "$tmp" + echo "FAIL $base" >&2 + return 1 + fi + fi +} + +shopt -u nocaseglob +mapfile -t files < <(find "$SRC_DIR" -maxdepth 1 -type f \( -iname '*.mov' -o -iname '*.mp4' -o -iname '*.mkv' \) | sort) +if [[ ${#files[@]} -eq 0 ]]; then + echo "No source videos in $SRC_DIR" >&2 + exit 1 +fi + +echo "Source: $SRC_DIR (${#files[@]} files)" +echo "Dest: $DST_DIR" +echo "Device: $VAAPI_DEVICE" +echo + +failures=0 +for f in "${files[@]}"; do + if ! encode_one "$f"; then + failures=$((failures + 1)) + fi +done + +rm -f "$DST_DIR/_test_lite.mp4" "$DST_DIR"/.*.partial.mp4 + +echo +echo "Done. Lite library:" +ls -lh "$DST_DIR" +du -sh "$DST_DIR" +exit "$failures" diff --git a/bin/fetch-aerial-recent b/bin/fetch-aerial-recent new file mode 100755 index 0000000..852bee8 --- /dev/null +++ b/bin/fetch-aerial-recent @@ -0,0 +1,112 @@ +#!/usr/bin/env bash +# Download the recent macOS Aerial pack (Tahoe / Sequoia / Sonoma / Cazadero) +# from Apple's public catalog, then optionally encode to lite 1080p24. +# +# Usage: +# fetch-aerial-recent # download masters only +# fetch-aerial-recent --encode # download + encode-aerial-lite +set -euo pipefail + +ENCODE=0 +for arg in "$@"; do + case "$arg" in + --encode) ENCODE=1 ;; + -h|--help) + echo "Usage: fetch-aerial-recent [--encode]" + exit 0 + ;; + esac +done + +MASTER_DIR="${AERIAL_MASTER_DIR:-$HOME/Videos/Screensavers/Aerial-masters}" +LITE_DIR="${DST_DIR:-$HOME/Videos/Screensavers/Aerial}" +CATALOG_DIR="${TMPDIR:-/tmp}/aerial-catalog-$$" +CONFIG_URL="https://configuration.apple.com/configurations/internetservices/aerials/resources-config-26-0.plist" +WANT_LABELS=( + "Tahoe Day" "Tahoe Morning" "Tahoe Evening" "Tahoe Night" + "Sequoia Sunrise" "Sequoia Morning" "Sequoia Night" + "Cazadero" + "Sonoma Evening" "Sonoma Clouds" "Sonoma from Above" "Sonoma River" +) + +need() { command -v "$1" >/dev/null 2>&1 || { echo "Missing dependency: $1" >&2; exit 1; }; } +need curl +need python3 +need aria2c +need tar + +mkdir -p "$MASTER_DIR" "$CATALOG_DIR" +trap 'rm -rf "$CATALOG_DIR"' EXIT + +echo "Resolving macOS Aerial catalog..." +RESOURCES_URL="$(curl -fsSL --max-time 30 "$CONFIG_URL" | python3 -c ' +import sys,re +text=sys.stdin.read() +m=re.search(r"resources-url\s*([^<]+)", text) +if not m: raise SystemExit("resources-url not found in plist") +print(m.group(1)) +')" + +echo "Catalog: $RESOURCES_URL" +curl -kfsSL --max-time 120 -o "$CATALOG_DIR/resources.tar" "$RESOURCES_URL" +tar -xf "$CATALOG_DIR/resources.tar" -C "$CATALOG_DIR" 2>/dev/null || true +ENTRIES_JSON="$(find "$CATALOG_DIR" -name entries.json -type f | head -n1)" +if [[ -z "$ENTRIES_JSON" ]]; then + echo "entries.json not found in catalog tar" >&2 + exit 1 +fi + +python3 - "$ENTRIES_JSON" "$CATALOG_DIR/urls.txt" <<'PY' +import json, os, sys +entries_path, urls_path = sys.argv[1], sys.argv[2] +want = { + "Tahoe Day", "Tahoe Morning", "Tahoe Evening", "Tahoe Night", + "Sequoia Sunrise", "Sequoia Morning", "Sequoia Night", + "Cazadero", + "Sonoma Evening", "Sonoma Clouds", "Sonoma from Above", "Sonoma River", +} +data = json.load(open(entries_path, encoding="utf-8")) +found = [] +with open(urls_path, "w", encoding="utf-8") as out: + for asset in data.get("assets", []): + label = asset.get("accessibilityLabel") or "" + if label not in want: + continue + url = asset.get("url-4K-SDR-240FPS") or asset.get("url-4K-SDR") + if not url: + continue + base = os.path.basename(url.split("?", 1)[0]) + out.write(f"{url}\n out={base}\n") + found.append((label, base)) +if len(found) != len(want): + missing = want - {l for l, _ in found} + print(f"warning: missing labels: {sorted(missing)}", file=sys.stderr) +print(f"Queued {len(found)} clips:") +for label, base in sorted(found): + print(f" {label}: {base}") +PY + +echo +echo "Downloading into $MASTER_DIR ..." +aria2c --check-certificate=false -c -x 4 -s 4 -j 3 \ + -i "$CATALOG_DIR/urls.txt" \ + -d "$MASTER_DIR" \ + --auto-file-renaming=false + +echo +echo "Masters ready: $(du -sh "$MASTER_DIR" | cut -f1)" + +if [[ "$ENCODE" -eq 1 ]]; then + SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + ENCODER="$SCRIPT_DIR/encode-aerial-lite" + if [[ ! -x "$ENCODER" ]]; then + ENCODER="$(command -v encode-aerial-lite || true)" + fi + if [[ -z "$ENCODER" ]]; then + echo "encode-aerial-lite not found; masters left in $MASTER_DIR" >&2 + exit 1 + fi + DST_DIR="$LITE_DIR" "$ENCODER" "$MASTER_DIR" +fi + +echo "Done." -- cgit v1.2.3