mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-10 17:16:36 +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>
536 lines
22 KiB
Python
536 lines
22 KiB
Python
"""Shared scroll-display scaffolding for the sports scoreboards.
|
|
|
|
Ten plugins ship a `scroll_display.py`. A method-level comparison of the eight
|
|
that share a shape (f1 and ufc are genuine forks) found a sharp split, and this
|
|
module is drawn along it rather than around all of it:
|
|
|
|
* The **orchestration layer is converged** — ``get_all_vegas_content_items`` is
|
|
byte-identical in all eight, and ``clear_all``, ``get_scroll_info``,
|
|
``get_dynamic_duration``, ``is_complete`` and ``display_frame`` are 96-100%
|
|
similar. That is what lives here.
|
|
* The **content layer has genuinely diverged** — ``prepare_scroll_content`` has
|
|
eight distinct bodies across eight plugins (145 lines, 53% similarity at
|
|
worst) and ``_load_separator_icons`` seven (6% at worst). Those build each
|
|
sport's game cards and icon strip; they are *not* drift to be merged but
|
|
per-sport rendering. They stay override points here, permanently.
|
|
|
|
Promoting the content layer would be exactly the mistake
|
|
``docs/SPORTS_UNIFICATION.md`` warns against — merging on the intuition that
|
|
same-named methods are the same method. Same name, different job.
|
|
|
|
What this module adds over the plugin copies is pacing through
|
|
:mod:`src.common.scroll_config`, the resolver every other scroller uses: the
|
|
configured px/s is snapped to a whole-pixel speed for the panel's refresh, the
|
|
helper steps a fixed number of pixels per presented frame, and each drawn frame
|
|
publishes the frame hold to the display manager. Speed depends only on
|
|
``scroll_speed`` and the panel refresh
|
|
(``display.hardware.limit_refresh_rate_hz``) -- not on the global
|
|
``target_fps``, and not on ``scroll_delay``, which is kept in the settings for
|
|
compatibility only.
|
|
|
|
Usage::
|
|
|
|
class HockeyScrollDisplay(SportsScrollDisplay):
|
|
SCROLL_LEAGUE_KEYS = ("nhl", "ncaa_mens", "ncaam_hockey")
|
|
|
|
def prepare_scroll_content(self, games, game_type, leagues, rankings=None):
|
|
... # build this sport's cards
|
|
|
|
class HockeyScrollDisplayManager(SportsScrollDisplayManager):
|
|
display_class = HockeyScrollDisplay
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import time
|
|
from typing import Any, Dict, List, Optional
|
|
|
|
from PIL import Image
|
|
|
|
from src.common import scroll_config
|
|
from src.common.scroll_helper import ScrollHelper
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
#: Defaults every copy agreed on. A subclass overrides
|
|
#: :meth:`SportsScrollDisplay.scroll_settings_defaults` to change them —
|
|
#: the soccer lineage uses a 24px gap and min/max duration keys instead.
|
|
DEFAULT_SCROLL_SETTINGS: Dict[str, Any] = {
|
|
"scroll_speed": 50.0,
|
|
"scroll_delay": 0.01,
|
|
"gap_between_games": 48,
|
|
"show_league_separators": True,
|
|
"dynamic_duration": True,
|
|
}
|
|
|
|
#: Pacing to assume when scroll_delay is 0, i.e. the plugin has not set one.
|
|
#: Only used to interpret this module's own px/frame config shape; the speed
|
|
#: bounds and the px/s -> px/frame conversion belong to scroll_config now.
|
|
ASSUMED_FPS_WHEN_UNPACED = 100.0
|
|
|
|
|
|
class SportsScrollDisplay:
|
|
"""One scrolling strip of game cards.
|
|
|
|
Subclasses supply the content (:meth:`prepare_scroll_content`) and,
|
|
optionally, the per-sport league ladder and separator icons. Everything
|
|
else — helper configuration, frame pumping, completion, state — is here.
|
|
"""
|
|
|
|
#: Config keys to walk when looking for per-league ``scroll_settings``,
|
|
#: most-preferred first. A sport's own league names, which is the *only*
|
|
#: reason the eight copies of ``_get_scroll_settings`` differ. Empty means
|
|
#: the plugin has no per-league scroll settings.
|
|
SCROLL_LEAGUE_KEYS: tuple = ()
|
|
|
|
#: Config block holding scroll settings when the plugin keeps them in one
|
|
#: place rather than per league (the afl/nrl/soccer shape).
|
|
SCROLL_CONFIG_KEY: Optional[str] = None
|
|
|
|
def __init__(
|
|
self,
|
|
display_manager,
|
|
config: Dict[str, Any],
|
|
custom_logger: Optional[logging.Logger] = None,
|
|
global_config: Optional[Dict[str, Any]] = None,
|
|
):
|
|
"""
|
|
:param display_manager: the core display manager
|
|
:param config: the plugin's configuration
|
|
:param custom_logger: the plugin's logger, so scroll lines are attributed
|
|
:param global_config: the LEDMatrix global config, consulted for the
|
|
panel refresh when the display manager cannot report one.
|
|
Optional so an older caller that does not pass it keeps working.
|
|
"""
|
|
self.display_manager = display_manager
|
|
self.config = config
|
|
self.logger = custom_logger or logger
|
|
self.global_config = global_config or {}
|
|
|
|
if getattr(display_manager, "matrix", None) is not None:
|
|
self.display_width = display_manager.matrix.width
|
|
self.display_height = display_manager.matrix.height
|
|
else:
|
|
self.display_width = getattr(display_manager, "width", 128)
|
|
self.display_height = getattr(display_manager, "height", 32)
|
|
|
|
self.scroll_helper = ScrollHelper(
|
|
self.display_width, self.display_height, self.logger
|
|
)
|
|
self._configure_scroll_helper()
|
|
|
|
self._logo_cache: Dict[str, Image.Image] = {}
|
|
self._separator_icons: Dict[str, Image.Image] = {}
|
|
self._load_separator_icons()
|
|
|
|
self._current_games: List[Dict] = []
|
|
self._current_game_type: str = ""
|
|
self._current_leagues: List[str] = []
|
|
self._vegas_content_items: List[Image.Image] = []
|
|
self._is_scrolling = False
|
|
self._scroll_start_time: Optional[float] = None
|
|
self._last_log_time: float = 0
|
|
self._log_interval: float = 5.0
|
|
self._frame_count: int = 0
|
|
self._fps_sample_start: float = time.time()
|
|
|
|
# ------------------------------------------------------------------
|
|
# Override points
|
|
# ------------------------------------------------------------------
|
|
|
|
def prepare_scroll_content(
|
|
self,
|
|
games: List[Dict],
|
|
game_type: str,
|
|
leagues: List[str],
|
|
rankings_cache: Optional[Dict[str, int]] = None,
|
|
) -> bool:
|
|
"""Render ``games`` into one wide image and hand it to the scroll helper.
|
|
|
|
**Per-sport by nature, not by drift** — the eight plugin copies have
|
|
eight different bodies because each draws its own card. Implementations
|
|
build the strip, hand it over with
|
|
``self.scroll_helper.set_scrolling_image(...)`` (or
|
|
``create_scrolling_image(...)`` from a list of cards), and record
|
|
``self._current_games`` / ``_current_game_type`` / ``_current_leagues``.
|
|
|
|
:returns: True when there is content to scroll.
|
|
"""
|
|
raise NotImplementedError(
|
|
f"{type(self).__name__} must implement prepare_scroll_content(); "
|
|
"it builds this sport's game cards and is not shared code."
|
|
)
|
|
|
|
def _load_separator_icons(self) -> None:
|
|
"""Populate ``self._separator_icons``. Per-sport; no-op by default."""
|
|
|
|
def scroll_settings_defaults(self) -> Dict[str, Any]:
|
|
"""The baseline scroll settings before any config is applied."""
|
|
defaults = dict(DEFAULT_SCROLL_SETTINGS)
|
|
defaults["game_card_width"] = self.display_width
|
|
return defaults
|
|
|
|
# ------------------------------------------------------------------
|
|
# Settings
|
|
# ------------------------------------------------------------------
|
|
|
|
def _get_scroll_settings(self, league: Optional[str] = None) -> Dict[str, Any]:
|
|
"""Resolve scroll settings: defaults, then the most specific override.
|
|
|
|
Precedence: the named ``league``, then each entry of
|
|
:attr:`SCROLL_LEAGUE_KEYS` in order, then :attr:`SCROLL_CONFIG_KEY`.
|
|
The eight plugin copies implement exactly this and differ only in which
|
|
league names they walk — which is why the ladder is data here rather
|
|
than a body per sport.
|
|
"""
|
|
settings = self.scroll_settings_defaults()
|
|
|
|
candidates: List[str] = []
|
|
if league:
|
|
candidates.append(league)
|
|
candidates.extend(self.SCROLL_LEAGUE_KEYS)
|
|
for key in candidates:
|
|
override = (self.config.get(key) or {}).get("scroll_settings")
|
|
if override:
|
|
return {**settings, **override}
|
|
|
|
if self.SCROLL_CONFIG_KEY:
|
|
override = self.config.get(self.SCROLL_CONFIG_KEY) or {}
|
|
if override:
|
|
return {**settings, **override}
|
|
return settings
|
|
|
|
def _coerce_float(self, value: Any, default: float) -> float:
|
|
"""A usable float from config, or ``default``.
|
|
|
|
``dict.get(key, default)`` only helps when the key is *absent*; a key
|
|
present with ``null`` or a string returns that value verbatim and blows
|
|
up in the arithmetic below — inside ``__init__``, so the whole display
|
|
fails to construct.
|
|
"""
|
|
if value is None:
|
|
return default
|
|
try:
|
|
return float(value)
|
|
except (TypeError, ValueError):
|
|
self.logger.warning(
|
|
"Ignoring unusable scroll setting %r; using %s", value, default
|
|
)
|
|
return default
|
|
|
|
def _configure_scroll_helper(self) -> None:
|
|
"""Apply config to the scroll helper. Safe to call again after a change."""
|
|
settings = self._get_scroll_settings()
|
|
|
|
dynamic_duration = bool(settings.get("dynamic_duration", True))
|
|
self.scroll_helper.set_dynamic_duration_settings(
|
|
enabled=dynamic_duration,
|
|
min_duration=settings.get("min_duration", 30),
|
|
max_duration=settings.get("max_duration", 600),
|
|
buffer=0.2, # ensure the strip clears the panel completely
|
|
)
|
|
|
|
# Speed goes through scroll_config, which every other scrolling plugin
|
|
# already uses. What must NOT happen is handing it this module's
|
|
# settings dict: the two read the same key names with different
|
|
# meanings, and the collision is a factor of 1/scroll_delay.
|
|
#
|
|
# sports_scroll: scroll_speed is px/SECOND; scroll_delay is ignored
|
|
# for pacing (see _resolve_pixels_per_second).
|
|
# scroll_config: scroll_speed is px per STEP, so px/s = speed/delay.
|
|
#
|
|
# Passing {"scroll_speed": 50.0, "scroll_delay": 0.01} straight through
|
|
# resolves to 5000 px/s (clamped to 500) instead of 50. So this module
|
|
# keeps ownership of reading its own config -- _get_scroll_settings
|
|
# merges the league overrides -- and hands the resolver a plain px/s.
|
|
pixels_per_second = self._resolve_pixels_per_second(settings)
|
|
|
|
resolved = scroll_config.configure(
|
|
self.scroll_helper,
|
|
plugin_config=None,
|
|
global_config=self.global_config,
|
|
default_pixels_per_second=pixels_per_second,
|
|
display_manager=self.display_manager,
|
|
plugin_logger=self.logger,
|
|
refresh_hz=self._resolve_refresh_hz(),
|
|
)
|
|
self._scroll_settings = resolved
|
|
self.logger.info(
|
|
"ScrollHelper configured: %s (requested %.1f px/s), "
|
|
"dynamic_duration=%s",
|
|
resolved.describe(),
|
|
pixels_per_second, dynamic_duration,
|
|
)
|
|
|
|
def _resolve_pixels_per_second(self, settings: Dict[str, Any]) -> float:
|
|
"""This module's config shape, expressed as plain pixels per second.
|
|
|
|
``scroll_speed`` is already px/s here, and it is the whole answer.
|
|
``scroll_delay`` is kept in the settings for compatibility but is
|
|
ignored for pacing: the frame rate is the panel refresh divided by the
|
|
frame hold scroll_config picks, so no positive delay changes the speed.
|
|
The one exception is a delay of exactly 0 (below every scoreboard
|
|
schema's minimum), which is read as ``scroll_speed`` being px per
|
|
frame at ``ASSUMED_FPS_WHEN_UNPACED``.
|
|
"""
|
|
scroll_speed = self._coerce_float(settings.get("scroll_speed"), 50.0)
|
|
scroll_delay = self._coerce_float(settings.get("scroll_delay"), 0.01)
|
|
if scroll_delay <= 0:
|
|
return scroll_speed * ASSUMED_FPS_WHEN_UNPACED
|
|
return scroll_speed
|
|
|
|
def _resolve_refresh_hz(self) -> float:
|
|
"""The panel refresh the crisp ladder should be computed against.
|
|
|
|
This has to be the rate frames are actually presented at, because the
|
|
helper advances a fixed number of whole pixels per presented frame and
|
|
the display manager holds each frame for ``frame_hold`` refreshes. A
|
|
ladder built for any other rate plays back at the wrong speed: built
|
|
for 60 Hz and shown on a 100 Hz panel, it runs 100/60 too fast.
|
|
|
|
So it is the display manager's ``refresh_hz`` (what the panel is
|
|
driven at), then ``display.hardware.limit_refresh_rate_hz`` from the
|
|
global config, then scroll_config's default. The global ``target_fps``
|
|
is deliberately NOT consulted: before frame-locked presentation it was
|
|
the rate frames were shown at, but now honouring it only turned the
|
|
General tab's "Scroll Frame Rate" into a scoreboard speed multiplier.
|
|
"""
|
|
reported = getattr(self.display_manager, "refresh_hz", None)
|
|
# A real number only: a stub or a mock answering for anything must not
|
|
# become the refresh rate.
|
|
if (isinstance(reported, (int, float)) and not isinstance(reported, bool)
|
|
and reported > 0):
|
|
return float(reported)
|
|
return scroll_config.refresh_hz_from_config(self.global_config)
|
|
|
|
def _scroll_frame_hold(self) -> int:
|
|
"""Refreshes to hold each frame for, from the resolved settings."""
|
|
return getattr(getattr(self, "_scroll_settings", None), "frame_hold", 1)
|
|
|
|
# ------------------------------------------------------------------
|
|
# Frame pumping
|
|
# ------------------------------------------------------------------
|
|
|
|
def display_scroll_frame(self) -> bool:
|
|
"""Advance and render one frame.
|
|
|
|
:returns: True if a frame was drawn; False when there is no content or
|
|
the frame could not be rendered.
|
|
"""
|
|
if not self.scroll_helper.cached_image:
|
|
return False
|
|
|
|
try:
|
|
# Inside the try, not before it: advancing the position and cropping
|
|
# the visible slice are as capable of raising as the display push,
|
|
# and the promise below is that no frame failure reaches the
|
|
# plugin's loop.
|
|
self.scroll_helper.update_scroll_position()
|
|
visible = self.scroll_helper.get_visible_portion()
|
|
if not visible:
|
|
return False
|
|
|
|
# Tell the core the panel is scrolling, and for how many
|
|
# refreshes to hold each frame. The helper advances a fixed number
|
|
# of whole pixels per presented frame, so without the hold a new
|
|
# frame is presented every refresh and the scroll runs frame_hold
|
|
# times too fast. And because deferred updates only run while
|
|
# nothing is scrolling, core would otherwise run blocking work in
|
|
# the middle of this scroll.
|
|
if hasattr(self.display_manager, "set_scrolling_state"):
|
|
self.display_manager.set_scrolling_state(
|
|
True, frame_hold=self._scroll_frame_hold())
|
|
|
|
self.display_manager.image = visible
|
|
self.display_manager.update_display()
|
|
self._frame_count += 1
|
|
self.scroll_helper.log_frame_rate()
|
|
self._log_scroll_progress()
|
|
except Exception:
|
|
# A display failure must not propagate into the plugin's loop.
|
|
self.logger.exception("Error displaying scroll frame")
|
|
return False
|
|
return True
|
|
|
|
def _log_scroll_progress(self) -> None:
|
|
"""Emit a throttled progress line."""
|
|
now = time.time()
|
|
if now - self._last_log_time < self._log_interval:
|
|
return
|
|
self._last_log_time = now
|
|
elapsed = now - self._fps_sample_start
|
|
fps = self._frame_count / elapsed if elapsed > 0 else 0.0
|
|
self.logger.debug(
|
|
f"Scrolling {len(self._current_games)} {self._current_game_type} "
|
|
f"game(s) at {fps:.1f} FPS"
|
|
)
|
|
|
|
def is_scroll_complete(self) -> bool:
|
|
"""True when the strip has scrolled fully past the panel."""
|
|
complete = self.scroll_helper.is_scroll_complete()
|
|
if complete:
|
|
self._release_scrolling_state()
|
|
return complete
|
|
|
|
def _release_scrolling_state(self) -> None:
|
|
"""Tell the core this display is no longer scrolling.
|
|
|
|
The scrolling flag and the frame hold are global to the display
|
|
manager, so leaving them set holds every other plugin's frames too.
|
|
"""
|
|
if hasattr(self.display_manager, "set_scrolling_state"):
|
|
self.display_manager.set_scrolling_state(False)
|
|
|
|
def reset_scroll(self) -> None:
|
|
"""Return the strip to its starting position, keeping the content."""
|
|
self.scroll_helper.reset_scroll()
|
|
self._frame_count = 0
|
|
self._fps_sample_start = time.time()
|
|
self.logger.debug("Scroll position reset")
|
|
|
|
def clear(self) -> None:
|
|
"""Drop cached content and reset tracking state."""
|
|
self.scroll_helper.clear_cache()
|
|
self._current_games = []
|
|
self._current_game_type = ""
|
|
self._current_leagues = []
|
|
self._vegas_content_items = []
|
|
self._is_scrolling = False
|
|
self._scroll_start_time = None
|
|
self._release_scrolling_state()
|
|
self.logger.debug("Scroll display cleared")
|
|
|
|
# ------------------------------------------------------------------
|
|
# Introspection
|
|
# ------------------------------------------------------------------
|
|
|
|
def get_dynamic_duration(self) -> int:
|
|
"""How long this content needs to scroll fully, in seconds."""
|
|
return self.scroll_helper.get_dynamic_duration()
|
|
|
|
def has_cached_content(self) -> bool:
|
|
"""Whether content is prepared and ready to scroll."""
|
|
return bool(self.scroll_helper.cached_image)
|
|
|
|
def get_current_game_count(self) -> int:
|
|
return len(self._current_games)
|
|
|
|
def get_current_leagues(self) -> List[str]:
|
|
return list(self._current_leagues)
|
|
|
|
def get_scroll_info(self) -> Dict[str, Any]:
|
|
"""Helper state plus this display's tracking state, for logging/debug."""
|
|
info = self.scroll_helper.get_scroll_info()
|
|
info.update(
|
|
{
|
|
"game_count": len(self._current_games),
|
|
"game_type": self._current_game_type,
|
|
"leagues": self._current_leagues,
|
|
"is_scrolling": self._is_scrolling,
|
|
}
|
|
)
|
|
return info
|
|
|
|
|
|
class SportsScrollDisplayManager:
|
|
"""One :class:`SportsScrollDisplay` per game type ('live'/'recent'/'upcoming').
|
|
|
|
Subclasses set :attr:`display_class`; everything else was near-identical
|
|
across the eight plugin copies.
|
|
"""
|
|
|
|
#: The SportsScrollDisplay subclass to instantiate per game type.
|
|
display_class = SportsScrollDisplay
|
|
|
|
def __init__(
|
|
self,
|
|
display_manager,
|
|
config: Dict[str, Any],
|
|
custom_logger: Optional[logging.Logger] = None,
|
|
global_config: Optional[Dict[str, Any]] = None,
|
|
):
|
|
self.display_manager = display_manager
|
|
self.config = config
|
|
self.logger = custom_logger or logger
|
|
self.global_config = global_config or {}
|
|
self._scroll_displays: Dict[str, SportsScrollDisplay] = {}
|
|
# "" rather than None, matching SportsScrollDisplay's own empty value —
|
|
# both are falsy, so `game_type or self._current_game_type` behaved
|
|
# either way, but two spellings of "nothing active" across two classes
|
|
# is a trap for anyone comparing state between them.
|
|
self._current_game_type: str = ""
|
|
|
|
def get_scroll_display(self, game_type: str) -> SportsScrollDisplay:
|
|
"""The display for ``game_type``, created on first use."""
|
|
if game_type not in self._scroll_displays:
|
|
self._scroll_displays[game_type] = self.display_class(
|
|
self.display_manager,
|
|
self.config,
|
|
self.logger,
|
|
global_config=self.global_config,
|
|
)
|
|
return self._scroll_displays[game_type]
|
|
|
|
def prepare_and_display(
|
|
self,
|
|
games: List[Dict],
|
|
game_type: str,
|
|
leagues: List[str],
|
|
rankings_cache: Optional[Dict[str, int]] = None,
|
|
) -> bool:
|
|
"""Build content for ``game_type`` and make it the active strip."""
|
|
scroll_display = self.get_scroll_display(game_type)
|
|
try:
|
|
success = scroll_display.prepare_scroll_content(
|
|
games, game_type, leagues, rankings_cache
|
|
)
|
|
except Exception:
|
|
# prepare_scroll_content is subclass-implemented and builds cards
|
|
# straight from feed data, so it can raise on a malformed payload.
|
|
# One sport's bad payload must not take down the shared
|
|
# orchestration for the others.
|
|
self.logger.exception(
|
|
"Error preparing scroll content for game_type=%s", game_type
|
|
)
|
|
return False
|
|
if success:
|
|
self._current_game_type = game_type
|
|
return success
|
|
|
|
def display_frame(self, game_type: Optional[str] = None) -> bool:
|
|
"""Advance the active strip (or a named one) by one frame."""
|
|
game_type = game_type or self._current_game_type
|
|
if not game_type:
|
|
return False
|
|
scroll_display = self._scroll_displays.get(game_type)
|
|
if scroll_display is None:
|
|
return False
|
|
return scroll_display.display_scroll_frame()
|
|
|
|
def is_complete(self, game_type: Optional[str] = None) -> bool:
|
|
"""True when the strip has finished — including when there isn't one,
|
|
so a caller waiting on completion is never wedged."""
|
|
game_type = game_type or self._current_game_type
|
|
if not game_type:
|
|
return True
|
|
scroll_display = self._scroll_displays.get(game_type)
|
|
if scroll_display is None:
|
|
return True
|
|
return scroll_display.is_scroll_complete()
|
|
|
|
def clear_all(self) -> None:
|
|
"""Clear every display and forget which one was active."""
|
|
for scroll_display in self._scroll_displays.values():
|
|
scroll_display.clear()
|
|
self._current_game_type = ""
|
|
|
|
def get_all_vegas_content_items(self) -> List[Image.Image]:
|
|
"""Every display's Vegas items, for splicing into the marquee."""
|
|
items: List[Image.Image] = []
|
|
for scroll_display in self._scroll_displays.values():
|
|
vegas_items = getattr(scroll_display, "_vegas_content_items", None)
|
|
if vegas_items:
|
|
items.extend(vegas_items)
|
|
return items
|