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>
315 lines
11 KiB
Python
315 lines
11 KiB
Python
"""
|
|
Text Helper
|
|
|
|
Handles text rendering with outlines, fonts, and positioning for LED matrix displays.
|
|
Extracted from LEDMatrix core to provide reusable functionality for plugins.
|
|
"""
|
|
|
|
import logging
|
|
from pathlib import Path
|
|
from typing import Dict, List, Optional, Tuple, Union
|
|
|
|
from PIL import Image, ImageDraw, ImageFont
|
|
from src.common.font_layout import load_truetype, resolve_asset_path
|
|
|
|
# Shared throwaway draw surface for measuring text without a target canvas.
|
|
_measure_draw = ImageDraw.Draw(Image.new("RGB", (1, 1)))
|
|
|
|
|
|
class TextHelper:
|
|
"""
|
|
Font loading, outlined text and text measurement for plugins.
|
|
|
|
- :meth:`load_fonts` loads TrueType fonts from ``font_dir`` (the install's
|
|
assets/fonts by default) with the layout engine pinned
|
|
(font_layout.load_truetype). Each (file, size) is loaded once per helper
|
|
and reused; a missing or unloadable file becomes PIL's default font.
|
|
- :meth:`draw_text_with_outline` and friends draw onto a caller's
|
|
``ImageDraw``; the measuring methods need no canvas.
|
|
"""
|
|
|
|
def __init__(self, font_dir: Optional[Union[str, Path]] = None,
|
|
logger: Optional[logging.Logger] = None):
|
|
"""
|
|
Initialize the TextHelper.
|
|
|
|
Args:
|
|
font_dir: Directory containing font files. Defaults to the
|
|
install's assets/fonts, whatever the process cwd is.
|
|
logger: Optional logger instance
|
|
"""
|
|
self.logger = logger or logging.getLogger(__name__)
|
|
self.font_dir = Path(font_dir) if font_dir else Path(resolve_asset_path("assets/fonts"))
|
|
# "<path>:<size>" -> loaded font; see load_fonts.
|
|
self._font_cache: Dict[str, ImageFont.ImageFont] = {}
|
|
|
|
def load_fonts(self, font_config: Optional[Dict[str, Dict]] = None) -> Dict[str, ImageFont.ImageFont]:
|
|
"""
|
|
Load fonts for different text elements.
|
|
|
|
Args:
|
|
font_config: ``{name: {"file": <file in font_dir>, "size": <px>}}``;
|
|
defaults to the scoreboard set in _get_default_font_config.
|
|
|
|
Returns:
|
|
Dictionary mapping font names to PIL ImageFont objects. A font
|
|
already loaded by this helper at the same size is reused.
|
|
"""
|
|
if font_config is None:
|
|
font_config = self._get_default_font_config()
|
|
|
|
fonts = {}
|
|
|
|
for font_name, config in font_config.items():
|
|
try:
|
|
font_path = self.font_dir / config['file']
|
|
size = config['size']
|
|
|
|
if font_path.exists():
|
|
cache_key = f"{font_path}:{size}"
|
|
font = self._font_cache.get(cache_key)
|
|
if font is None:
|
|
font = load_truetype(str(font_path), size)
|
|
self._font_cache[cache_key] = font
|
|
self.logger.debug(f"Loaded font: {font_name} ({font_path}, size {size})")
|
|
fonts[font_name] = font
|
|
else:
|
|
# Fallback to default font
|
|
font = ImageFont.load_default()
|
|
fonts[font_name] = font
|
|
self.logger.warning(f"Font file not found: {font_path}, using default")
|
|
|
|
except Exception as e:
|
|
self.logger.error(f"Error loading font {font_name}: {e}")
|
|
fonts[font_name] = ImageFont.load_default()
|
|
|
|
return fonts
|
|
|
|
def draw_text_with_outline(self, draw: ImageDraw.ImageDraw, text: str,
|
|
position: Tuple[int, int], font: ImageFont.ImageFont,
|
|
fill: Tuple[int, int, int] = (255, 255, 255),
|
|
outline_color: Tuple[int, int, int] = (0, 0, 0),
|
|
outline_width: int = 1) -> None:
|
|
"""
|
|
Draw text with an outline for better readability on LED displays.
|
|
|
|
Args:
|
|
draw: PIL ImageDraw object
|
|
text: Text to draw
|
|
position: (x, y) position tuple
|
|
font: PIL ImageFont object
|
|
fill: Text color (R, G, B)
|
|
outline_color: Outline color (R, G, B)
|
|
outline_width: Width of outline in pixels
|
|
"""
|
|
x, y = position
|
|
|
|
# Draw outline by drawing text in outline color at offset positions
|
|
for dx in range(-outline_width, outline_width + 1):
|
|
for dy in range(-outline_width, outline_width + 1):
|
|
if dx != 0 or dy != 0: # Skip center position
|
|
draw.text((x + dx, y + dy), text, font=font, fill=outline_color)
|
|
|
|
# Draw main text
|
|
draw.text((x, y), text, font=font, fill=fill)
|
|
|
|
def get_text_width(self, text: str, font: ImageFont.ImageFont) -> int:
|
|
"""
|
|
Get the width of text when rendered with the given font.
|
|
|
|
Args:
|
|
text: Text to measure
|
|
font: PIL ImageFont object
|
|
|
|
Returns:
|
|
Width in pixels
|
|
"""
|
|
return int(_measure_draw.textlength(text, font=font))
|
|
|
|
def get_text_height(self, text: str, font: ImageFont.ImageFont) -> int:
|
|
"""
|
|
Get the height of text when rendered with the given font.
|
|
|
|
Args:
|
|
text: Text to measure
|
|
font: PIL ImageFont object
|
|
|
|
Returns:
|
|
Height in pixels
|
|
"""
|
|
bbox = _measure_draw.textbbox((0, 0), text, font=font)
|
|
return bbox[3] - bbox[1]
|
|
|
|
def get_text_dimensions(self, text: str, font: ImageFont.ImageFont) -> Tuple[int, int]:
|
|
"""
|
|
Get both width and height of text.
|
|
|
|
Args:
|
|
text: Text to measure
|
|
font: PIL ImageFont object
|
|
|
|
Returns:
|
|
(width, height) tuple
|
|
"""
|
|
return (self.get_text_width(text, font), self.get_text_height(text, font))
|
|
|
|
def center_text(self, text: str, font: ImageFont.ImageFont,
|
|
container_width: int, container_height: int) -> Tuple[int, int]:
|
|
"""
|
|
Calculate position to center text within a container.
|
|
|
|
Args:
|
|
text: Text to center
|
|
font: PIL ImageFont object
|
|
container_width: Width of container
|
|
container_height: Height of container
|
|
|
|
Returns:
|
|
(x, y) position tuple for centered text
|
|
"""
|
|
text_width, text_height = self.get_text_dimensions(text, font)
|
|
x = (container_width - text_width) // 2
|
|
y = (container_height - text_height) // 2
|
|
return (x, y)
|
|
|
|
def wrap_text(self, text: str, font: ImageFont.ImageFont,
|
|
max_width: int, max_lines: Optional[int] = None) -> List[str]:
|
|
"""
|
|
Wrap text to fit within specified width.
|
|
|
|
Args:
|
|
text: Text to wrap
|
|
font: PIL ImageFont object
|
|
max_width: Maximum width in pixels
|
|
max_lines: Maximum number of lines (None for unlimited)
|
|
|
|
Returns:
|
|
List of text lines
|
|
"""
|
|
words = text.split()
|
|
lines = []
|
|
current_line = []
|
|
|
|
for word in words:
|
|
# Test if adding this word would exceed width
|
|
test_line = ' '.join(current_line + [word])
|
|
if self.get_text_width(test_line, font) <= max_width:
|
|
current_line.append(word)
|
|
else:
|
|
# Start new line
|
|
if current_line:
|
|
lines.append(' '.join(current_line))
|
|
current_line = [word]
|
|
else:
|
|
# Single word is too long, add it anyway
|
|
lines.append(word)
|
|
|
|
# Add remaining words
|
|
if current_line:
|
|
lines.append(' '.join(current_line))
|
|
|
|
# Limit lines if specified
|
|
if max_lines is not None:
|
|
lines = lines[:max_lines]
|
|
|
|
return lines
|
|
|
|
def draw_multiline_text(self, draw: ImageDraw.ImageDraw, text: str,
|
|
position: Tuple[int, int], font: ImageFont.ImageFont,
|
|
line_spacing: int = 2, **kwargs) -> None:
|
|
"""
|
|
Draw multiline text with proper spacing.
|
|
|
|
Args:
|
|
draw: PIL ImageDraw object
|
|
text: Text to draw (can contain newlines)
|
|
position: Starting (x, y) position
|
|
font: PIL ImageFont object
|
|
line_spacing: Pixels between lines
|
|
**kwargs: Additional arguments for draw_text_with_outline
|
|
"""
|
|
x, y = position
|
|
lines = text.split('\n')
|
|
|
|
for line in lines:
|
|
if line.strip(): # Skip empty lines
|
|
self.draw_text_with_outline(draw, line, (x, y), font, **kwargs)
|
|
y += self.get_text_height(line, font) + line_spacing
|
|
|
|
def create_text_image(self, text: str, font: ImageFont.ImageFont,
|
|
background_color: Tuple[int, int, int] = (0, 0, 0),
|
|
text_color: Tuple[int, int, int] = (255, 255, 255),
|
|
padding: int = 5) -> Image.Image:
|
|
"""
|
|
Create an image containing only the specified text.
|
|
|
|
Args:
|
|
text: Text to render
|
|
font: PIL ImageFont object
|
|
background_color: Background color (R, G, B)
|
|
text_color: Text color (R, G, B)
|
|
padding: Padding around text in pixels
|
|
|
|
Returns:
|
|
PIL Image containing the text
|
|
"""
|
|
# Calculate dimensions
|
|
text_width, text_height = self.get_text_dimensions(text, font)
|
|
img_width = text_width + (padding * 2)
|
|
img_height = text_height + (padding * 2)
|
|
|
|
# Create image
|
|
img = Image.new('RGB', (img_width, img_height), background_color)
|
|
draw = ImageDraw.Draw(img)
|
|
|
|
# Draw text
|
|
self.draw_text_with_outline(draw, text, (padding, padding), font,
|
|
fill=text_color)
|
|
|
|
return img
|
|
|
|
def _get_default_font_config(self) -> Dict[str, Dict]:
|
|
"""Get default font configuration."""
|
|
return {
|
|
'score': {
|
|
'file': 'PressStart2P-Regular.ttf',
|
|
'size': 10
|
|
},
|
|
'time': {
|
|
'file': 'PressStart2P-Regular.ttf',
|
|
'size': 8
|
|
},
|
|
'team': {
|
|
'file': 'PressStart2P-Regular.ttf',
|
|
'size': 8
|
|
},
|
|
'status': {
|
|
'file': '4x6-font.ttf',
|
|
'size': 6
|
|
},
|
|
'detail': {
|
|
'file': '4x6-font.ttf',
|
|
'size': 6
|
|
},
|
|
'rank': {
|
|
'file': 'PressStart2P-Regular.ttf',
|
|
'size': 10
|
|
}
|
|
}
|
|
|
|
def clear_font_cache(self) -> None:
|
|
"""Clear the font cache."""
|
|
self._font_cache.clear()
|
|
self.logger.debug("Font cache cleared")
|
|
|
|
def get_font_cache_stats(self) -> Dict[str, int]:
|
|
"""
|
|
Get font cache statistics.
|
|
|
|
Returns:
|
|
Dictionary with cache statistics
|
|
"""
|
|
return {
|
|
'cached_fonts': len(self._font_cache)
|
|
}
|