Guard UTF-8 naming and repair headless screenshots
This commit is contained in:
@@ -58,7 +58,11 @@ pub fn firmware_family(raw: &str) -> (String, Option<String>) {
|
||||
// Vendor prefixes asic-rs prepends on stock-firmware family strings, matched
|
||||
// case-insensitively.
|
||||
for vendor in ["AntMiner", "WhatsMiner"] {
|
||||
if trimmed.len() > vendor.len() && trimmed[..vendor.len()].eq_ignore_ascii_case(vendor) {
|
||||
if trimmed.len() > vendor.len()
|
||||
&& trimmed
|
||||
.get(..vendor.len())
|
||||
.is_some_and(|prefix| prefix.eq_ignore_ascii_case(vendor))
|
||||
{
|
||||
let rest = trimmed[vendor.len()..].trim();
|
||||
if !rest.is_empty() {
|
||||
return (rest.to_string(), Some(vendor.to_string()));
|
||||
@@ -477,6 +481,35 @@ mod tests {
|
||||
assert_eq!(firmware_family("Braiins"), ("Braiins".to_string(), None));
|
||||
// A bare vendor word with nothing after it is left as-is (not emptied).
|
||||
assert_eq!(firmware_family("AntMiner"), ("AntMiner".to_string(), None));
|
||||
// Firmware strings arrive from the network and may contain UTF-8 at
|
||||
// the byte position used to check a vendor prefix.
|
||||
let non_ascii = "AntMine\u{e9} Stock";
|
||||
assert_eq!(firmware_family(non_ascii), (non_ascii.to_string(), None));
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[ignore = "microbenchmark"]
|
||||
fn bench_naming_transforms() {
|
||||
let cases = [
|
||||
("Antminer", "S19jPro", "AntMiner Stock", "Xilinx"),
|
||||
("Antminer", "S21Pro", "VNish", "CVITek"),
|
||||
("Whatsminer", "M30SPlusVE40", "WhatsMiner Stock", "H616"),
|
||||
("Whatsminer", "M50SPlusPlusVK30", "Braiins", "H6"),
|
||||
];
|
||||
let iterations = 20_000;
|
||||
let started = std::time::Instant::now();
|
||||
for index in 0..iterations {
|
||||
let (make, model, firmware, board) = cases[index % cases.len()];
|
||||
let clean = clean_model(make, model);
|
||||
std::hint::black_box(firmware_family(firmware));
|
||||
std::hint::black_box(control_board_code(make, board, &clean));
|
||||
std::hint::black_box(chip_type_for_model(make, model));
|
||||
std::hint::black_box(clean);
|
||||
}
|
||||
let elapsed = started.elapsed();
|
||||
let per = elapsed / iterations as u32;
|
||||
println!("bench_naming_transforms: {per:?}/record");
|
||||
assert!(elapsed < std::time::Duration::from_millis(500));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
+27
-17
@@ -8,13 +8,13 @@
|
||||
#
|
||||
# Usage: scripts/ui-screenshot.sh [out.png] [--live] [binary]
|
||||
set -u
|
||||
REPO=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)
|
||||
REPO=$(CDPATH='' cd -- "$(dirname -- "$0")/.." && pwd)
|
||||
WX_PREFIX="${WX_PREFIX:-$HOME/.cache/wx-3.3.3-linux}"
|
||||
export WX_RS_WXCONFIG="${WX_RS_WXCONFIG:-$WX_PREFIX/bin/wx-config}"
|
||||
|
||||
OUT="${1:-alkane-toolkit.png}"
|
||||
LIVE=0; BIN=""
|
||||
shift 2>/dev/null || true
|
||||
[ "$#" -eq 0 ] || shift
|
||||
for a in "$@"; do
|
||||
case "$a" in
|
||||
--live) LIVE=1 ;;
|
||||
@@ -32,17 +32,31 @@ if [ -z "$BIN" ]; then
|
||||
fi
|
||||
[ -x "$BIN" ] || { echo "binary not found: $BIN" >&2; exit 3; }
|
||||
|
||||
DISP=":98"
|
||||
FAKE_ENV="ALKANE_FAKE_SCAN=1"
|
||||
[ "$LIVE" = "1" ] && FAKE_ENV=""
|
||||
|
||||
Xvfb "$DISP" -screen 0 1280x850x24 -nolisten tcp >/dev/null 2>&1 &
|
||||
DISPLAY_FILE=$(mktemp)
|
||||
XPID=""; APID=""; WARM=""
|
||||
cleanup() {
|
||||
[ -z "$APID" ] || kill "$APID" 2>/dev/null || true
|
||||
[ -z "$WARM" ] || kill "$WARM" 2>/dev/null || true
|
||||
[ -z "$XPID" ] || kill "$XPID" 2>/dev/null || true
|
||||
rm -f "$DISPLAY_FILE"
|
||||
}
|
||||
trap cleanup EXIT
|
||||
Xvfb -displayfd 3 -screen 0 1280x850x24 -nolisten tcp 3>"$DISPLAY_FILE" >/dev/null 2>&1 &
|
||||
XPID=$!
|
||||
sleep 1.2
|
||||
for _ in {1..30}; do
|
||||
[ -s "$DISPLAY_FILE" ] && break
|
||||
kill -0 "$XPID" 2>/dev/null || { echo "Xvfb exited before startup" >&2; exit 3; }
|
||||
sleep 0.1
|
||||
done
|
||||
[ -s "$DISPLAY_FILE" ] || { echo "Xvfb did not start" >&2; exit 3; }
|
||||
DISP=":$(cat "$DISPLAY_FILE")"
|
||||
# warm the font/GTK caches so the first window map is not stalled
|
||||
DISPLAY="$DISP" xclock >/dev/null 2>&1 & WARM=$!; sleep 1.2; kill "$WARM" 2>/dev/null
|
||||
# shellcheck disable=SC2086
|
||||
DISPLAY="$DISP" GDK_BACKEND=x11 $FAKE_ENV "$BIN" >/dev/null 2>&1 &
|
||||
if [ "$LIVE" = "1" ]; then
|
||||
DISPLAY="$DISP" GDK_BACKEND=x11 "$BIN" >/dev/null 2>&1 &
|
||||
else
|
||||
DISPLAY="$DISP" GDK_BACKEND=x11 ALKANE_FAKE_SCAN=1 "$BIN" >/dev/null 2>&1 &
|
||||
fi
|
||||
APID=$!
|
||||
WID=""; t=0
|
||||
while [ "$t" -lt 25 ]; do
|
||||
@@ -52,10 +66,6 @@ while [ "$t" -lt 25 ]; do
|
||||
[ -n "$line" ] && { WID=$(echo "$line" | awk '{print $1}'); break; }
|
||||
done
|
||||
sleep 2 # let it paint and drain a scan tick
|
||||
if [ -n "$WID" ]; then
|
||||
DISPLAY="$DISP" import -window "$WID" "$OUT" && echo "wrote $OUT (window $WID, ${t}s)"
|
||||
else
|
||||
DISPLAY="$DISP" import -window root "$OUT"; echo "no app window; captured root -> $OUT" >&2
|
||||
fi
|
||||
kill "$APID" 2>/dev/null
|
||||
kill "$XPID" 2>/dev/null
|
||||
[ -n "$WID" ] || { echo "no app window mapped" >&2; exit 1; }
|
||||
DISPLAY="$DISP" import -window "$WID" "$OUT" || exit 1
|
||||
echo "wrote $OUT (window $WID, ${t}s)"
|
||||
|
||||
Reference in New Issue
Block a user