mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 14:25:08 +00:00
* fix(errors): record the exception's own stack trace record_error() called traceback.format_exc(), which only sees an exception while its except block is running. plugin_executor records exceptions caught on a worker thread after that block has ended, so every trace on /errors read "NoneType: None". The trace is now built from the exception's __traceback__. The executor's log call had the same problem with exc_info=True and now passes the exception. record_error() also merged LEDMatrixError context into the caller's dict in place; it now works on a copy. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(wifi): point at configure_wifi_permissions.sh instead of a sudoers list The module docstring told users to grant NOPASSWD sudo on iptables and ip. configure_wifi_permissions.sh refuses those grants on purpose: a wildcard rule for either runs an arbitrary program as root. Point at the script and say why it leaves them out. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(wifi): disconnect finds the saved profile by SSID disconnect_from_network() asked `nmcli -f NAME,802-11-wireless.ssid connection show` for the profile to take down, but nmcli rejects that column for `connection show`, so the lookup always failed and only the device was disconnected. The per-profile lookup _connect_nmcli() already used is now _find_profile_for_ssid(), and both callers share it. It also splits terse output on the last colon and unescapes "\:", so a profile name containing a colon is found. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(wifi): write wifi_config.json atomically and report a failed save _save_config() opened the file for writing in place and swallowed any error, so a wifi_config.json left owned by root made the web toggle for auto-enabling AP mode report success while nothing was saved, and a crash mid-write could truncate the file. It now uses atomic_write_json, which also keeps the file's owner and shared group when root saves it, and returns False on failure. POST /wifi/ap/auto-enable answers 500 in that case. The file is now written with indent=4, like the other config files. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(fonts): resolve plugin:// fonts in the plugin's own directory FontManager looked for a plugin's bundled fonts under Path("plugins") / plugin_id: relative to the process cwd, and not the default install directory (plugin-repos/), so a manifest's plugin:// fonts never loaded. register_plugin_fonts() takes an optional plugin_dir, and PluginManager passes the directory it loaded the plugin from. Callers that omit it get a lookup in the configured plugin_system.plugins_directory, then plugins/, resolved against the install root. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(api-helper): cache responses for the requested cache_ttl APIHelper.get(cache_ttl=...) and set_cache(ttl=...) dropped the ttl on the claim that CacheManager does not support one, but CacheManager.set() takes a ttl, stores it with the entry, and both cache tiers honour it over a reader's max_age. Without it every response expired after the 300-second default read age, whatever the plugin asked for. The ttl is now passed through, and the cache read passes cache_ttl as max_age for entries written without one. The class docstring describes what the helper actually does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(style): one scale range for the schema, element_scale and LogoHelper The generated Scale field allowed 0.1 to 10, element_style's reader capped at 10 with no floor, and LogoHelper accepted 0.05 to 8 and reset anything else to 1.0. A logo scale of 9, which the form accepts, drew at the shipped size. MIN_ELEMENT_SCALE / MAX_ELEMENT_SCALE (0.1, 10.0) in src.element_style are now the schema bounds and the clamp every reader applies through coerce_scale(): a positive number outside the range is clamped, and anything that is not a finite positive number means the default. That also stops element_scale() passing NaN through, since min(nan, 10.0) is nan. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(logos): placeholder lands at the requested path; empty logos list download_missing_logo() wrote its fallback placeholder to <normalize_abbreviation(abbr)>.png in the logo directory rather than to the logo_path the caller passed, so it could return True while nothing existed where the plugin looks (e.g. "TA&M.png" vs "TAANDM.png"). create_placeholder_logo() takes an optional filepath, and download_missing_logo passes the requested one. download_missing_logo_for_team() only caught KeyError, so a team whose "logos" list is empty raised IndexError; it now treats KeyError, IndexError and TypeError as "no logo URL". The placeholder is drawn with PLACEHOLDER_SIZE / PLACEHOLDER_BG, the constants is_placeholder_logo() recognises it by, instead of repeated literals. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(fonts): resolve bundled font paths against the install root TextHelper's default font_dir, the logo placeholder's font and FontManager's font_overrides.json were all relative to the process cwd, so a process started anywhere but the install root (the plugin safety harness, a manual run, a unit without WorkingDirectory) drew with PIL's default face and read no overrides. They now go through font_layout.resolve_asset_path; the overrides file sits in the install root's config/. The resolver docstrings described an order the code does not follow: resolve_asset_path never consults the cwd, and sports_shared's _resolve_font_path tries the cwd first. Both docstrings now say what the code does, and _resolve_font_path calls resolve_asset_path instead of probing FontManager for it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(sync): the web UI reads the sync status file the display writes sync_manager writes its status to tempfile.gettempdir(), but GET /api/v3/sync/status read a hardcoded /tmp/led_matrix_sync_status.json and defaulted the port to a literal 5765. Wherever TMPDIR is set (or on any non-/tmp host) the page only ever showed "starting". The endpoint now uses sync_manager.STATUS_FILE and SYNC_PORT. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(http): the rankings resolver sends the project's User-Agent DynamicTeamResolver fetched ESPN rankings with a bare requests.get, so it sent python-requests' default User-Agent, which ESPN rejects; the AP_TOP_N favourites then resolved to nothing. It now sends DEFAULT_HTTP_HEADERS. BaseOddsManager carried its own copy of the User-Agent string and now uses the same shared headers (which also adds Accept-Language). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(backup): record the core release and read the configured plugin dir The manifest's ledmatrix_version came from a VERSION file that does not exist, then from .git/HEAD: a 12-character sha, or "ref: refs/he" when the branch's ref was packed. It is now src.__version__. list_installed_plugins() scanned a hardcoded plugin-repos/, so on an install whose plugin_system.plugins_directory points elsewhere, plugins missing from plugin_state.json were left out of the backup. It now reads the configured directory from config/config.json, defaulting to plugin-repos. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(startup): report a missing display section once A config without a display section produced three errors for the one problem ("Missing required configuration key: display", "Display configuration is missing or empty" and "Display configuration is missing"), and an empty one produced two. _validate_config now reports it once, as a missing key or an empty section, and _validate_display_config leaves it to that. The module docstring said the validator fails fast; nothing in the display service calls raise_on_errors(), so it now says the errors are reported and startup continues. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(wifi): share the copied blocks and name the AP constants - _parse_nmcli_wifi_list() is the one parser behind _scan_nmcli and _scan_nmcli_cached. - _verify_connected(), _wait_for_device_idle(), _failsafe_ap() and _mark_forced() replace blocks that were pasted two or three times in the connect and enable-AP paths. The device-idle wait now checks before its first one-second sleep instead of after it. - _check_command() calls _find_command_path() instead of repeating it. - AP_IP, PORTAL_PORT, AP_PROFILE_NAME and AP_PROFILE_NAMES name values that were spelled out 14, 12, 8 and 2 times; the two deletion loops now walk the same tuple. The iwconfig status path compares the AP address exactly: startswith() also skipped 192.168.4.10-19. - Dropped a second WIFI.SIGNAL query that repeated the first, a no-op "if ssid: continue", the try/except around _connect_wpa_supplicant's constant return, and a second save of a scan scan_networks already saves. - _ensure_wifi_radio_enabled's docstring says it returns True when the radio state cannot be read at all. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(config): drop dead branches and history comments in ConfigManager - The module docstring pointed plugin authors at update_plugin_config(), which does not exist; it now names save_config_atomic() and save_raw_file_content(). - load_config's FileNotFoundError handler tested the message for "config_secrets.json", but a missing secrets file is handled where it is read, so only config.json reaches it; the check is gone. - save_raw_file_content's `file_type == "main" or "secrets"` guard was always true (anything else raised earlier). - get_raw_file_content('secrets') already returns {} for a missing file, so the os.path.exists() in front of two calls to it is gone. - Comments that narrated earlier behaviour are rewritten as what the code does now. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(background-data): present-tense comments, drop unused API - Comments that told the history of each fix (what "used to" happen, "the old per-delivery release") now state the invariant the code keeps. - get_statistics() no longer reports a constant 'queue_size': 0, and the uncalled clear_completed_requests() is gone (_cleanup_completed_requests does that job on every completion). Neither is referenced in core, the web UI or the plugin monorepo. shutdown_background_service() has no production caller either, but it is the only way to tear down the get_background_service() singleton, which the tests rely on, so it stays. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(odds): drop the unread cache_ttl and merge the odds_data branches BaseOddsManager loaded base_odds_manager.cache_ttl from config and never used it: cached odds live for the update interval (get_odds' ttl=interval). No core or monorepo code reads the attribute, so it is gone along with its log line. The two consecutive `if odds_data:` blocks are one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(backup): one table for the single-file sections config, secrets, wifi and ytm_auth were each spelled out in create, preview, validate and restore. _SINGLE_FILE_SECTIONS lists them once, with the RestoreOptions flag that restores each, and all four walk it. Restore error messages keep their wording ("Failed to restore <file name>"). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(fonts): drop FontManager's write-only state and duplicate logs - fonts_config, font_metadata and font_dependencies were written and never read; the performance_stats keys font_load_times, render_times, total_renders and the per-call "resolve" timings (_record_performance_metric) likewise. get_performance_stats() reads only the counters that remain. Nothing in core or the plugin monorepo references any of them. - A failed BDF load was logged twice, by _load_bdf_font and again by get_font; get_font's line is the one kept. - Removed "NEW:" and commented-out cozette entries, the "Copy font to assets/fonts" comment on code that copies nothing, and local imports of names the module already imports. The deprecated add_font() now resolves assets/fonts against the install root. The @deprecated methods stay. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(text-helper): cache loaded fonts; drop the pre-textlength fallback TextHelper declared _font_cache, cleared it and reported its size, but never stored anything in it. load_fonts() now keeps each (file, size) it loads there, so clear_font_cache() and get_font_cache_stats() mean what they say and repeated load_fonts() calls reuse the fonts. get_text_width() no longer catches AttributeError for Pillow releases without ImageDraw.textlength; requirements.txt pins Pillow>=12.2. The class docstring describes what the helper does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(common): fix wrong docstrings in api_helper, permission_utils, snapshot_policy - permission_utils called 0o2775 "sticky bit"; the 2 is setgid, which is what makes new files take the directory's group. - snapshot_policy pointed at web_interface/blueprints/api_v3.py, which is a package now; the health check is in api_v3/misc.py. - APIHelper.clear_cache() lost a history note and a fallback to a clear() method that neither CacheManager nor the testing MockCacheManager has. The session headers are built from DEFAULT_HTTP_HEADERS instead of a copy of them, and the module docstring says what the module offers. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(sports): present-tense comments in the shared scoreboard renderers - sports_scroll and sports_game_renderer comments that referred to "this PR", "the old flat 128px card" or what the renderer "previously" did now describe the current behaviour and its reason. - The block explaining why non-finite settings are rejected sat above _score_reserve_width; it describes _center_gap_width and now lives in it. - unshare_element_fonts wrapped its import of font_layout.load_truetype in an `except ImportError` that cannot fire inside core; the import stays at call time so tests can spy on the pinned loader. - sports_card docstrings that told the history of a fix say what the code does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(sports-shared): drop dead code, name the ESPN limit - _get_weeks_data asked for limit=1000, which fetch_espn_scoreboard clamps to ESPN_MAX_LIMIT anyway; it now names that constant. Its unused `immediate_events = []` is gone. - _get_season_schedule_dates() returned ("", "") and has no caller in core or the plugin monorepo. - _should_log keeps its warning_type parameter (part of the inherited signature, though nothing in core or the monorepo calls it) and its docstring says the cooldown is shared across types. - An unused ImageFont import is gone. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(sync): one follower-mode switch, shared panel defaults - The class docstring said the leader sends PNG frames. Frames go over UDP as raw RGB; PNG is only the Vegas scroll image sent over TCP. It now describes both paths. - _enter_follower_mode() replaces the two copies of "note the leader, switch from standalone to follower, log, write status" in the frame and scroll-position handlers. - The rows/cols fallbacks use DEFAULT_ROWS / DEFAULT_COLS from src.display_geometry, as chain_length already did. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(style): drop _layout_axis, name the layout group title - ElementStyleResolver._layout_axis() had no caller in core or the plugin monorepo. - _element_block_from_spec checked spec['size'] was a dict again after size_spec already had; it reads size_spec. - The "Layout Offsets" title written into three generated schema blocks is _LAYOUT_TITLE. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(logo-helper): say what the placeholder draws; name the 1.5 box factor - _create_placeholder_logo's docstring said it draws the team abbreviation; it draws an outlined grey box and nothing else. The docstring says so, and the "in a real implementation you'd want text" comments are gone. - The 1.5 x panel default logo box, written out six times, is DEFAULT_LOGO_BOX_FACTOR. - ImageDraw is imported with Image at the top of the module. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(logos): drop dead code and a duplicate regex in logo_downloader - _SAFE_LEAGUE_CODE_RE was the same pattern as _SAFE_LEAGUE_RE; both checks use the one. - get_logo_filename_variations reassigned the TA&M case to the list it already had; the function returns the two names directly. - _get_team_name_variations() had no caller in core or the plugin monorepo. - fetch_single_team's docstring was copied from fetch_teams_data; a log message read "for{team_id}". Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor: drop the Pillow<9.1 resample shim and a catch-and-reraise - adaptive_images fell back to Image.LANCZOS/NEAREST for Pillow < 9.1; requirements.txt pins Pillow>=12.2. RESAMPLE_LANCZOS and RESAMPLE_NEAREST keep their names (src.common re-exports them). - CacheManager.save_cache caught CacheError only to re-raise it; the disk write is now called directly, with the same result. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(api-helper): stop the real CacheManager's cleanup thread The cache-lifetime tests built a CacheManager and left its cleanup thread's class-wide claim on the directory in place, which broke test_cache_cleanup_thread_ownership when it ran later in the session. The fixture now stops the thread on teardown. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(changelog): core-common Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
171 lines
6.7 KiB
Python
171 lines
6.7 KiB
Python
"""
|
|
Adaptive image fitting for plugins — the image counterpart to
|
|
src/adaptive_layout.py's text fitting.
|
|
|
|
Promotes the proven in-field image patterns into one shared helper so
|
|
plugins stop hand-copying resize/cache code:
|
|
|
|
- "crop transparent padding, then fill the row height" (football/hockey
|
|
logo pattern) -> ``crop_to_ink=True, mode="fill_height"``
|
|
- "crop-to-fill with a top anchor for faces" (masters-tournament headshot
|
|
pattern) -> ``mode="cover", anchor="top"``
|
|
- "letterbox to fit, centered on a background" (static-image pattern)
|
|
-> ``mode="contain"``
|
|
- NEAREST for pixel art/flags vs LANCZOS for photos (masters flag pattern)
|
|
-> ``resample=RESAMPLE_NEAREST``
|
|
|
|
Unlike PIL's ``thumbnail()`` (downscale-only — the reason plugin imagery
|
|
stays tiny on big panels), ``fit_image`` upscales by default so content
|
|
genuinely adapts to larger displays; pass ``upscale=False`` for the old
|
|
behavior.
|
|
|
|
Use via ``LayoutContext.fit_image(...)`` (cached per panel size) or
|
|
``BasePlugin.draw_image(...)``; the module-level functions are the
|
|
uncached primitives.
|
|
"""
|
|
|
|
from dataclasses import dataclass
|
|
from typing import Any, Optional, Tuple
|
|
|
|
from PIL import Image
|
|
|
|
# Re-exported by src.common for plugins, which import them from there.
|
|
RESAMPLE_LANCZOS = Image.Resampling.LANCZOS
|
|
RESAMPLE_NEAREST = Image.Resampling.NEAREST
|
|
|
|
FIT_MODES = ("contain", "cover", "fill_height", "stretch")
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class ImageFitResult:
|
|
"""A processed RGBA copy of a source image, sized for a target box."""
|
|
image: Image.Image
|
|
width: int
|
|
height: int
|
|
scale: float # scale applied vs the (possibly ink-cropped) source
|
|
mode: str
|
|
source_size: Tuple[int, int]
|
|
|
|
@property
|
|
def is_empty(self) -> bool:
|
|
return self.width <= 0 or self.height <= 0
|
|
|
|
|
|
_EMPTY_IMAGE = Image.new("RGBA", (1, 1), (0, 0, 0, 0))
|
|
|
|
|
|
def _empty_result(mode: str, source_size: Tuple[int, int]) -> ImageFitResult:
|
|
return ImageFitResult(_EMPTY_IMAGE, 0, 0, 0.0, mode, source_size)
|
|
|
|
|
|
def _box_dims(box: Any) -> Tuple[int, int]:
|
|
"""Accept a Region (duck-typed .w/.h) or a (w, h) tuple."""
|
|
if hasattr(box, "w") and hasattr(box, "h"):
|
|
return (int(box.w), int(box.h))
|
|
w, h = box
|
|
return (int(w), int(h))
|
|
|
|
|
|
def fit_image(img: Image.Image, box: Any, *, mode: str = "contain",
|
|
crop_to_ink: bool = False, anchor: str = "center",
|
|
resample: Any = None, upscale: bool = True) -> ImageFitResult:
|
|
"""Fit an image into a box, preserving crispness policy per content type.
|
|
|
|
Args:
|
|
img: Source PIL image (any mode; output is always RGBA).
|
|
box: Region or (w, h) target box.
|
|
mode: "contain" (letterbox), "cover" (crop-to-fill),
|
|
"fill_height" (height == box height, contain-capped by width),
|
|
"stretch" (exact resize).
|
|
crop_to_ink: Trim fully-transparent padding (getbbox) before fitting —
|
|
logos shipped with generous padding otherwise render small.
|
|
anchor: For "cover" crops: "center" or "top" (keeps faces/tops).
|
|
resample: PIL resampling filter; defaults to RESAMPLE_LANCZOS.
|
|
Use RESAMPLE_NEAREST for pixel art, flags, and sprite icons.
|
|
upscale: Allow scaling above source size (default True — the adaptive
|
|
point). False mimics the legacy thumbnail() behavior.
|
|
"""
|
|
if mode not in FIT_MODES:
|
|
raise ValueError(f"Unknown fit mode '{mode}' (expected one of {FIT_MODES})")
|
|
box_w, box_h = _box_dims(box)
|
|
if box_w <= 0 or box_h <= 0 or img.width <= 0 or img.height <= 0:
|
|
return _empty_result(mode, img.size)
|
|
|
|
resample = RESAMPLE_LANCZOS if resample is None else resample
|
|
|
|
work = img if img.mode == "RGBA" else img.convert("RGBA")
|
|
if crop_to_ink:
|
|
bbox = work.getbbox()
|
|
if bbox is None: # fully transparent
|
|
return _empty_result(mode, img.size)
|
|
work = work.crop(bbox)
|
|
|
|
src_w, src_h = work.size
|
|
|
|
if mode == "stretch":
|
|
out = work.resize((box_w, box_h), resample)
|
|
return ImageFitResult(out, box_w, box_h, box_w / src_w, mode, (src_w, src_h))
|
|
|
|
if mode == "cover":
|
|
scale = max(box_w / src_w, box_h / src_h)
|
|
if not upscale:
|
|
scale = min(scale, 1.0)
|
|
scaled_w = max(1, round(src_w * scale))
|
|
scaled_h = max(1, round(src_h * scale))
|
|
out = work.resize((scaled_w, scaled_h), resample)
|
|
# Crop the overhang down to the box (only when the scaled image is
|
|
# larger; with upscale=False it may be smaller and is left as-is).
|
|
crop_w, crop_h = min(box_w, scaled_w), min(box_h, scaled_h)
|
|
left = (scaled_w - crop_w) // 2
|
|
top = 0 if anchor == "top" else (scaled_h - crop_h) // 2
|
|
out = out.crop((left, top, left + crop_w, top + crop_h))
|
|
return ImageFitResult(out, out.width, out.height, scale, mode, (src_w, src_h))
|
|
|
|
# contain / fill_height share the "preserve aspect, no crop" path
|
|
if mode == "fill_height":
|
|
scale = box_h / src_h
|
|
# contain-cap: never exceed the box width (football's logo_slot rule)
|
|
scale = min(scale, box_w / src_w)
|
|
else: # contain
|
|
scale = min(box_w / src_w, box_h / src_h)
|
|
if not upscale:
|
|
scale = min(scale, 1.0)
|
|
out_w = max(1, round(src_w * scale))
|
|
out_h = max(1, round(src_h * scale))
|
|
if (out_w, out_h) == (src_w, src_h):
|
|
# No resize needed — but `work` may still BE the caller's original
|
|
# image (RGBA source, no ink crop). The result must always be an
|
|
# independent copy: LayoutContext caches ImageFitResults, and an
|
|
# aliased image would let later mutations of the source corrupt
|
|
# cached fits (or vice versa).
|
|
out = work.copy() if work is img else work
|
|
else:
|
|
out = work.resize((out_w, out_h), resample)
|
|
return ImageFitResult(out, out_w, out_h, scale, mode, (src_w, src_h))
|
|
|
|
|
|
def draw_fitted_image(display_manager: Any, ifit: ImageFitResult, box: Any, *,
|
|
align: str = "center", valign: str = "center",
|
|
offset: Tuple[int, int] = (0, 0)) -> Optional[Tuple[int, int]]:
|
|
"""Paste a fitted image aligned within a Region onto the display canvas.
|
|
|
|
Pastes with the image's own alpha mask. Returns the (x, y) actually used
|
|
so callers can position adjacent decorations, or None when nothing was
|
|
drawn (empty fit / no canvas).
|
|
"""
|
|
if ifit is None or ifit.is_empty:
|
|
return None
|
|
image = getattr(display_manager, "image", None)
|
|
if image is None:
|
|
return None
|
|
if hasattr(box, "align_xy"):
|
|
x, y = box.align_xy(ifit.width, ifit.height, align, valign)
|
|
else:
|
|
box_w, box_h = _box_dims(box)
|
|
x = (box_w - ifit.width) // 2
|
|
y = (box_h - ifit.height) // 2
|
|
x += int(offset[0])
|
|
y += int(offset[1])
|
|
image.paste(ifit.image, (x, y), ifit.image)
|
|
return (x, y)
|