mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-08-01 08:48:05 +00:00
* feat(layout): adaptive layout & font scaling system for plugins Add src/adaptive_layout.py — opt-in core helpers so plugins render legibly on any panel size without hand-tuned per-display layouts: - Region: integer rect algebra (bands/columns/weighted splits/centering) that partitions space so text bands can't overlap by construction - Font ladders: ordered (family, size) steps known to render crisply (LADDER_GRID: X11 BDFs at native sizes; LADDER_ARCADE: PressStart2P at 8px multiples) — fitting walks the ladder instead of scaling pixel fonts fractionally - LayoutContext: breakpoint tiers, geometry scale vs. a declared design size, and cached fit_text/fit_lines/font_for_rows queries Generalizes the three patterns proven in the field: f1-scoreboard's scale factor, masters-tournament's tiers, baseball-scoreboard's font fallback ladder. Wiring: BasePlugin gains a lazy .layout property and draw_fit(); FontManager gains get_native_bdf_size() and a cache_generation counter; manifest schema gains display.design_size and requires.display_size max_width/max_height; 96x48 joins DEFAULT_TEST_SIZES; the bounds-check harness records negative-coordinate draws; TextHelper's broken measurement helpers are fixed. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(layout): adaptive image fitting + composite region helpers Add src/adaptive_images.py — the image counterpart to fit_text: - fit_image(img, box, mode=contain|cover|fill_height|stretch, crop_to_ink, anchor, resample, upscale) promoting the proven plugin patterns (football's crop-to-ink fill-height logos, masters' cover crop + NEAREST flags, static-image's letterbox). Upscales by default — thumbnail()'s downscale-only behavior is why imagery stays tiny on big panels. - draw_fitted_image() pastes aligned within a Region with alpha mask. - One central Pillow>=9.1 RESAMPLE shim replacing ~15 plugin copies. LayoutContext.fit_image() caches results per (identity, box size, options) with a 64-entry LRU; id()-keyed entries pin the source image. BasePlugin.draw_image() is the one-liner adoption path beside draw_fit. Composites in adaptive_layout.py: Region.offset() (user x/y-offset passthrough), scoreboard_regions() (the two-logos-plus-score card math duplicated across six sports plugins, logo_slot = min(H, W//2)), and media_row() (art-left/text-right). Fix LogoHelper's size-blind cache key (stale sizes on panel change); deprecation note on dead image_utils.py. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(harness): scale-up fill check, config variants, multi-size dev gallery Quality gates for adaptive layout: - fill_metrics()/check_scale_up() in the safety harness: overflow catches content too big for a panel, but nothing caught content that stays tiny on panels >= 2x the plugin's declared design size. The check measures lit-content extents and warns (or fails, when a plugin opts into "fill_check": "strict" in test/harness.json) below 50% coverage on the doubled axis. Warn-only by default so no existing plugin breaks. - harness.json "variants": extra runs with config overlays and their own golden dirs, so an opt-in mode (e.g. layout_mode: adaptive) is golden- tested beside the classic default. check_plugin.py loops base + variants and labels variant results mode@name. - Dev preview server: GET /api/sizes (harness size sample), POST /api/render-matrix (render at up to 12 sizes in one call), size-preset dropdown, and an "All Sizes" side-by-side gallery in the preview UI. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(plugins): adaptive-lib discoverability + advisory version compat warning Discoverability: re-export the adaptive layout/image API from src.common (the blessed-helpers package plugin authors already know) — canonical paths stay src.adaptive_layout / src.adaptive_images so nothing breaks. Document it in src/common/README.md and cross-link ADAPTIVE_LAYOUT.md from the developer docs authors actually read (quick reference, API reference, advanced dev, font manager, dev preview, plugin dev guide); ADAPTIVE_LAYOUT.md gains adaptive-images, composite-layouts and preserving-user-customization sections. Compat: PluginLoader now logs one advisory warning (never raises) when a plugin's manifest declares a min LEDMatrix version newer than the running core, checking the min_ledmatrix_version / requires.* / versions[] spellings found in the wild. Guarded against stale core version numbers. src/__init__.py __version__ bumped 1.0.0 -> 3.1.0 to match the latest release tag (v3.1.0) — it had never been updated and the compat check needs a truthful number. NOTE: verify this matches the intended release numbering before the next tag. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(layout): add measure_font_crispness — verify a ladder rung isn't blurry PIL antialiases TTF outlines by default; a 'pixel-style' font only rasterizes without antialiasing at specific sizes (for PressStart2P: exact multiples of its 8px design grid). A ladder rung at an unverified size silently renders blurry on an LED panel — this exact bug shipped in both text-display's and football-scoreboard's custom TTF ladders (non-8-multiple PressStart2P sizes, and '5by7.regular'/'4x6-font' at sizes that were never actually crisp). measure_font_crispness(font, sample_text) renders the sample and reports the fraction of ink-bbox pixels that are neither pure black nor pure white. BDF fonts (real bitmaps) always score 0.0; TTF ladders should be verified against this before shipping — see the new TestFontFitting::test_ladder_arcade_is_crisp pattern. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(layout): add fit_text_proportional — proportional sizing vs. always-maximize fit_text always picks the largest ladder rung that fits its box. That's right when an element owns dedicated space, but wrong when several independently-fitted elements need to stay visually harmonious as the panel grows: a score's box might have generous room while a neighboring logo scales by a fixed geometry factor via px() — fit_text lets the score balloon out of proportion (even overlapping the logo) even though its individual pick is technically correct. fit_text_proportional(text, box, base_size_px, ladder) instead targets base_size_px * self.scale (the same scale factor px() already uses), picking the nearest ladder rung at or below that target, still capped to what fits the box, floored at the smallest rung when the target is below every rung. Refactored the shared largest-that-fits/ellipsize walk into _walk_ladder() so fit_text and fit_text_proportional don't duplicate it. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(layout): fit_text_proportional gains an axis-specific scale override self.scale (min(width_ratio, height_ratio)) is the right conservative default for anything whose aspect ratio matters, but a caller whose surrounding composition already scales along a single axis — e.g. football-scoreboard's logo_slot = min(height, width // 2), which tracks height alone — needs text sized the same way, or it reads as under-scaled next to logos that grew on a panel that only got taller (128x32 -> 128x64: self.scale stays 1.0 since width didn't grow, but logos still double). fit_text_proportional(..., scale=None) now accepts an explicit override; None keeps the existing self.scale default. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(layout): scoreboard_regions reserves real center space at 2:1 aspect ratios logo_slot = min(height, width // 2) has a blind spot: at exactly 2:1 aspect ratio (width == 2 * height -- a very common shape: two, four, or more square modules stacked into a taller panel) width // 2 and height are equal, so the two logo slots claim the ENTIRE width and leave zero pixels for a center column, no matter how large the panel gets. Not a 'small panel' problem -- 96x48, 128x64, and 256x128 (all exactly 2:1) hit it identically, while the 128x32 design baseline and panels like 192x48 or 256x32 never do, because height is already the tighter constraint there. Two new parameters fix it in the one shared helper every scoreboard-style plugin composes through: - min_center_fraction / min_center_design_px reserve at least max(width * fraction, design_px * ctx.scale) for the center column, capping logo_slot further when needed. The scaled design-px term matters on small panels where a flat fraction alone reserves too little absolute space. - score_bleed_fraction extends the score's own fit box (not the logo slots themselves) a controlled amount into each side -- the same way real broadcast scoreboards let a big score number's edges cross into the team marks flanking it. Without this the reserve alone can still be too narrow for a short score to render without truncating. score_area is now genuinely narrower than the full card width (previously identical to status_band/detail_band, which still span the full width and overlay the logos -- short text there was never the problem). Verified against the full harness size spread: a real game score like '17-21' never needs ellipsis at any tested 2:1-or-tighter aspect ratio (test_score_never_needs_ellipsis_for_a_short_score), and wide panels (128x32/192x48/256x32-style) are provably unaffected. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: document scoreboard_regions' center-reserve and score-bleed params Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: address CodeRabbit review on PR #393 - docs: scope the self.layout note to BasePlugin subclasses (others build a LayoutContext directly) and make explicit that adaptive layout is opt-in — classic rendering stays unless a plugin adopts the APIs. - dev_server: broaden the render-request catch (a bad manifest.json now returns a clean 400 instead of an unhandled 500) and stop echoing raw exception text in the loader-failure responses — full tracebacks go to the dev server's console log instead. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqzC1nzTWL4kaqgMaQZFam * fix(dev-server): allowlist plugin_id before any path lookup CodeQL (py/path-injection): plugin_id arrives in request input and flows into filesystem paths via find_plugin_dir. Gate it with the same ^[a-zA-Z0-9_-]{1,64}$ allowlist the web UI's pages_v3 uses, at the single choke point every route resolves through. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqzC1nzTWL4kaqgMaQZFam * fix(dev-server): lexical containment check on resolved plugin dirs CodeQL doesn't recognize the interprocedural allowlist as a path-injection barrier; add the canonical one — normalize (without following symlinks, since dev plugins are commonly symlinked into plugins/) and require the result to stay inside the search dir. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqzC1nzTWL4kaqgMaQZFam * fix(dev-server): inline normpath containment barrier before render CodeQL doesn't credit the sanitization inside find_plugin_dir along this flow; apply its documented barrier (normpath + startswith against the allowed roots) inline in _parse_render_request, on the exact path that reaches the render/load sinks. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqzC1nzTWL4kaqgMaQZFam * fix(dev-server): derive plugin dir from trusted directory listings CodeQL's barrier-guard recognition doesn't see a startswith check inside an any() comprehension, so the normalize-and-prefix approach still flagged. Break the taint outright instead: after lookup, re-derive the directory by enumerating the search dirs (iterdir) and matching by path equality — the Path used for all downstream file access is built solely from trusted listings, never from request input. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqzC1nzTWL4kaqgMaQZFam * fix(dev-server): use os.scandir for path-injection barrier, redact stack traces from render responses CodeQL doesn't model Path.iterdir() as a taint-clearing enumeration the way it does os.scandir() -- _trusted_plugin_dir's iterdir-based rebuild still traced plugin_id through to the manifest.json open(). Switched to scandir, matching the pattern already verified clean on PR #396. Also stops surfacing raw exception text (update()/display() failures) in the JSON render response -- logs full detail server-side via exc_info instead, returning only the exception class name to the client. And drops path values from three plugin_loader debug/error logs that CodeQL flags as clear-text-logging of externally-influenced data, keeping plugin_id (not flagged) for context. * fix(dev-server): remove conditional-reassignment ambiguity in plugin_dir resolution CodeQL's path-injection flow still traced through _parse_render_request after the scandir fix -- the tainted find_plugin_dir() result and the scandir-derived _trusted_plugin_dir() result shared the same variable name (plugin_dir), reassigned only on the truthy branch. That merge point apparently isn't treated as a barrier by the flow analysis, so it kept tracing the pre-reassignment value through to the manifest open(). Split into two distinct names -- candidate_dir (tainted, used only to call _trusted_plugin_dir) and trusted_dir (the only name used for any downstream file access) -- so there's no reassigned variable for the flow to walk through. * fix: remove unused imports flagged by Codacy Union in adaptive_images.py and field in adaptive_layout.py are both imported but never used -- the last two Codacy findings on this PR, matching the same fix already applied on PR #396. * fix(layout): bound the fit cache; never alias the source image in fits Two latent issues found in a self-review pass: - LayoutContext._fit_cache was an unbounded dict (the image cache got an LRU cap, the text-fit cache didn't). Cache keys embed the fitted TEXT, so a plugin fitting changing strings — a live game clock, a ticker — on a 24/7 service grows it forever. Now LRU-bounded at 512 entries via the same pattern as the image cache. - fit_image returned the caller's ORIGINAL image object when the source was already RGBA at target size (contain/fill_height, no ink crop). ImageFitResult is documented as an independent copy, and LayoutContext caches results — an aliased image lets later mutations of the source corrupt cached fits (or vice versa). Copy in that branch. Both covered by new regression tests. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqzC1nzTWL4kaqgMaQZFam --------- Co-authored-by: Chuck <chuck@example.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
310 lines
11 KiB
Python
310 lines
11 KiB
Python
"""
|
|
Text Helper
|
|
|
|
Handles text rendering with outlines, fonts, and positioning for LED matrix displays.
|
|
Extracted from LEDMatrix core to provide reusable functionality for plugins.
|
|
"""
|
|
|
|
import logging
|
|
from pathlib import Path
|
|
from typing import Dict, List, Optional, Tuple, Union
|
|
|
|
from PIL import Image, ImageDraw, ImageFont
|
|
|
|
# Shared throwaway draw surface for measuring text without a target canvas.
|
|
_measure_draw = ImageDraw.Draw(Image.new("RGB", (1, 1)))
|
|
|
|
|
|
class TextHelper:
|
|
"""
|
|
Helper class for text rendering with outlines and font management.
|
|
|
|
Provides functionality for:
|
|
- Loading and managing fonts
|
|
- Drawing text with outlines for better readability
|
|
- Calculating text dimensions and positioning
|
|
- Managing font resources
|
|
"""
|
|
|
|
def __init__(self, font_dir: Optional[Union[str, Path]] = None,
|
|
logger: Optional[logging.Logger] = None):
|
|
"""
|
|
Initialize the TextHelper.
|
|
|
|
Args:
|
|
font_dir: Directory containing font files (defaults to assets/fonts)
|
|
logger: Optional logger instance
|
|
"""
|
|
self.logger = logger or logging.getLogger(__name__)
|
|
self.font_dir = Path(font_dir) if font_dir else Path("assets/fonts")
|
|
self._font_cache: Dict[str, ImageFont.ImageFont] = {}
|
|
|
|
def load_fonts(self, font_config: Optional[Dict[str, Dict]] = None) -> Dict[str, ImageFont.ImageFont]:
|
|
"""
|
|
Load fonts for different text elements.
|
|
|
|
Args:
|
|
font_config: Custom font configuration dictionary
|
|
|
|
Returns:
|
|
Dictionary mapping font names to PIL ImageFont objects
|
|
"""
|
|
if font_config is None:
|
|
font_config = self._get_default_font_config()
|
|
|
|
fonts = {}
|
|
|
|
for font_name, config in font_config.items():
|
|
try:
|
|
font_path = self.font_dir / config['file']
|
|
size = config['size']
|
|
|
|
if font_path.exists():
|
|
font = ImageFont.truetype(str(font_path), size)
|
|
fonts[font_name] = font
|
|
self.logger.debug(f"Loaded font: {font_name} ({font_path}, size {size})")
|
|
else:
|
|
# Fallback to default font
|
|
font = ImageFont.load_default()
|
|
fonts[font_name] = font
|
|
self.logger.warning(f"Font file not found: {font_path}, using default")
|
|
|
|
except Exception as e:
|
|
self.logger.error(f"Error loading font {font_name}: {e}")
|
|
fonts[font_name] = ImageFont.load_default()
|
|
|
|
return fonts
|
|
|
|
def draw_text_with_outline(self, draw: ImageDraw.ImageDraw, text: str,
|
|
position: Tuple[int, int], font: ImageFont.ImageFont,
|
|
fill: Tuple[int, int, int] = (255, 255, 255),
|
|
outline_color: Tuple[int, int, int] = (0, 0, 0),
|
|
outline_width: int = 1) -> None:
|
|
"""
|
|
Draw text with an outline for better readability on LED displays.
|
|
|
|
Args:
|
|
draw: PIL ImageDraw object
|
|
text: Text to draw
|
|
position: (x, y) position tuple
|
|
font: PIL ImageFont object
|
|
fill: Text color (R, G, B)
|
|
outline_color: Outline color (R, G, B)
|
|
outline_width: Width of outline in pixels
|
|
"""
|
|
x, y = position
|
|
|
|
# Draw outline by drawing text in outline color at offset positions
|
|
for dx in range(-outline_width, outline_width + 1):
|
|
for dy in range(-outline_width, outline_width + 1):
|
|
if dx != 0 or dy != 0: # Skip center position
|
|
draw.text((x + dx, y + dy), text, font=font, fill=outline_color)
|
|
|
|
# Draw main text
|
|
draw.text((x, y), text, font=font, fill=fill)
|
|
|
|
def get_text_width(self, text: str, font: ImageFont.ImageFont) -> int:
|
|
"""
|
|
Get the width of text when rendered with the given font.
|
|
|
|
Args:
|
|
text: Text to measure
|
|
font: PIL ImageFont object
|
|
|
|
Returns:
|
|
Width in pixels
|
|
"""
|
|
try:
|
|
return int(_measure_draw.textlength(text, font=font))
|
|
except AttributeError:
|
|
# Fallback for older PIL versions
|
|
bbox = _measure_draw.textbbox((0, 0), text, font=font)
|
|
return bbox[2] - bbox[0]
|
|
|
|
def get_text_height(self, text: str, font: ImageFont.ImageFont) -> int:
|
|
"""
|
|
Get the height of text when rendered with the given font.
|
|
|
|
Args:
|
|
text: Text to measure
|
|
font: PIL ImageFont object
|
|
|
|
Returns:
|
|
Height in pixels
|
|
"""
|
|
bbox = _measure_draw.textbbox((0, 0), text, font=font)
|
|
return bbox[3] - bbox[1]
|
|
|
|
def get_text_dimensions(self, text: str, font: ImageFont.ImageFont) -> Tuple[int, int]:
|
|
"""
|
|
Get both width and height of text.
|
|
|
|
Args:
|
|
text: Text to measure
|
|
font: PIL ImageFont object
|
|
|
|
Returns:
|
|
(width, height) tuple
|
|
"""
|
|
return (self.get_text_width(text, font), self.get_text_height(text, font))
|
|
|
|
def center_text(self, text: str, font: ImageFont.ImageFont,
|
|
container_width: int, container_height: int) -> Tuple[int, int]:
|
|
"""
|
|
Calculate position to center text within a container.
|
|
|
|
Args:
|
|
text: Text to center
|
|
font: PIL ImageFont object
|
|
container_width: Width of container
|
|
container_height: Height of container
|
|
|
|
Returns:
|
|
(x, y) position tuple for centered text
|
|
"""
|
|
text_width, text_height = self.get_text_dimensions(text, font)
|
|
x = (container_width - text_width) // 2
|
|
y = (container_height - text_height) // 2
|
|
return (x, y)
|
|
|
|
def wrap_text(self, text: str, font: ImageFont.ImageFont,
|
|
max_width: int, max_lines: Optional[int] = None) -> List[str]:
|
|
"""
|
|
Wrap text to fit within specified width.
|
|
|
|
Args:
|
|
text: Text to wrap
|
|
font: PIL ImageFont object
|
|
max_width: Maximum width in pixels
|
|
max_lines: Maximum number of lines (None for unlimited)
|
|
|
|
Returns:
|
|
List of text lines
|
|
"""
|
|
words = text.split()
|
|
lines = []
|
|
current_line = []
|
|
|
|
for word in words:
|
|
# Test if adding this word would exceed width
|
|
test_line = ' '.join(current_line + [word])
|
|
if self.get_text_width(test_line, font) <= max_width:
|
|
current_line.append(word)
|
|
else:
|
|
# Start new line
|
|
if current_line:
|
|
lines.append(' '.join(current_line))
|
|
current_line = [word]
|
|
else:
|
|
# Single word is too long, add it anyway
|
|
lines.append(word)
|
|
|
|
# Add remaining words
|
|
if current_line:
|
|
lines.append(' '.join(current_line))
|
|
|
|
# Limit lines if specified
|
|
if max_lines is not None:
|
|
lines = lines[:max_lines]
|
|
|
|
return lines
|
|
|
|
def draw_multiline_text(self, draw: ImageDraw.ImageDraw, text: str,
|
|
position: Tuple[int, int], font: ImageFont.ImageFont,
|
|
line_spacing: int = 2, **kwargs) -> None:
|
|
"""
|
|
Draw multiline text with proper spacing.
|
|
|
|
Args:
|
|
draw: PIL ImageDraw object
|
|
text: Text to draw (can contain newlines)
|
|
position: Starting (x, y) position
|
|
font: PIL ImageFont object
|
|
line_spacing: Pixels between lines
|
|
**kwargs: Additional arguments for draw_text_with_outline
|
|
"""
|
|
x, y = position
|
|
lines = text.split('\n')
|
|
|
|
for line in lines:
|
|
if line.strip(): # Skip empty lines
|
|
self.draw_text_with_outline(draw, line, (x, y), font, **kwargs)
|
|
y += self.get_text_height(line, font) + line_spacing
|
|
|
|
def create_text_image(self, text: str, font: ImageFont.ImageFont,
|
|
background_color: Tuple[int, int, int] = (0, 0, 0),
|
|
text_color: Tuple[int, int, int] = (255, 255, 255),
|
|
padding: int = 5) -> Image.Image:
|
|
"""
|
|
Create an image containing only the specified text.
|
|
|
|
Args:
|
|
text: Text to render
|
|
font: PIL ImageFont object
|
|
background_color: Background color (R, G, B)
|
|
text_color: Text color (R, G, B)
|
|
padding: Padding around text in pixels
|
|
|
|
Returns:
|
|
PIL Image containing the text
|
|
"""
|
|
# Calculate dimensions
|
|
text_width, text_height = self.get_text_dimensions(text, font)
|
|
img_width = text_width + (padding * 2)
|
|
img_height = text_height + (padding * 2)
|
|
|
|
# Create image
|
|
img = Image.new('RGB', (img_width, img_height), background_color)
|
|
draw = ImageDraw.Draw(img)
|
|
|
|
# Draw text
|
|
self.draw_text_with_outline(draw, text, (padding, padding), font,
|
|
fill=text_color)
|
|
|
|
return img
|
|
|
|
def _get_default_font_config(self) -> Dict[str, Dict]:
|
|
"""Get default font configuration."""
|
|
return {
|
|
'score': {
|
|
'file': 'PressStart2P-Regular.ttf',
|
|
'size': 10
|
|
},
|
|
'time': {
|
|
'file': 'PressStart2P-Regular.ttf',
|
|
'size': 8
|
|
},
|
|
'team': {
|
|
'file': 'PressStart2P-Regular.ttf',
|
|
'size': 8
|
|
},
|
|
'status': {
|
|
'file': '4x6-font.ttf',
|
|
'size': 6
|
|
},
|
|
'detail': {
|
|
'file': '4x6-font.ttf',
|
|
'size': 6
|
|
},
|
|
'rank': {
|
|
'file': 'PressStart2P-Regular.ttf',
|
|
'size': 10
|
|
}
|
|
}
|
|
|
|
def clear_font_cache(self) -> None:
|
|
"""Clear the font cache."""
|
|
self._font_cache.clear()
|
|
self.logger.debug("Font cache cleared")
|
|
|
|
def get_font_cache_stats(self) -> Dict[str, int]:
|
|
"""
|
|
Get font cache statistics.
|
|
|
|
Returns:
|
|
Dictionary with cache statistics
|
|
"""
|
|
return {
|
|
'cached_fonts': len(self._font_cache)
|
|
}
|