enricobuehler
f62a48d4a9
apple / swift (pull_request) Successful in 1m42s
apple / screenshots (pull_request) Skipped
windows / build (x86_64-pc-windows-msvc) (pull_request) Successful in 3m12s
windows / build (aarch64-pc-windows-msvc) (pull_request) Successful in 1m32s
ci / rust-arm64 (pull_request) Successful in 1m52s
ci / web (pull_request) Successful in 1m6s
ci / docs-site (pull_request) Successful in 1m15s
ci / bun-nix (pull_request) Successful in 18s
android / android (pull_request) Successful in 3m56s
ci / rust (pull_request) Successful in 5m40s
A launcher tile (role: "launcher", design D4) shipped no art on purpose:
a launcher's own icon is square, every client cover-crops a 2:3 poster,
and the crop turns a mark into a strip. So the tiles were the launcher's
name on a flat accent face — legible, and the blandest thing in the grid.
Entries now carry an optional `icon`: the NAME of a brand mark, never
image bytes and never a URL. `[a-z][a-z0-9-]{0,31}`, shape-validated by
the host on every lane (a client interpolates the value into a resource
name or an asset lookup, so the guard belongs upstream of all of them,
and each client re-checks rather than trusting the peer).
A token rather than art because the alternative is closed by
construction, and deliberately: the art proxy serves what the bytes ARE
(sniff_image_type) and SVG is not on that list — it is script-capable
XML and the console renders library art in a browser. Widening that
sniff would trade a rendering nicety for a stored-XSS surface. Naming
the mark keeps the refusal intact, keeps the glyph vector at whatever
size a tile happens to be, lets it take the tile's ink, and adds nothing
to a reconcile payload that is already body-limited. The cost is that a
third-party plugin cannot ship a mark no client bundles; its tile falls
back to the launcher's name, exactly as before, and the fix is a PR
adding the master.
assets/launcher-icons/ holds seven monochrome masters with per-mark
provenance and licensing (Simple Icons CC0: lutris, heroic, epic, gog;
Font Awesome CC BY: steam, xbox; Playnite's own logo, MIT). steam is
generated FROM assets/os-icons/steam.svg so the SteamOS host badge and
the Steam launcher tile can never drift.
scripts/gen-launcher-icons.sh bakes the three derivatives that cannot
consume a master (GTK symbolic SVG, Windows PNG, Apple template PDF)
and — unlike gen-os-icons.sh, which prints path data for a human to
paste — GENERATES the three inline registries (web console, Android
ImageVector, pf-console-ui Skia). Three clients x seven paths of up to
3 kB is a transcription error waiting to happen, and a mangled character
is a silently wrong logo rather than a build failure. The generated Rust
goes through rustfmt, since `cargo fmt --all --check` is a CI gate and a
generated file that fails it would fail every regeneration.
All six renderers draw the mark CONTAINED, never cover-cropped: the
masters' viewports are not square (steam 496x512, playnite 1024x1024)
and filling a 2:3 frame would reproduce the strip this exists to avoid.
Every one keeps its old fallback for a token it has no art for.
Epic, GOG and Xbox marks ship dormant. Those plugins' launcher switches
are off by default and emit nothing, because the host has no verified
launcher_ui activation for them yet — shipping the art now keeps turning
one on the one-line plugin change those plugins promise, instead of also
needing a release of all six clients.
api/openapi.json and the SDK are regenerated (the spec's version field
was stale at 0.25.0 and now reads 0.26.0, which is the crate's actual
version — an unrelated line that regeneration necessarily corrects).
Verified: host cargo check, clippy -D warnings across pf-client-core /
pf-console-ui / punktfunk-client-session / punktfunk-client-linux, plain
build, pf-console-ui tests (77, including a new one asserting all seven
masters parse under Skia and one asserting the letterbox stays inside
its box), pf-client-core tests (188), cargo fmt --all --check, Apple
swift build, Android compileDebugKotlin, web tsc + vite build,
plugin-kit tsc, biome. The Windows client is NOT compile-verified — it
cannot be built from a Mac (scripts/xcheck.sh covers only the capture
stack by design) and CI does not build it either; its tile change needs
a real box before it ships.
109 lines
4.6 KiB
Bash
109 lines
4.6 KiB
Bash
#!/usr/bin/env bash
|
|
# Derive the per-client launcher-tile brand marks from the assets/launcher-icons masters.
|
|
#
|
|
# The sibling of gen-os-icons.sh, and deliberately a separate script rather than a flag on it:
|
|
# the two registries answer different questions (which OS is this host / which launcher does
|
|
# this tile open), are keyed by different vocabularies, and bake to different sizes. What they
|
|
# share is the discipline — monochrome `fill="currentColor"` masters, original viewBoxes, one
|
|
# file per token, provenance in the README.
|
|
#
|
|
# Four clients need a baked derivative because they cannot consume the master directly:
|
|
#
|
|
# GTK shell symbolic SVG, black fill -> clients/linux/data/icons/scalable/actions/
|
|
# Windows shell PNG, h=128, mid-grey -> clients/windows/assets/launchers/
|
|
# Apple clients vector PDF, black fill -> clients/apple/.../LauncherIcons.xcassets/
|
|
#
|
|
# The web console, the Android client and the in-session console UI transcribe the master's
|
|
# path data inline instead — those are hand-kept, and this script prints them at the end so a
|
|
# new token can be pasted straight in.
|
|
#
|
|
# Idempotent. Usage: bash scripts/gen-launcher-icons.sh [token ...] (default: every master)
|
|
set -euo pipefail
|
|
|
|
cd "$(dirname "$0")/.."
|
|
|
|
MASTERS=assets/launcher-icons
|
|
GTK=clients/linux/data/icons/scalable/actions
|
|
WIN=clients/windows/assets/launchers
|
|
APPLE=clients/apple/Sources/PunktfunkKit/Resources/LauncherIcons.xcassets
|
|
|
|
# Same mid-grey as the OS marks, for the same reason: the Windows shell has no vector element
|
|
# and no theme-aware tint, so one colour has to stay legible on both the light and dark WinUI
|
|
# theme. Taller than the OS marks (32) because this one fills a poster tile, not a status row.
|
|
WIN_GREY='#8A8F98'
|
|
WIN_HEIGHT=128
|
|
|
|
log() { printf '\033[1;36m==>\033[0m %s\n' "$*"; }
|
|
|
|
command -v rsvg-convert >/dev/null 2>&1 || {
|
|
echo "rsvg-convert not found (brew install librsvg / apt install librsvg2-bin)" >&2
|
|
exit 1
|
|
}
|
|
|
|
tokens=("$@")
|
|
if [ ${#tokens[@]} -eq 0 ]; then
|
|
for f in "$MASTERS"/*.svg; do tokens+=("$(basename "$f" .svg)"); done
|
|
fi
|
|
|
|
mkdir -p "$GTK" "$WIN" "$APPLE"
|
|
|
|
tmp=$(mktemp -d)
|
|
trap 'rm -rf "$tmp"' EXIT
|
|
|
|
for t in "${tokens[@]}"; do
|
|
src="$MASTERS/$t.svg"
|
|
[ -f "$src" ] || { echo "no master for token '$t' ($src)" >&2; exit 1; }
|
|
log "$t"
|
|
|
|
# GTK: the master with the fill resolved to black — Adwaita recolors a `-symbolic` icon
|
|
# from the fill it finds, so the value only has to be a real colour, not the final one.
|
|
sed 's/currentColor/#000000/' "$src" > "$GTK/pf-launcher-$t-symbolic.svg"
|
|
|
|
# Windows: black-to-grey substitution, rasterized at a fixed height so every mark shares an
|
|
# optical size and keeps its own aspect ratio.
|
|
sed "s/currentColor/$WIN_GREY/" "$src" > "$tmp/$t.grey.svg"
|
|
rsvg-convert -h "$WIN_HEIGHT" -f png -o "$WIN/$t.png" "$tmp/$t.grey.svg"
|
|
|
|
# Apple: a vector PDF at the master's natural size, in a template imageset — SwiftUI tints
|
|
# it from foregroundStyle, so the baked colour is irrelevant.
|
|
sed 's/currentColor/#000000/' "$src" > "$tmp/$t.black.svg"
|
|
mkdir -p "$APPLE/launcher-$t.imageset"
|
|
rsvg-convert -f pdf -o "$APPLE/launcher-$t.imageset/$t.pdf" "$tmp/$t.black.svg"
|
|
cat > "$APPLE/launcher-$t.imageset/Contents.json" <<JSON
|
|
{
|
|
"images" : [
|
|
{ "filename" : "$t.pdf", "idiom" : "universal" }
|
|
],
|
|
"info" : { "author" : "xcode", "version" : 1 },
|
|
"properties" : {
|
|
"preserves-vector-representation" : true,
|
|
"template-rendering-intent" : "template"
|
|
}
|
|
}
|
|
JSON
|
|
done
|
|
|
|
echo
|
|
log "Inline registries (web console, Android, in-session console UI)"
|
|
# Generated outright rather than printed for pasting, unlike gen-os-icons.sh: three clients x
|
|
# seven paths of up to 3 kB is a transcription error waiting to happen, and a mangled character
|
|
# is a silently wrong logo rather than a build failure.
|
|
python3 scripts/gen_launcher_icon_tables.py
|
|
|
|
# The Rust registry goes through rustfmt: `cargo fmt --all --check` is a CI gate, and a
|
|
# GENERATED file that fails it would fail the build every time someone re-ran this script.
|
|
if command -v rustfmt >/dev/null 2>&1; then
|
|
rustfmt --edition 2021 crates/pf-console-ui/src/launcher_icons.rs
|
|
log " rustfmt'd crates/pf-console-ui/src/launcher_icons.rs"
|
|
else
|
|
log " rustfmt not found — run 'cargo fmt' before committing"
|
|
fi
|
|
|
|
echo
|
|
log "Remember: a NEW token also has to be added to each client's shipped-token list —"
|
|
log " clients/linux/src/ui_library.rs, clients/linux/data/resources.gresource.xml,"
|
|
log " clients/windows/src/app/launcher_icons.rs,"
|
|
log " clients/apple/.../PunktfunkKit/LauncherIcon.swift"
|
|
log " (the three inline registries above pick it up automatically)"
|
|
log " — and to the plugin that emits the tile."
|