mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-05 06:45:09 +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>
246 lines
11 KiB
Python
246 lines
11 KiB
Python
"""The scroll/Vegas card geometry the sports scoreboards all share.
|
|
|
|
Eight scoreboards -- afl, baseball, basketball, football, hockey, lacrosse,
|
|
nrl and soccer -- each carried their own ``game_renderer.py``. After the card
|
|
helpers moved to ``src/common/sports_card.py`` the settings lookups were
|
|
shared, but the *geometry* was not: nine methods that decide how wide the
|
|
centre gap is, how much room a logo gets, and where an upcoming card's date
|
|
and time land were still eight separate copies. Five were byte-identical
|
|
across all eight plugins; the other four were identical in seven, with a
|
|
different single outlier each time.
|
|
|
|
That last detail is why this is a mixin rather than free functions. There is
|
|
no per-sport branching to write -- baseball needs its own
|
|
``_draw_upcoming_game_status`` and ``_logo_slot_width``, hockey its own
|
|
``_upcoming_date_and_time``, football its own ``_score_reserve_width``, and
|
|
every one of those is an ordinary override. The seven that agree inherit and
|
|
say nothing.
|
|
|
|
It is deliberately *only* a mixin: no ``__init__``, no state of its own. The
|
|
plugins' constructors differ in six ways and none of that difference is worth
|
|
unifying, so adoption is one line on the class statement plus deleting the
|
|
methods that now come from here.
|
|
|
|
What a host class must provide
|
|
------------------------------
|
|
Attributes: ``display_width``, ``display_height``, ``config``, ``fonts``,
|
|
``logger``, ``_team_rankings_cache``.
|
|
|
|
Methods: ``_draw_text_with_outline(draw, text, position, font, fill=None,
|
|
outline_color=(0, 0, 0))`` -- the one hook whose body genuinely varies -- plus
|
|
the ``sports_card`` delegations ``_scroll_card_option``,
|
|
``_upcoming_center_mode``, ``_vs_text``, ``_element_color``,
|
|
``_format_game_date`` and ``_format_game_time``.
|
|
"""
|
|
|
|
import math
|
|
from typing import ClassVar, Dict, Tuple
|
|
|
|
from PIL import Image, ImageDraw
|
|
|
|
|
|
class SportsGameRendererMixin:
|
|
"""Shared card geometry for the sports scoreboards. See module docstring."""
|
|
|
|
#: Centre strip as a fraction of card width, before clamping.
|
|
CENTER_GAP_RATIO: ClassVar[float] = 0.28
|
|
#: Clamp floor for the derived centre gap.
|
|
CENTER_GAP_MIN_PX: ClassVar[int] = 22
|
|
#: Clamp ceiling for the derived centre gap.
|
|
CENTER_GAP_MAX_PX: ClassVar[int] = 40
|
|
#: Breathing room kept between the score and each logo.
|
|
_SCORE_LOGO_GUTTER_PX: ClassVar[int] = 4
|
|
#: Widest score the centre strip must fit. Leagues that can reach three
|
|
#: digits a side override this with "000-000".
|
|
_SCORE_PROBE: ClassVar[str] = "00-00"
|
|
|
|
# ---- geometry ------------------------------------------------------
|
|
|
|
def _score_reserve_width(self) -> int:
|
|
"""Centre strip the score needs: the width of _SCORE_PROBE in the
|
|
score font plus a gutter each side, or 0 if it cannot be measured.
|
|
|
|
Measured rather than derived from the card width, because the score's
|
|
size comes from config and the element-style resolver: a strip sized
|
|
from the width alone lets a large score run over the logos.
|
|
"""
|
|
try:
|
|
probe = ImageDraw.Draw(Image.new("RGB", (4, 4)))
|
|
width = probe.textlength(self._SCORE_PROBE, font=self.fonts['score'])
|
|
return int(width) + 2 * self._SCORE_LOGO_GUTTER_PX
|
|
except Exception:
|
|
self.logger.debug("Score reserve measurement failed", exc_info=True)
|
|
return 0
|
|
|
|
def _center_gap_width(self) -> int:
|
|
"""Width of the middle strip kept clear of logos.
|
|
|
|
``scroll_card.center_gap`` pins it outright; otherwise it scales with
|
|
the card width between the configurable min and max. 0 restores
|
|
edge-to-edge logos.
|
|
"""
|
|
# Non-finite settings are rejected before any int()/round(): "inf"
|
|
# arrives from config as a float or a string, passes the isinstance
|
|
# and >= 0 checks, and int() then raises OverflowError, which would
|
|
# abort the whole card render.
|
|
configured = self._scroll_card_option("center_gap")
|
|
if (isinstance(configured, (int, float))
|
|
and math.isfinite(configured) and configured >= 0):
|
|
return int(configured)
|
|
ratio = self._scroll_card_option("center_gap_ratio", self.CENTER_GAP_RATIO)
|
|
low = self._scroll_card_option("center_gap_min", self.CENTER_GAP_MIN_PX)
|
|
high = self._scroll_card_option("center_gap_max", self.CENTER_GAP_MAX_PX)
|
|
try:
|
|
ratio, low, high = float(ratio), float(low), float(high)
|
|
if not (math.isfinite(ratio) and math.isfinite(low)
|
|
and math.isfinite(high)):
|
|
return self.CENTER_GAP_MIN_PX
|
|
scaled = round(self.display_width * ratio)
|
|
derived = int(max(int(low), min(int(high), scaled)))
|
|
# A strip narrower than the score is the bug, not a style choice.
|
|
# An explicit ``center_gap`` is still honoured above, including 0.
|
|
return max(derived, self._score_reserve_width())
|
|
except (TypeError, ValueError, OverflowError):
|
|
return self.CENTER_GAP_MIN_PX
|
|
|
|
def _logo_slot_width(self) -> int:
|
|
"""Per-side logo slot, leaving the center gap clear.
|
|
|
|
Not capped at display_height: the card is sized as two full-height
|
|
logos plus the measured gap, so what is left after the gap is exactly
|
|
the logo's share. At least 8 px.
|
|
"""
|
|
available = (self.display_width - self._center_gap_width()) // 2
|
|
return max(8, available)
|
|
|
|
def _logo_cache_key(self, name: str) -> str:
|
|
"""Cache key scoped to the logo slot.
|
|
|
|
One cache dict is shared by renderers built for different card widths,
|
|
so a logo sized for a wide slot must not be handed to a narrow one.
|
|
"""
|
|
return f"{name}@{self._logo_slot_width()}x{self.display_height}"
|
|
|
|
def _layout_offset(self, element: str, axis: str, default: int = 0) -> int:
|
|
"""X/Y nudge for one element, from customization.layout.
|
|
|
|
Same block the full-screen scorebug reads (sports.py
|
|
_get_layout_offset), so a nudge configured in the web UI moves the
|
|
element on the scroll/Vegas card as well as on the scorebug.
|
|
"""
|
|
from src.element_style import layout_offset
|
|
return layout_offset(self.config, element, axis, default,
|
|
getattr(self, "SKIN_MODE", None))
|
|
|
|
# ---- upcoming cards ------------------------------------------------
|
|
|
|
def _upcoming_date_and_time(self, game: Dict) -> Tuple[str, str]:
|
|
"""(date, time) for an upcoming card, from the extractor's flat keys."""
|
|
return (
|
|
str(game.get("game_date", "") or ""),
|
|
str(game.get("game_time", "") or ""),
|
|
)
|
|
|
|
def _draw_upcoming_center(self, draw: "ImageDraw.ImageDraw", game: Dict) -> None:
|
|
"""Draw the middle of an upcoming card.
|
|
|
|
Never a score: an upcoming game has not started, so the extractor's
|
|
0-0 is noise. Either the VS text (default), the date and time stacked,
|
|
or nothing at all.
|
|
"""
|
|
mode = self._upcoming_center_mode()
|
|
if mode == "none":
|
|
return
|
|
|
|
if mode == "vs":
|
|
vs_text = self._vs_text()
|
|
if not vs_text:
|
|
return
|
|
vs_width = draw.textlength(vs_text, font=self.fonts['score'])
|
|
vs_x = (self.display_width - vs_width) // 2 + self._layout_offset('score', 'x_offset')
|
|
vs_y = (self.display_height // 2) - 3 + self._layout_offset('score', 'y_offset')
|
|
self._draw_text_with_outline(
|
|
draw, vs_text, (vs_x, vs_y), self.fonts['score'],
|
|
fill=self._element_color('score_text')
|
|
)
|
|
return
|
|
|
|
date_text, time_text = self._upcoming_date_and_time(game)
|
|
lines = []
|
|
if self._scroll_card_option("show_date", True):
|
|
lines.append(self._format_game_date(date_text, game))
|
|
if self._scroll_card_option("show_time", True):
|
|
lines.append(self._format_game_time(time_text))
|
|
lines = [t for t in lines if t]
|
|
if not lines:
|
|
return
|
|
font = self.fonts.get('detail') or self.fonts['time']
|
|
line_h = 7
|
|
top = (self.display_height // 2) - (len(lines) * line_h) // 2
|
|
top += self._layout_offset('score', 'y_offset')
|
|
for i, line in enumerate(lines):
|
|
width = draw.textlength(line, font=font)
|
|
x = (self.display_width - width) // 2 + self._layout_offset('score', 'x_offset')
|
|
self._draw_text_with_outline(
|
|
draw, line, (x, top + i * line_h), font,
|
|
fill=self._element_color('detail_text')
|
|
)
|
|
|
|
def _draw_upcoming_game_status(self, draw: "ImageDraw.ImageDraw", game: Dict) -> None:
|
|
"""Draw the date and time around an upcoming card.
|
|
|
|
Time top and date bottom by default; scroll_card.swap_date_time puts
|
|
the date on top instead. Skipped when the pair is stacked in the
|
|
middle, which would otherwise print them twice.
|
|
"""
|
|
if self._upcoming_center_mode() == "date_time":
|
|
return
|
|
|
|
date_raw, time_raw = self._upcoming_date_and_time(game)
|
|
date_text = (self._format_game_date(date_raw, game)
|
|
if self._scroll_card_option("show_date", True) else "")
|
|
time_text = (self._format_game_time(time_raw)
|
|
if self._scroll_card_option("show_time", True) else "")
|
|
|
|
if self._scroll_card_option("swap_date_time", False):
|
|
top_text, top_el, bottom_text, bottom_el = (
|
|
date_text, 'date', time_text, 'time')
|
|
top_font = self.fonts.get('detail') or self.fonts['time']
|
|
bottom_font = self.fonts['time']
|
|
top_color, bottom_color = 'detail_text', 'period_text'
|
|
else:
|
|
top_text, top_el, bottom_text, bottom_el = (
|
|
time_text, 'time', date_text, 'date')
|
|
top_font = self.fonts['time']
|
|
bottom_font = self.fonts.get('detail') or self.fonts['time']
|
|
top_color, bottom_color = 'period_text', 'detail_text'
|
|
|
|
if top_text:
|
|
top_width = draw.textlength(top_text, font=top_font)
|
|
top_x = (self.display_width - top_width) // 2 + self._layout_offset(top_el, 'x_offset')
|
|
top_y = 1 + self._layout_offset(top_el, 'y_offset')
|
|
self._draw_text_with_outline(
|
|
draw, top_text, (top_x, top_y), top_font,
|
|
fill=self._element_color(top_color)
|
|
)
|
|
|
|
if bottom_text:
|
|
bottom_width = draw.textlength(bottom_text, font=bottom_font)
|
|
bottom_x = ((self.display_width - bottom_width) // 2
|
|
+ self._layout_offset(bottom_el, 'x_offset'))
|
|
# Measured, not a fixed -7: the detail font is 6px in most plugins
|
|
# but 10px in soccer and nrl, where "Sep 19" ran past the card.
|
|
ink_bottom = draw.textbbox((0, 0), bottom_text, font=bottom_font)[3]
|
|
bottom_y = (max(0, self.display_height - ink_bottom - 1)
|
|
+ self._layout_offset(bottom_el, 'y_offset'))
|
|
self._draw_text_with_outline(
|
|
draw, bottom_text, (bottom_x, bottom_y), bottom_font,
|
|
fill=self._element_color(bottom_color)
|
|
)
|
|
|
|
# ---- rankings ------------------------------------------------------
|
|
|
|
def set_rankings_cache(self, rankings: Dict[str, int]) -> None:
|
|
"""Set the team rankings cache for display."""
|
|
self._team_rankings_cache = rankings
|