From 2c8f190bf1e1981813cb04b75b80d46fa79263f5 Mon Sep 17 00:00:00 2001 From: Christopher Warner Date: Tue, 13 Oct 2026 15:12:17 -0400 Subject: feat: ship video install path for ThinkPad/Intel users Add install-aerial-videos, LocalSend lite video pack builder, Intel VAAPI preference, and software x265/x264 encode fallbacks so a T480 can install clips via zip or Apple fetch without AMD-specific assumptions. Co-authored-by: Cursor --- .gitignore | 1 + README.md | 118 +++++++++++++++++++++-------------------- aerial_screensaver.py | 26 ++++----- bin/encode-aerial-lite | 132 ++++++++++++++++++++-------------------------- bin/fetch-aerial-recent | 3 ++ bin/install-aerial-videos | 94 +++++++++++++++++++++++++++++++++ install.sh | 131 ++++++++++++++++++++++++++------------------- lib/detect-vaapi.sh | 61 +++++++++++++++++++++ pack-for-share.sh | 47 +++++++++++++++++ test_screensaver.py | 5 ++ uninstall.sh | 5 +- 11 files changed, 421 insertions(+), 202 deletions(-) create mode 100755 bin/install-aerial-videos create mode 100644 lib/detect-vaapi.sh create mode 100755 pack-for-share.sh diff --git a/.gitignore b/.gitignore index 28695a1..b5fe76e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,6 @@ __pycache__/ *.mkv /dist/ /*.zip +!pack-for-share.sh .env *.log diff --git a/README.md b/README.md index ecc39ee..a17ac27 100644 --- a/README.md +++ b/README.md @@ -1,114 +1,116 @@ # Aerial Screensaver for Linux (GNOME) -Idle screensaver that plays Apple Aerial–style clips with **mpv**, on **every connected monitor**. Designed to be quiet on battery and dual-GPU laptops: AC-only by default, lid-aware, VAAPI decode, low CPU niceness. +Idle screensaver that plays Apple Aerial–style clips with **mpv**, on **every connected monitor**. Quiet defaults: AC-only, lid-aware, VAAPI decode, low CPU niceness. -> This package is the **player + tooling**. Apple’s video assets are not redistributed here — download them yourself (helper included). +Works on AMD (Framework) and **Intel** laptops (e.g. **ThinkPad T480** / UHD 620). -## Features - -- Starts after idle (default 5 minutes) via GNOME Mutter IdleMonitor -- Fullscreen **one mpv per logical monitor** -- AC-only (optional) and skips / stops when the laptop lid is closed -- VAAPI HEVC playback; lite encoder for 1080p24 library files -- systemd user service +> Player + tooling are MIT. Apple’s video assets stay Apple’s — install them with the helpers or the optional LocalSend video pack. ## Requirements | Package | Why | |---|---| | GNOME (Wayland) | IdleMonitor + DisplayConfig | -| `python3` + PyGObject (`python3-gobject` / `python3-gi`) | Daemon | +| `python3` + PyGObject | Daemon | | `mpv` | Playback | -| `ffmpeg` (VAAPI HEVC) | Optional encode | -| `aria2c`, `curl`, `jq`/`python3` | Optional fetch helper | +| `ffmpeg` | Optional encode | +| `aria2c`, `curl`, `unzip` | Optional fetch / video zip | | `systemd --user` | Autostart | -Fedora / CachyOS example: +### Fedora / CachyOS (ThinkPad T480) ```bash -sudo dnf install mpv ffmpeg python3-gobject aria2 curl +sudo dnf install mpv ffmpeg python3-gobject aria2 curl unzip \ + intel-media-driver libva libva-utils ``` -## Quick install +### Debian / Ubuntu ```bash -git clone https://git.kernelcode.com/aerial-screensaver-linux -# or unzip the LocalSend archive, then: -cd aerial-screensaver-linux -./install.sh +sudo apt install mpv ffmpeg python3-gi aria2 curl unzip \ + intel-media-va-driver-non-free ``` -`install.sh` installs: +Verify VAAPI: `vainfo` (should list Intel entrypoints). -- `~/.local/bin/aerial-screensaver` -- `~/.local/bin/encode-aerial-lite` -- `~/.local/bin/fetch-aerial-recent` -- `~/.config/systemd/user/aerial-screensaver.service` -- `~/.config/aerial-screensaver/config` - -Enable is done for you. Check: +## Install ```bash -systemctl --user status aerial-screensaver +unzip aerial-screensaver-linux.zip +cd aerial-screensaver-linux +./install.sh ``` -## Get videos +### Get the videos (pick one) -### Option A — fetch recent Apple pack (recommended) - -Tahoe / Sequoia / Sonoma / Cazadero from Apple’s public macOS catalog: +**A. LocalSend video pack (best for T480)** — no multi-GB Apple download / long encode: ```bash -fetch-aerial-recent --encode +./install.sh --videos-zip ~/Downloads/aerial-videos-lite.zip +# or later: +install-aerial-videos --from-zip ~/Downloads/aerial-videos-lite.zip ``` -Downloads masters, then encodes lite 1080p24 clips into `~/Videos/Screensavers/Aerial`. - -### Option B — your own files +**B. Download from Apple + encode on this machine** (slower on T480): ```bash -mkdir -p ~/Videos/Screensavers/Aerial -# copy .mp4 / .mov / .mkv there +./install.sh --fetch-videos +# or later: +install-aerial-videos ``` -### Option C — encode masters you already have +**C. Your own files** — drop `.mp4` / `.mov` / `.mkv` in: -```bash -encode-aerial-lite /path/to/4k-masters +```text +~/Videos/Screensavers/Aerial ``` +## What gets installed + +| Path | Role | +|---|---| +| `~/.local/bin/aerial-screensaver` | Idle daemon | +| `~/.local/bin/install-aerial-videos` | Install / fetch clips | +| `~/.local/bin/fetch-aerial-recent` | Download Apple recent pack | +| `~/.local/bin/encode-aerial-lite` | 1080p24 lite encoder | +| `~/.config/systemd/user/aerial-screensaver.service` | Autostart | +| `~/.config/aerial-screensaver/config` | Settings | +| `~/Videos/Screensavers/Aerial` | Clip library | + ## Config -Edit `~/.config/aerial-screensaver/config`: +`~/.config/aerial-screensaver/config`: ```ini VIDEO_DIR=/home/YOU/Videos/Screensavers/Aerial IDLE_TIMEOUT_SECONDS=300 REQUIRE_AC=1 -VAAPI_DEVICE=/dev/dri/by-path/pci-XXXX:XX:XX.X-render +VAAPI_DEVICE=/dev/dri/renderD128 ``` -On dual-GPU machines, set `VAAPI_DEVICE` to the **iGPU** render node so the discrete GPU stays asleep. `install.sh` writes a detected default; override if needed. +On hybrid GPUs, leave `VAAPI_DEVICE` on the **iGPU** (Intel on T480, AMD display-class on Framework). `install.sh` auto-detects. -Environment overrides (prefix `AERIAL_`): `AERIAL_VIDEO_DIR`, `AERIAL_IDLE_TIMEOUT_SECONDS`, `AERIAL_VAAPI_DEVICE`, `AERIAL_REQUIRE_AC`. +## Sharing (LocalSend) -## Uninstall +Send **two** files: -```bash -./uninstall.sh -``` +| File | Size | Contents | +|---|---|---| +| `aerial-screensaver-linux.zip` | ~15KB | Code + installer | +| `aerial-videos-lite.zip` | ~1GB | 12 ready-to-play 1080p clips | -Videos and `~/.config/aerial-screensaver/` are left in place. +Recipient: -## Sharing +```bash +unzip aerial-screensaver-linux.zip && cd aerial-screensaver-linux +./install.sh --videos-zip ~/Downloads/aerial-videos-lite.zip +``` -| Method | What to send | -|---|---| -| **Git** | This repo (no videos) | -| **LocalSend** | `aerial-screensaver-linux.zip` from `dist/` (no videos) | -| **LocalSend + clips** | Also send `~/Videos/Screensavers/Aerial` separately (~1GB lite) | +## Uninstall -Do not commit or publish Apple’s `.mov` masters — fetch them per machine. +```bash +./uninstall.sh +``` ## Tests @@ -118,4 +120,4 @@ python3 test_screensaver.py -v ## License -MIT (this software only). Aerial video content remains Apple’s. +MIT for this software. Aerial footage remains Apple’s; we only provide download/install helpers and an optional private LocalSend pack of already-encoded lite clips. diff --git a/aerial_screensaver.py b/aerial_screensaver.py index 4bc27c7..12727c9 100755 --- a/aerial_screensaver.py +++ b/aerial_screensaver.py @@ -42,20 +42,19 @@ def _load_config() -> dict[str, str]: return cfg -def _pci_class_for_render(render: Path) -> str | None: - """Return PCI class hex for a render node, e.g. '0x038000'.""" +def _pci_attrs_for_render(render: Path) -> tuple[str, str]: + """Return (pci_class, vendor) hex strings for a render node.""" try: device = Path("/sys/class/drm") / render.name / "device" - class_file = device / "class" - if class_file.is_file(): - return class_file.read_text(encoding="utf-8").strip() + cls = (device / "class").read_text(encoding="utf-8").strip() if (device / "class").is_file() else "" + vendor = (device / "vendor").read_text(encoding="utf-8").strip() if (device / "vendor").is_file() else "" + return cls, vendor except OSError: - return None - return None + return "", "" def find_vaapi_device(preferred: str | None = None) -> str | None: - """Pick a DRM render node for VAAPI. Prefer iGPU when hybrid AMD/Intel.""" + """Pick a DRM render node for VAAPI. Prefer iGPU (Intel / AMD display).""" if preferred and Path(preferred).exists(): return preferred @@ -71,13 +70,16 @@ def find_vaapi_device(preferred: str | None = None) -> str | None: if not renders: return None - # Prefer PCI Display controller (0x038000) over VGA (0x030000) — iGPU on - # AMD Framework / Strix hybrids. Fall back to first non-USB node. + # Lower score wins: Intel (T480) / AMD display-class, then other, then dGPU/NVIDIA. scored: list[tuple[int, str]] = [] for node in renders: - cls = _pci_class_for_render(node) or "" - if cls.startswith("0x038"): + cls, vendor = _pci_attrs_for_render(node) + if vendor == "0x8086": + score = 0 + elif cls.startswith("0x038"): score = 0 + elif vendor == "0x10de": + score = 3 elif cls.startswith("0x030"): score = 2 else: diff --git a/bin/encode-aerial-lite b/bin/encode-aerial-lite index 5592568..56621e0 100755 --- a/bin/encode-aerial-lite +++ b/bin/encode-aerial-lite @@ -1,77 +1,29 @@ #!/usr/bin/env bash # Downsample Aerial masters into ~/Videos/Screensavers/Aerial: -# 1920x1080, 24fps, 8-bit HEVC via VAAPI (~2 Mb/s). +# 1920x1080, 24fps. Tries VAAPI HEVC, then software x265, then x264. # # Usage: # encode-aerial-lite /path/to/4k-sources # SRC_DIR=/path/to/4k DST_DIR=~/Videos/Screensavers/Aerial encode-aerial-lite set -euo pipefail +ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +# shellcheck source=../lib/detect-vaapi.sh +source "$ROOT/lib/detect-vaapi.sh" + 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 -' "$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 -' "$from_cfg" - return 0 - fi - fi - # Prefer AMD/Intel iGPU (PCI class 0x038000 Display) over dGPU VGA (0x030000). - local best="" best_score=99 p real cls score - if [[ -d /dev/dri/by-path ]]; then - for p in /dev/dri/by-path/*-render; do - [[ -e "$p" ]] || continue - [[ "$(basename "$p")" == *usb* ]] && continue - real="$(readlink -f "$p")" - cls="$(cat "/sys/class/drm/$(basename "$real")/device/class" 2>/dev/null || true)" - score=1 - [[ "$cls" == 0x038* ]] && score=0 - [[ "$cls" == 0x030* ]] && score=2 - if [[ "$score" -lt "$best_score" ]]; then - best="$p" - best_score="$score" - fi - done - fi - if [[ -n "$best" ]]; then - printf '%s -' "$best" - return 0 - fi - for p in /dev/dri/renderD*; do - [[ -e "$p" ]] || continue - printf '%s -' "$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 -} - +VAAPI_DEVICE="$(detect_vaapi || true)" mkdir -p "$DST_DIR" -shopt -s nullglob nocaseglob encode_one() { local src="$1" @@ -89,7 +41,8 @@ encode_one() { tmp="$DST_DIR/.${base}.partial.mp4" rm -f "$tmp" - if ffmpeg -y -hide_banner -loglevel error -stats \ + # 1) Full VAAPI path (AMD / Intel media-driver) + if [[ -n "${VAAPI_DEVICE:-}" ]] && 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" \ @@ -97,28 +50,55 @@ encode_one() { -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 + echo "OK $base (hevc_vaapi, $(du -h "$dest" | cut -f1))" + return 0 + fi + rm -f "$tmp" + + # 2) Software decode + VAAPI encode + if [[ -n "${VAAPI_DEVICE:-}" ]] && 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 (hevc_vaapi/sw-decode, $(du -h "$dest" | cut -f1))" + return 0 + fi + rm -f "$tmp" + + # 3) Software x265 (good for ThinkPad when VAAPI encode is missing) + if ffmpeg -y -hide_banner -loglevel error -stats \ + -i "$src" \ + -vf "fps=24,scale=1920:1080:flags=bicubic" \ + -c:v libx265 -pix_fmt yuv420p -b:v "$BITRATE" -maxrate "$MAXRATE" -bufsize 4M \ + -tag:v hvc1 -an -movflags +faststart \ + "$tmp" 2>/dev/null; then + mv -f "$tmp" "$dest" + echo "OK $base (libx265, $(du -h "$dest" | cut -f1))" + return 0 + fi + rm -f "$tmp" + + # 4) Software x264 — universally decodable on Intel UHD 620 + if ffmpeg -y -hide_banner -loglevel error -stats \ + -i "$src" \ + -vf "fps=24,scale=1920:1080:flags=bicubic" \ + -c:v libx264 -pix_fmt yuv420p -preset medium -b:v "$BITRATE" -maxrate "$MAXRATE" -bufsize 4M \ + -an -movflags +faststart \ + "$tmp"; then + mv -f "$tmp" "$dest" + echo "OK $base (libx264, $(du -h "$dest" | cut -f1))" + return 0 fi + + rm -f "$tmp" + echo "FAIL $base" >&2 + return 1 } -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 @@ -127,7 +107,7 @@ fi echo "Source: $SRC_DIR (${#files[@]} files)" echo "Dest: $DST_DIR" -echo "Device: $VAAPI_DEVICE" +echo "Device: ${VAAPI_DEVICE:-none (software encode fallbacks enabled)}" echo failures=0 @@ -137,7 +117,7 @@ for f in "${files[@]}"; do fi done -rm -f "$DST_DIR/_test_lite.mp4" "$DST_DIR"/.*.partial.mp4 +rm -f "$DST_DIR/_test_lite.mp4" "$DST_DIR"/.*.partial.mp4 2>/dev/null || true echo echo "Done. Lite library:" diff --git a/bin/fetch-aerial-recent b/bin/fetch-aerial-recent index 852bee8..23f4a57 100755 --- a/bin/fetch-aerial-recent +++ b/bin/fetch-aerial-recent @@ -5,6 +5,9 @@ # Usage: # fetch-aerial-recent # download masters only # fetch-aerial-recent --encode # download + encode-aerial-lite +# +# Note: recent Tahoe/Sequoia/Sonoma clips are 4K@240. On a ThinkPad T480, +# prefer install-aerial-videos --from-zip aerial-videos-lite.zip instead. set -euo pipefail ENCODE=0 diff --git a/bin/install-aerial-videos b/bin/install-aerial-videos new file mode 100755 index 0000000..5e6b313 --- /dev/null +++ b/bin/install-aerial-videos @@ -0,0 +1,94 @@ +#!/usr/bin/env bash +# Install Aerial lite clips into ~/Videos/Screensavers/Aerial. +# +# Modes: +# install-aerial-videos # download from Apple + encode +# install-aerial-videos --from-zip FILE.zip # unpack a LocalSend video pack +# install-aerial-videos --from-dir DIR # copy already-lite .mp4 files +set -euo pipefail + +ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +VIDEO_DIR="${VIDEO_DIR:-$HOME/Videos/Screensavers/Aerial}" +MODE="fetch" +FROM="" + +usage() { + cat <&2 + usage >&2 + exit 1 + ;; + esac +done + +mkdir -p "$VIDEO_DIR" + +case "$MODE" in + zip) + [[ -n "$FROM" && -f "$FROM" ]] || { echo "ZIP not found: $FROM" >&2; exit 1; } + echo "Installing videos from $FROM -> $VIDEO_DIR" + # Accept either flat mp4s or a single top-level folder of mp4s + tmp="$(mktemp -d)" + trap 'rm -rf "$tmp"' EXIT + unzip -q -o "$FROM" -d "$tmp" + mapfile -t files < <(find "$tmp" -type f \( -iname '*.mp4' -o -iname '*.mov' -o -iname '*.mkv' \) | sort) + if [[ ${#files[@]} -eq 0 ]]; then + echo "No videos inside zip" >&2 + exit 1 + fi + for f in "${files[@]}"; do + install -m 0644 "$f" "$VIDEO_DIR/$(basename "$f")" + done + echo "Installed ${#files[@]} clips ($(du -sh "$VIDEO_DIR" | cut -f1))" + ;; + dir) + [[ -n "$FROM" && -d "$FROM" ]] || { echo "DIR not found: $FROM" >&2; exit 1; } + echo "Copying videos from $FROM -> $VIDEO_DIR" + count=0 + while IFS= read -r -d '' f; do + install -m 0644 "$f" "$VIDEO_DIR/$(basename "$f")" + count=$((count + 1)) + done < <(find "$FROM" -maxdepth 1 -type f \( -iname '*.mp4' -o -iname '*.mov' -o -iname '*.mkv' \) -print0 | sort -z) + echo "Installed $count clips ($(du -sh "$VIDEO_DIR" | cut -f1))" + ;; + fetch) + need() { command -v "$1" >/dev/null 2>&1 || { echo "Missing dependency: $1" >&2; exit 1; }; } + need curl + need aria2c + need ffmpeg + FETCH="$ROOT/bin/fetch-aerial-recent" + [[ -x "$FETCH" ]] || FETCH="$(command -v fetch-aerial-recent)" + echo "Fetching + encoding recent Apple Aerial pack (needs network)..." + echo "On a ThinkPad T480 this can take a while; prefer --from-zip if you have the video pack." + DST_DIR="$VIDEO_DIR" "$FETCH" --encode + ;; +esac + +echo "Video dir: $VIDEO_DIR" +ls -lh "$VIDEO_DIR" diff --git a/install.sh b/install.sh index 85dc8df..35f4fa4 100755 --- a/install.sh +++ b/install.sh @@ -1,13 +1,46 @@ #!/usr/bin/env bash # Install Aerial screensaver user service + helpers. +# +# ./install.sh +# ./install.sh --fetch-videos +# ./install.sh --videos-zip /path/to/aerial-videos-lite.zip set -euo pipefail ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +# shellcheck source=lib/detect-vaapi.sh +source "$ROOT/lib/detect-vaapi.sh" + BIN_DIR="${XDG_BIN_HOME:-$HOME/.local/bin}" UNIT_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/systemd/user" CFG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/aerial-screensaver" +SHARE="$HOME/.local/share/aerial-screensaver" VIDEO_DIR="${VIDEO_DIR:-$HOME/Videos/Screensavers/Aerial}" +FETCH_VIDEOS=0 +VIDEOS_ZIP="" + +usage() { + cat <&2; exit 1; } + shift 2 + ;; + -h|--help) usage; exit 0 ;; + *) echo "Unknown option: $1" >&2; usage >&2; exit 1 ;; + esac +done + need() { if ! command -v "$1" >/dev/null 2>&1; then echo "Missing dependency: $1" >&2 @@ -19,71 +52,49 @@ MISSING=0 need python3 need mpv need systemctl -# PyGObject (gi) is required if ! python3 -c 'from gi.repository import Gio, GLib' 2>/dev/null; then echo "Missing dependency: PyGObject (python3-gobject / python3-gi)" >&2 MISSING=1 fi +if [[ "$FETCH_VIDEOS" -eq 1 ]]; then + need curl + need aria2c + need ffmpeg +fi +if [[ -n "$VIDEOS_ZIP" ]]; then + need unzip +fi if [[ "$MISSING" -ne 0 ]]; then - echo "Install the packages above, then re-run ./install.sh" >&2 + cat >&2 </dev/null || true)" - score=1 - [[ "$cls" == 0x038* ]] && score=0 - [[ "$cls" == 0x030* ]] && score=2 - if [[ "$score" -lt "$best_score" ]]; then - best="$p" - best_score="$score" - fi - done - fi - if [[ -n "$best" ]]; then - printf '%s -' "$best" - return 0 - fi - for p in /dev/dri/renderD*; do - [[ -e "$p" ]] || continue - printf '%s -' "$p" - return 0 - done - return 1 -} - VAAPI="$(detect_vaapi || true)" -mkdir -p "$BIN_DIR" "$UNIT_DIR" "$CFG_DIR" "$VIDEO_DIR" +mkdir -p "$BIN_DIR" "$UNIT_DIR" "$CFG_DIR" "$VIDEO_DIR" "$SHARE/bin" "$SHARE/lib" -install -m 0755 "$ROOT/aerial_screensaver.py" "$BIN_DIR/aerial-screensaver" -install -m 0755 "$ROOT/bin/encode-aerial-lite" "$BIN_DIR/encode-aerial-lite" -install -m 0755 "$ROOT/bin/fetch-aerial-recent" "$BIN_DIR/fetch-aerial-recent" +install -m 0755 "$ROOT/aerial_screensaver.py" "$SHARE/aerial_screensaver.py" +install -m 0755 "$ROOT/bin/encode-aerial-lite" "$SHARE/bin/encode-aerial-lite" +install -m 0755 "$ROOT/bin/fetch-aerial-recent" "$SHARE/bin/fetch-aerial-recent" +install -m 0755 "$ROOT/bin/install-aerial-videos" "$SHARE/bin/install-aerial-videos" +install -m 0644 "$ROOT/lib/detect-vaapi.sh" "$SHARE/lib/detect-vaapi.sh" install -m 0644 "$ROOT/aerial-screensaver.service" "$UNIT_DIR/aerial-screensaver.service" +ln -sfn "$SHARE/aerial_screensaver.py" "$BIN_DIR/aerial-screensaver" +ln -sfn "$SHARE/bin/encode-aerial-lite" "$BIN_DIR/encode-aerial-lite" +ln -sfn "$SHARE/bin/fetch-aerial-recent" "$BIN_DIR/fetch-aerial-recent" +ln -sfn "$SHARE/bin/install-aerial-videos" "$BIN_DIR/install-aerial-videos" + if [[ ! -f "$CFG_DIR/config" ]]; then cat > "$CFG_DIR/config" </dev/null | head -1)" ]]; then + echo + echo "No clips in $VIDEO_DIR yet. Either:" + echo " install-aerial-videos --from-zip ~/Downloads/aerial-videos-lite.zip" + echo " install-aerial-videos # download from Apple (slow on T480)" +fi diff --git a/lib/detect-vaapi.sh b/lib/detect-vaapi.sh new file mode 100644 index 0000000..d5e9afb --- /dev/null +++ b/lib/detect-vaapi.sh @@ -0,0 +1,61 @@ +# shellcheck shell=bash +# Shared VAAPI render-node detection. Prefer iGPU over dGPU. +# shellcheck disable=SC2034 +detect_vaapi() { + if [[ -n "${VAAPI_DEVICE:-}" && -e "$VAAPI_DEVICE" ]]; then + printf '%s\n' "$VAAPI_DEVICE" + return 0 + fi + local cfg="${CONFIG_FILE:-${XDG_CONFIG_HOME:-$HOME/.config}/aerial-screensaver/config}" + if [[ -f "$cfg" ]]; then + local from_cfg + from_cfg="$(awk -F= '/^VAAPI_DEVICE=/{print $2; exit}' "$cfg" | tr -d '"' || true)" + if [[ -n "$from_cfg" && -e "$from_cfg" ]]; then + printf '%s\n' "$from_cfg" + return 0 + fi + fi + + # Score: lower is better. + # 0 = Intel / AMD Display-class iGPU + # 1 = other non-USB render + # 2 = discrete VGA-class (often AMD/NVIDIA dGPU) + local best="" best_score=99 p real name cls vendor score + if [[ -d /dev/dri/by-path ]]; then + for p in /dev/dri/by-path/*-render; do + [[ -e "$p" ]] || continue + name="$(basename "$p")" + [[ "$name" == *usb* ]] && continue + real="$(readlink -f "$p")" + cls="$(cat "/sys/class/drm/$(basename "$real")/device/class" 2>/dev/null || true)" + vendor="$(cat "/sys/class/drm/$(basename "$real")/device/vendor" 2>/dev/null || true)" + score=1 + # Intel iGPU (ThinkPad T480 etc.) or AMD Strix display-class + if [[ "$vendor" == "0x8086" ]]; then + score=0 + elif [[ "$cls" == 0x038* ]]; then + score=0 + elif [[ "$cls" == 0x030* ]]; then + score=2 + fi + # NVIDIA proprietary nodes are usually a poor screensaver choice + if [[ "$vendor" == "0x10de" ]]; then + score=3 + fi + if [[ "$score" -lt "$best_score" ]]; then + best="$p" + best_score="$score" + fi + done + fi + if [[ -n "$best" ]]; then + printf '%s\n' "$best" + return 0 + fi + for p in /dev/dri/renderD*; do + [[ -e "$p" ]] || continue + printf '%s\n' "$p" + return 0 + done + return 1 +} diff --git a/pack-for-share.sh b/pack-for-share.sh new file mode 100755 index 0000000..f5b380c --- /dev/null +++ b/pack-for-share.sh @@ -0,0 +1,47 @@ +#!/usr/bin/env bash +# Build LocalSend artifacts in dist/ and ~/Downloads/ +set -euo pipefail + +ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +DIST="$ROOT/dist" +DOWNLOADS="${DOWNLOADS:-$HOME/Downloads}" +VIDEO_DIR="${VIDEO_DIR:-$HOME/Videos/Screensavers/Aerial}" +CODE_ZIP="$DIST/aerial-screensaver-linux.zip" +VIDEO_ZIP="$DIST/aerial-videos-lite.zip" + +mkdir -p "$DIST" "$DOWNLOADS" + +echo "Building code zip..." +rm -f "$CODE_ZIP" +( + cd "$(dirname "$ROOT")" + zip -r "$CODE_ZIP" "$(basename "$ROOT")" \ + -x "$(basename "$ROOT")/.git/*" \ + -x "$(basename "$ROOT")/__pycache__/*" \ + -x "$(basename "$ROOT")/dist/*" \ + -x "$(basename "$ROOT")/*.log" +) + +echo "Building videos zip from $VIDEO_DIR ..." +mapfile -t clips < <(find "$VIDEO_DIR" -maxdepth 1 -type f -name '*.mp4' | sort) +if [[ ${#clips[@]} -eq 0 ]]; then + echo "No .mp4 clips in $VIDEO_DIR — skip video zip" >&2 +else + rm -f "$VIDEO_ZIP" + ( + cd "$VIDEO_DIR" + zip -r "$VIDEO_ZIP" ./*.mp4 + ) +fi + +cp -f "$CODE_ZIP" "$DOWNLOADS/aerial-screensaver-linux.zip" +[[ -f "$VIDEO_ZIP" ]] && cp -f "$VIDEO_ZIP" "$DOWNLOADS/aerial-videos-lite.zip" + +echo +echo "Ready for LocalSend:" +ls -lh "$DOWNLOADS/aerial-screensaver-linux.zip" +[[ -f "$DOWNLOADS/aerial-videos-lite.zip" ]] && ls -lh "$DOWNLOADS/aerial-videos-lite.zip" +echo +echo "Recipient:" +echo " unzip aerial-screensaver-linux.zip && cd aerial-screensaver-linux" +echo " ./install.sh --videos-zip ~/Downloads/aerial-videos-lite.zip" diff --git a/test_screensaver.py b/test_screensaver.py index 12ca502..57b0d5a 100644 --- a/test_screensaver.py +++ b/test_screensaver.py @@ -59,6 +59,11 @@ class TestAerialScreensaver(unittest.TestCase): node.write_text("") self.assertEqual(aerial_screensaver.find_vaapi_device(str(node)), str(node)) + def test_pci_attrs_helper_missing_node(self): + cls, vendor = aerial_screensaver._pci_attrs_for_render(Path("/dev/dri/renderD-nope")) + self.assertEqual(cls, "") + self.assertEqual(vendor, "") + def test_find_vaapi_device_missing_explicit_falls_through(self): # Should not crash; may return a system node or None result = aerial_screensaver.find_vaapi_device("/nonexistent/vaapi") diff --git a/uninstall.sh b/uninstall.sh index 0a15d62..a2e2c34 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -5,10 +5,13 @@ set -euo pipefail BIN_DIR="${XDG_BIN_HOME:-$HOME/.local/bin}" UNIT_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/systemd/user" CFG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/aerial-screensaver" +SHARE="$HOME/.local/share/aerial-screensaver" systemctl --user disable --now aerial-screensaver.service 2>/dev/null || true rm -f "$UNIT_DIR/aerial-screensaver.service" -rm -f "$BIN_DIR/aerial-screensaver" "$BIN_DIR/encode-aerial-lite" "$BIN_DIR/fetch-aerial-recent" +rm -f "$BIN_DIR/aerial-screensaver" "$BIN_DIR/encode-aerial-lite" \ + "$BIN_DIR/fetch-aerial-recent" "$BIN_DIR/install-aerial-videos" +rm -rf "$SHARE" systemctl --user daemon-reload 2>/dev/null || true echo "Removed service and helpers." -- cgit v1.2.3