mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-06-15 17:38:36 +00:00
* fix(deps): bump minimum versions to address CVEs Pillow 10.4.0 → 12.2.0: CVE-2026-40192 (DoS via FITS decompression bomb), CVE-2026-25990 (OOB write via PSD image), CVE-2026-42311/42308/42310 requests 2.32.0 → 2.33.0: CVE-2026-25645 (temp file security bypass), CVE-2024-47081 (.netrc credentials leak) werkzeug 3.0.0 → 3.1.6: CVE-2023-46136, CVE-2024-49766/49767, CVE-2025-66221, CVE-2026-21860/27199 (DoS, path traversal, safe_join bypass) Flask 3.0.0 → 3.1.3: CVE-2026-27205 (session data caching info disclosure) spotipy 2.24.0 → 2.25.2: CVE-2025-27154, CVE-2025-66040 python-socketio 5.11.0 → 5.14.0: CVE-2025-61765 pytest 7.4.0 → 9.0.3: CVE-2025-71176 (insecure temp dir handling) Updated in requirements.txt, web_interface/requirements.txt, plugin-repos/starlark-apps/requirements.txt, and plugin-repos/march-madness/requirements.txt. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: resolve Pylint errors in executor, data service, and odds call Rename TimeoutError to PluginTimeoutError in plugin_executor.py to avoid shadowing the built-in; no external callers affected. Remove dead try/except in BackgroundDataService.shutdown: executor.shutdown() never accepted a timeout kwarg so the try branch always raised TypeError. Simplify to a direct shutdown(wait=wait) call. Remove is_live kwarg from odds_manager.get_odds() call in sports.py; BaseOddsManager.get_odds() has no such parameter. The live update interval is already encoded in the update_interval_seconds argument passed alongside. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: MD5→SHA-256, shellcheck warnings, and broken doc links config_service.py: replace MD5 with SHA-256 for config change detection; same semantics (equality comparison), no stored hashes affected. Shell scripts — shellcheck warnings: - diagnose_web_interface.sh: remove useless cat (SC2002) - dev_plugin_setup.sh: restructure A&&B||C into if/then (SC2015) - fix_assets_permissions.sh: remove unused REAL_HOME block (SC2034) - install_web_service.sh: remove unused USER_HOME assignment (SC2034) - diagnose_web_ui.sh: remove unused SUDO assignments (SC2034) - diagnose_plugin_permissions.sh: remove unused BLUE color var (SC2034) - first_time_install.sh: remove unused CLEAR var, PACKAGE_NAME assignment, and replace loop variable with _ (SC2034) docs/PLUGIN_ARCHITECTURE_SPEC.md: fix 10 broken TOC anchor links to include section numbers matching the actual headings (MD051). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: remove unused imports and bare exception aliases (pyflakes F401/F841) Remove unused imports across 86 files in src/, web_interface/, test/, and scripts/ using autoflake. No logic changes — only dead import statements and unused names in from-imports are removed. Also remove bare exception aliases where the variable is never referenced in the handler body: - src/cache/disk_cache.py: except (IOError, OSError, PermissionError) as e - src/cache_manager.py: except (OSError, IOError, PermissionError) as perm_error - src/plugin_system/resource_monitor.py: except Exception as e - web_interface/app.py: except Exception as read_err 86 files changed, 205 lines removed, 18 pre-existing test failures unchanged. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: remove unused local variable assignments (pyflakes F841) Dead assignments removed across src/ and web_interface/: - background_data_service: drop future= on fire-and-forget executor.submit - base_classes/baseball: drop font= (all rendering uses self.fonts['time']) - base_classes/hockey: drop status_short= (never referenced after assignment) - common/cli: drop game_helper=/config_helper= bindings in import-test block; constructors called for instantiation-only validation - common/display_helper: drop text_width= (x_position uses display_width directly); drop draw= in create_error_image (uses _draw_centered_text) - config_manager: remove dead secrets_content loading block in migration path (comment already noted save_config_atomic handles secrets internally) - display_manager: drop setup_start= (timing was never completed or read) - font_manager: drop target_path= (catalog uses font_file_path directly); drop face=/font= bindings in validate_font (validation by construction — TypeError on failure is the signal, not the return value) - font_test_manager: drop width=/height= (draw_text uses display_manager directly) - plugin_system/state_reconciliation: drop manager= (only config/disk/state_mgr used) - plugin_system/store_manager: drop result= on pip install subprocess.run (check=True raises on failure; stdout unused) - web_interface/blueprints/pages_v3: drop main_config_path=""/secrets_config_path="" (render_template uses config_manager.get_*_path() inline) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(js): resolve ESLint no-undef warnings across 6 JS files Three distinct patterns: 1. Vendor library globals — htmx is injected by <script> before these extension files load; ESLint lints files in isolation and doesn't know. Fix: add /* global htmx */ to htmx-sse.js and htmx-json-enc.js. 2. Cross-file globals — showNotification is defined as window.showNotification in app.js/notification.js but called bare in app.js and error_handler.js. ESLint doesn't connect window.X = Y with a bare call to X. Fix: add /* global showNotification */ to app.js and error_handler.js. 3. Forward-reference window.* functions — in array-table.js, checkbox-group.js, and custom-feeds.js, functions like removeArrayTableRow are called early inside event-handler closures but assigned to window.* later in the file. At runtime this works (the handler fires after the assignment), but ESLint sees the bare name at the call site. Fix: change bare calls to window.removeArrayTableRow(this) etc. so the reference is explicit and ESLint-safe. Also guard the updateSystemStats call in app.js reconnectSSE: the function is called but defined nowhere in the codebase. Guard with typeof check so it won't throw ReferenceError if the reconnect path is hit. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(js): resolve Biome lint warnings across 9 JS files noUnusedVariables (catch bindings → optional catch syntax): - app.js, file-upload.js, timezone-selector.js: } catch (e) { → } catch { ES2019 optional catch binding; e was unused in all three handlers noUnusedVariables (dead assignments): - app.js: remove const data= in display SSE stub (handler does nothing yet) - api_client.js: remove const timeoutId= (setTimeout ID never used to cancel) - custom-feeds.js: remove const oldIndex= (getAttribute result never read) - schedule-picker.js: remove const compactMode= (never used in HTML build) - select-dropdown.js: remove const icons= (icons not yet rendered in options) noPrototypeBuiltins: - day-selector.js: DAY_LABELS.hasOwnProperty(x) → Object.prototype.hasOwnProperty.call(DAY_LABELS, x) Safe form that works even on null-prototype objects useIterableCallbackReturn: - file-upload.js, notification.js: forEach(x => expr) → forEach(x => { expr; }) — forEach ignores return values; implicit return from arrow body was misleading htmx-sse.js is a vendor extension file with old-style var/== patterns that are correct for it; 18 Biome issues suppressed via Codacy API rather than modifying the vendor source. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(security): escape user input in raw HTML responses in pages_v3.py plugin_id comes directly from the URL path (/partials/plugin-config/<plugin_id>) and was interpolated into an HTML fragment without escaping. A crafted URL like /partials/plugin-config/<script>alert(1)</script> would inject that tag into the DOM via the HTMX partial response. Fix: wrap all user-controlled values in markupsafe.escape() before embedding in raw HTML strings. Affects the plugin-not-found 404 response and both error 500 responses in the plugin config partial. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: address Bandit B108/B110 across production code B110 (try/except/pass): - display_controller.py: narrow 'except Exception' to 'except AttributeError' for get_offset_frame() — plugins not having this optional method is the expected case, not all exceptions - config_manager.py: B110 already resolved by the earlier removal of the dead secrets-loading block (the except/pass was inside it) - All other except/pass blocks in src/ and web_interface/ are intentional (last-resort recovery, best-effort fallbacks, non-critical startup probes). Annotated each with # nosec B110 and a brief inline reason so the decision is explicit for future reviewers. - Test files and plugin-repos B110 suppressed via Codacy API (not prod code). B108 (/tmp usage): - permission_utils.py: /tmp listed to PREVENT permission changes on it — not used as a temp path. Annotated # nosec B108. - display_manager.py: fixed snapshot path is intentional (web UI reads same path); path-check guard also annotated. - wifi_manager.py: named /tmp files match the sudoers allowlist installed with the system (the paths are hard-coded in both places by design). Annotated all six open/cp references # nosec B108. - scripts/render_plugin.py: dev script default overridable by user. Annotated. - web_interface/app.py: reads the same fixed path written by display_manager. Annotated # nosec B108. - Test files suppressed via Codacy API. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: address remaining Codacy security findings Flask debug=True (real fix): - web_interface/app.py: debug=True in __main__ block exposes the Werkzeug interactive debugger (arbitrary code execution). Changed to os.environ.get('FLASK_DEBUG', '0') == '1' — off by default, opt-in via environment variable for local development. nosec annotations (accepted risk with documented rationale): - disk_cache.py: os.chmod(0o660) is intentional — web UI and LED matrix service share a group, 660 gives group write while denying world access (B103 + Semgrep insecure-file-permissions suppressed in Codacy) - wifi_manager.py: urlopen to hardcoded connectivity-check.ubuntu.com URL (B310 — no user input involved) - font_manager.py: urlretrieve URL comes from user's own config file on their local device (B310) - start_web_conditionally.py: os.execvp with both sys.executable and a fixed PROJECT_DIR-relative constant (B606) Confirmed false positives suppressed via Codacy API (15 issues): - SSRF (3x): client-side JS fetch — SSRF is server-side; browser fetch is CORS-restricted to same origin - B105 (3x): test fixtures use dummy secrets by design; store_manager checks for the placeholder string, it is not itself a secret - PMD numeric literal (2x): 10000000 is within Number.MAX_SAFE_INTEGER - Prototype pollution (1x): read-only schema traversal, no writes - no-unsanitized_method (1x): dynamic import() is CORS-restricted - detect-unsafe-regex (1x): operates on server-controlled config values - plugin-repos B103 (1x): vendor code chmod on executable - Semgrep insecure-file-permissions (3x): same disk_cache 0o660 as above Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: remove unnecessary f prefix from f-strings without placeholders (F541) Pyflakes F541 flags f-strings that contain no {} interpolation — they are identical to plain strings but trigger unnecessary string formatting overhead. Fixed in production code: - src/base_classes/data_sources.py (2 debug log calls) - src/logo_downloader.py (1 error log) - src/plugin_system/store_manager.py (5 strings across 3 log calls) - src/web_interface/validators.py (1 return value) - src/wifi_manager.py (4 log/message strings) - web_interface/start.py (1 print) F541 issues in test/, scripts/, and plugin-repos/ suppressed via Codacy API as non-production code. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * chore(dev): add Pillow compatibility smoke test script Covers all Pillow APIs used in LEDMatrix — image creation, drawing, font metrics, LANCZOS resampling, paste/alpha_composite, and PNG I/O. Run after any Pillow version bump to catch regressions before deploy. python3 scripts/dev/test_pillow_compat.py Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: resolve 8 new Codacy issues introduced by PR changes shellcheck SC2034: - first_time_install.sh: 'type' loop variable also unused in the wifi status loop (we previously fixed 'device' → '_' but left 'type'). Changed to '_ _ state' since neither device nor type is referenced. ESLint no-undef: - app.js: typeof guards don't satisfy no-undef; added updateSystemStats to the /* global */ declaration alongside showNotification. nosec annotation: - web_interface/app.py: app.run(host='0.0.0.0') line changed when we fixed debug=True, giving it a new issue ID. Re-added # nosec B104. pyflakes F401: - scripts/dev/test_pillow_compat.py: ImageFilter was imported but never used in the smoke test. Removed from the import. Codacy API suppressions (false positives on changed lines): - disk_cache.py 0o660 chmod (2x): lines changed when # nosec B103 was added, producing new Semgrep issue IDs. Re-suppressed. - pages_v3.py raw-html-concat: Semgrep does not recognise escape() as a sanitizer; the escape() call IS the correct fix. - app.py flask 0.0.0.0: same line as B104 above; Semgrep rule also re-suppressed. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: address PR review findings Fix (10 of 15 findings): plugin-repos/march-madness/requirements.txt: Add urllib3>=1.26.0 — manager.py directly imports from urllib3; it was an undeclared transitive dependency via requests. scripts/dev/dev_plugin_setup.sh: Restore subshell form (cd "$target_dir" && git pull --rebase) || true so the shell's working directory is not permanently changed after the if-cd block. Previous fix for SC2015 leaked cwd into the remainder of the script. src/base_classes/sports.py: Narrow 'except Exception' to 'except RuntimeError as e' and log via self.logger.debug — Path.home() raises only RuntimeError for service users; other exceptions should not be silently swallowed. src/config_service.py: Fix stale "MD5 checksum" in ConfigVersion.__init__ docstring (line 40); the implementation uses SHA-256 since the Codacy fix. src/wifi_manager.py: Log the last-resort AP enable failure with exc_info=True instead of silently passing — failure here means the device may be unreachable. web_interface/blueprints/pages_v3.py: Log the outer metadata pre-load exception at debug level instead of swallowing it silently; schema still loads fully below. src/background_data_service.py: Remove unused 'timeout' parameter from shutdown() — executor.shutdown() does not accept timeout; update __del__ caller accordingly. src/font_manager.py: Validate URL scheme before urlretrieve — reject non-http/https schemes (e.g. file://) to prevent reading local files from config-supplied URLs. src/plugin_system/plugin_executor.py: Simplify redundant except tuple: (PluginTimeoutError, PluginError, Exception) → Exception, which already covers the others. test/test_display_controller.py: Mark empty test_plugin_discovery_and_loading as @pytest.mark.skip with reason. Move duplicate 'from datetime import datetime' to module header and remove the stray mid-module copy. Skip (5 of 15 findings, with reasons): - pytest 9.0.3 concerns: full suite already verified (467 pass, 18 pre-existing) - Pillow 12.2.0 API concerns: no deprecated APIs in codebase; tests + Pi smoke test pass - diagnose_web_ui.sh sudo validation: set -e already ensures fail-fast on any sudo failure - app.py request-logging except: must stay silent (recursive logging risk); annotated - app.py SSE file-read except: genuinely transient I/O; annotated Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Chuck <chuck@example.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
514 lines
19 KiB
Python
514 lines
19 KiB
Python
"""
|
|
Visual Test Display Manager for LEDMatrix.
|
|
|
|
A display manager that performs real pixel rendering using PIL,
|
|
without requiring hardware or the RGBMatrixEmulator. Used for:
|
|
- Local dev preview server
|
|
- CLI render script (AI visual feedback)
|
|
- Visual assertions in pytest
|
|
|
|
Unlike MockDisplayManager (which logs calls but doesn't render) or
|
|
MagicMock (which tracks nothing visual), this class creates a real
|
|
PIL Image canvas and draws text using the actual project fonts.
|
|
"""
|
|
|
|
import math
|
|
import os
|
|
import time
|
|
from pathlib import Path
|
|
from typing import Any, List, Optional, Tuple
|
|
|
|
from PIL import Image, ImageDraw, ImageFont
|
|
|
|
from src.logging_config import get_logger
|
|
|
|
logger = get_logger(__name__)
|
|
|
|
|
|
class _MatrixProxy:
|
|
"""Lightweight proxy so plugins can access display_manager.matrix.width/height."""
|
|
|
|
def __init__(self, width: int, height: int):
|
|
self.width = width
|
|
self.height = height
|
|
|
|
|
|
class VisualTestDisplayManager:
|
|
"""
|
|
Display manager that renders real pixels for testing and development.
|
|
|
|
Implements the same interface that plugins expect from DisplayManager,
|
|
but operates entirely in-memory with PIL — no hardware, no singleton,
|
|
no emulator dependency.
|
|
"""
|
|
|
|
# Weather icon color constants (same as DisplayManager)
|
|
WEATHER_COLORS = {
|
|
'sun': (255, 200, 0),
|
|
'cloud': (200, 200, 200),
|
|
'rain': (0, 100, 255),
|
|
'snow': (220, 220, 255),
|
|
'storm': (255, 255, 0),
|
|
}
|
|
|
|
def __init__(self, width: int = 128, height: int = 32):
|
|
self._width = width
|
|
self._height = height
|
|
|
|
# Canvas
|
|
self.image = Image.new('RGB', (width, height), (0, 0, 0))
|
|
self.draw = ImageDraw.Draw(self.image)
|
|
|
|
# Matrix proxy (plugins access display_manager.matrix.width/height)
|
|
self.matrix = _MatrixProxy(width, height)
|
|
|
|
# Scrolling state (interface compat, no-op)
|
|
self._scrolling_state = {
|
|
'is_scrolling': False,
|
|
'last_scroll_activity': 0,
|
|
'scroll_inactivity_threshold': 2.0,
|
|
'deferred_updates': [],
|
|
'max_deferred_updates': 50,
|
|
'deferred_update_ttl': 300.0,
|
|
}
|
|
|
|
# Call tracking (preserves MockDisplayManager capabilities)
|
|
self.clear_called = False
|
|
self.update_called = False
|
|
self.draw_calls = []
|
|
|
|
# Load fonts
|
|
self._load_fonts()
|
|
|
|
# ------------------------------------------------------------------
|
|
# Properties
|
|
# ------------------------------------------------------------------
|
|
|
|
@property
|
|
def width(self) -> int:
|
|
return self.image.width
|
|
|
|
@property
|
|
def height(self) -> int:
|
|
return self.image.height
|
|
|
|
@property
|
|
def display_width(self) -> int:
|
|
return self.image.width
|
|
|
|
@property
|
|
def display_height(self) -> int:
|
|
return self.image.height
|
|
|
|
# ------------------------------------------------------------------
|
|
# Font loading
|
|
# ------------------------------------------------------------------
|
|
|
|
def _find_project_root(self) -> Optional[Path]:
|
|
"""Walk up from this file to find the project root (contains assets/fonts)."""
|
|
current = Path(__file__).resolve().parent
|
|
for _ in range(10):
|
|
if (current / 'assets' / 'fonts').exists():
|
|
return current
|
|
current = current.parent
|
|
return None
|
|
|
|
def _load_fonts(self):
|
|
"""Load fonts with graceful fallback, matching DisplayManager._load_fonts()."""
|
|
project_root = self._find_project_root()
|
|
|
|
try:
|
|
if project_root is None:
|
|
raise FileNotFoundError("Could not find project root with assets/fonts")
|
|
|
|
fonts_dir = project_root / 'assets' / 'fonts'
|
|
|
|
# Press Start 2P — regular and small (both 8px)
|
|
ttf_path = str(fonts_dir / 'PressStart2P-Regular.ttf')
|
|
self.regular_font = ImageFont.truetype(ttf_path, 8)
|
|
self.small_font = ImageFont.truetype(ttf_path, 8)
|
|
self.font = self.regular_font # alias used by some code paths
|
|
|
|
# 5x7 BDF font via freetype
|
|
try:
|
|
import freetype
|
|
bdf_path = str(fonts_dir / '5x7.bdf')
|
|
if not os.path.exists(bdf_path):
|
|
raise FileNotFoundError(f"BDF font not found: {bdf_path}")
|
|
face = freetype.Face(bdf_path)
|
|
self.calendar_font = face
|
|
self.bdf_5x7_font = face
|
|
except (ImportError, FileNotFoundError, OSError) as e:
|
|
logger.debug("BDF font not available, using small_font as fallback: %s", e)
|
|
self.calendar_font = self.small_font
|
|
self.bdf_5x7_font = self.small_font
|
|
|
|
# 4x6 extra small TTF
|
|
try:
|
|
xs_path = str(fonts_dir / '4x6-font.ttf')
|
|
self.extra_small_font = ImageFont.truetype(xs_path, 6)
|
|
except (FileNotFoundError, OSError) as e:
|
|
logger.debug("Extra small font not available, using fallback: %s", e)
|
|
self.extra_small_font = self.small_font
|
|
|
|
except (FileNotFoundError, OSError) as e:
|
|
logger.debug("Font loading fallback: %s", e)
|
|
self.regular_font = ImageFont.load_default()
|
|
self.small_font = self.regular_font
|
|
self.font = self.regular_font
|
|
self.calendar_font = self.regular_font
|
|
self.bdf_5x7_font = self.regular_font
|
|
self.extra_small_font = self.regular_font
|
|
|
|
# ------------------------------------------------------------------
|
|
# Core display methods
|
|
# ------------------------------------------------------------------
|
|
|
|
def clear(self):
|
|
"""Clear the display to black."""
|
|
self.clear_called = True
|
|
self.image = Image.new('RGB', (self._width, self._height), (0, 0, 0))
|
|
self.draw = ImageDraw.Draw(self.image)
|
|
|
|
def update_display(self):
|
|
"""No-op for hardware; marks that display was updated."""
|
|
self.update_called = True
|
|
|
|
def draw_text(self, text: str, x: Optional[int] = None, y: Optional[int] = None,
|
|
color: Tuple[int, int, int] = (255, 255, 255), small_font: bool = False,
|
|
font: Optional[Any] = None, centered: bool = False) -> None:
|
|
"""Draw text on the canvas, matching DisplayManager.draw_text() signature."""
|
|
# Track the call
|
|
self.draw_calls.append({
|
|
'type': 'text', 'text': text, 'x': x, 'y': y,
|
|
'color': color, 'font': font,
|
|
})
|
|
|
|
try:
|
|
# Normalize color to tuple (plugins may pass lists from JSON config)
|
|
if isinstance(color, list):
|
|
color = tuple(color)
|
|
|
|
# Select font
|
|
if font:
|
|
current_font = font
|
|
else:
|
|
current_font = self.small_font if small_font else self.regular_font
|
|
|
|
# Calculate x position
|
|
if x is None:
|
|
text_width = self.get_text_width(text, current_font)
|
|
x = (self.width - text_width) // 2
|
|
elif centered:
|
|
text_width = self.get_text_width(text, current_font)
|
|
x = x - (text_width // 2)
|
|
|
|
if y is None:
|
|
y = 0
|
|
|
|
# Draw
|
|
try:
|
|
import freetype
|
|
is_bdf = isinstance(current_font, freetype.Face)
|
|
except ImportError:
|
|
is_bdf = False
|
|
|
|
if is_bdf:
|
|
self._draw_bdf_text(text, x, y, color, current_font)
|
|
else:
|
|
self.draw.text((x, y), text, font=current_font, fill=color)
|
|
except Exception as e:
|
|
logger.debug(f"Error drawing text: {e}")
|
|
|
|
def draw_image(self, image: Image.Image, x: int, y: int):
|
|
"""Draw an image on the display."""
|
|
self.draw_calls.append({
|
|
'type': 'image', 'image': image, 'x': x, 'y': y,
|
|
})
|
|
try:
|
|
self.image.paste(image, (x, y))
|
|
except Exception as e:
|
|
logger.debug(f"Error drawing image: {e}")
|
|
|
|
def _draw_bdf_text(self, text, x, y, color=(255, 255, 255), font=None):
|
|
"""Draw text using BDF font with proper bitmap handling.
|
|
|
|
Replicated from DisplayManager._draw_bdf_text().
|
|
"""
|
|
try:
|
|
if isinstance(color, list):
|
|
color = tuple(color)
|
|
face = font if font else self.calendar_font
|
|
|
|
# Compute baseline from font ascender
|
|
try:
|
|
ascender_px = face.size.ascender >> 6
|
|
except Exception:
|
|
ascender_px = 0
|
|
baseline_y = y + ascender_px
|
|
|
|
for char in text:
|
|
face.load_char(char)
|
|
bitmap = face.glyph.bitmap
|
|
|
|
glyph_left = face.glyph.bitmap_left
|
|
glyph_top = face.glyph.bitmap_top
|
|
|
|
for i in range(bitmap.rows):
|
|
for j in range(bitmap.width):
|
|
byte_index = i * bitmap.pitch + (j // 8)
|
|
if byte_index < len(bitmap.buffer):
|
|
byte = bitmap.buffer[byte_index]
|
|
if byte & (1 << (7 - (j % 8))):
|
|
pixel_x = x + glyph_left + j
|
|
pixel_y = baseline_y - glyph_top + i
|
|
if 0 <= pixel_x < self.width and 0 <= pixel_y < self.height:
|
|
self.draw.point((pixel_x, pixel_y), fill=color)
|
|
|
|
x += face.glyph.advance.x >> 6
|
|
except Exception as e:
|
|
logger.debug(f"Error drawing BDF text: {e}")
|
|
|
|
# ------------------------------------------------------------------
|
|
# Text measurement
|
|
# ------------------------------------------------------------------
|
|
|
|
def get_text_width(self, text: str, font=None) -> int:
|
|
"""Get text width in pixels, matching DisplayManager.get_text_width()."""
|
|
if font is None:
|
|
font = self.regular_font
|
|
try:
|
|
try:
|
|
import freetype
|
|
is_bdf = isinstance(font, freetype.Face)
|
|
except ImportError:
|
|
is_bdf = False
|
|
|
|
if is_bdf:
|
|
width = 0
|
|
for char in text:
|
|
font.load_char(char)
|
|
width += font.glyph.advance.x >> 6
|
|
return width
|
|
else:
|
|
bbox = self.draw.textbbox((0, 0), text, font=font)
|
|
return bbox[2] - bbox[0]
|
|
except Exception:
|
|
return 0
|
|
|
|
def get_font_height(self, font=None) -> int:
|
|
"""Get font height in pixels, matching DisplayManager.get_font_height()."""
|
|
if font is None:
|
|
font = self.regular_font
|
|
try:
|
|
try:
|
|
import freetype
|
|
is_bdf = isinstance(font, freetype.Face)
|
|
except ImportError:
|
|
is_bdf = False
|
|
|
|
if is_bdf:
|
|
return font.size.height >> 6
|
|
else:
|
|
ascent, descent = font.getmetrics()
|
|
return ascent + descent
|
|
except Exception:
|
|
if hasattr(font, 'size'):
|
|
return font.size
|
|
return 8
|
|
|
|
# ------------------------------------------------------------------
|
|
# Weather drawing helpers
|
|
# ------------------------------------------------------------------
|
|
|
|
def draw_sun(self, x: int, y: int, size: int = 16):
|
|
"""Draw a sun icon using yellow circles and lines."""
|
|
self._draw_sun(x, y, size)
|
|
|
|
def draw_cloud(self, x: int, y: int, size: int = 16, color: Tuple[int, int, int] = (200, 200, 200)):
|
|
"""Draw a cloud icon."""
|
|
self._draw_cloud(x, y, size, color)
|
|
|
|
def draw_rain(self, x: int, y: int, size: int = 16):
|
|
"""Draw rain icon with cloud and droplets."""
|
|
self._draw_rain(x, y, size)
|
|
|
|
def draw_snow(self, x: int, y: int, size: int = 16):
|
|
"""Draw snow icon with cloud and snowflakes."""
|
|
self._draw_snow(x, y, size)
|
|
|
|
def _draw_sun(self, x: int, y: int, size: int) -> None:
|
|
"""Draw a sun icon with rays (internal weather icon version)."""
|
|
center_x, center_y = x + size // 2, y + size // 2
|
|
radius = size // 4
|
|
ray_length = size // 3
|
|
self.draw.ellipse(
|
|
[center_x - radius, center_y - radius,
|
|
center_x + radius, center_y + radius],
|
|
fill=self.WEATHER_COLORS['sun'],
|
|
)
|
|
for angle in range(0, 360, 45):
|
|
rad = math.radians(angle)
|
|
start_x = center_x + int((radius + 2) * math.cos(rad))
|
|
start_y = center_y + int((radius + 2) * math.sin(rad))
|
|
end_x = center_x + int((radius + ray_length) * math.cos(rad))
|
|
end_y = center_y + int((radius + ray_length) * math.sin(rad))
|
|
self.draw.line([start_x, start_y, end_x, end_y], fill=self.WEATHER_COLORS['sun'], width=2)
|
|
|
|
def _draw_cloud(self, x: int, y: int, size: int, color: Optional[Tuple[int, int, int]] = None) -> None:
|
|
"""Draw a cloud using multiple circles (internal weather icon version)."""
|
|
cloud_color = color if color is not None else self.WEATHER_COLORS['cloud']
|
|
base_y = y + size // 2
|
|
circle_radius = size // 4
|
|
positions = [
|
|
(x + size // 3, base_y),
|
|
(x + size // 2, base_y - size // 6),
|
|
(x + 2 * size // 3, base_y),
|
|
]
|
|
for cx, cy in positions:
|
|
self.draw.ellipse(
|
|
[cx - circle_radius, cy - circle_radius,
|
|
cx + circle_radius, cy + circle_radius],
|
|
fill=cloud_color,
|
|
)
|
|
|
|
def _draw_rain(self, x: int, y: int, size: int) -> None:
|
|
"""Draw rain drops falling from a cloud."""
|
|
self._draw_cloud(x, y, size)
|
|
rain_color = self.WEATHER_COLORS['rain']
|
|
drop_size = size // 8
|
|
drops = [
|
|
(x + size // 4, y + 2 * size // 3),
|
|
(x + size // 2, y + 3 * size // 4),
|
|
(x + 3 * size // 4, y + 2 * size // 3),
|
|
]
|
|
for dx, dy in drops:
|
|
self.draw.line([dx, dy, dx - drop_size // 2, dy + drop_size], fill=rain_color, width=2)
|
|
|
|
def _draw_snow(self, x: int, y: int, size: int) -> None:
|
|
"""Draw snowflakes falling from a cloud."""
|
|
self._draw_cloud(x, y, size)
|
|
snow_color = self.WEATHER_COLORS['snow']
|
|
flake_size = size // 6
|
|
flakes = [
|
|
(x + size // 4, y + 2 * size // 3),
|
|
(x + size // 2, y + 3 * size // 4),
|
|
(x + 3 * size // 4, y + 2 * size // 3),
|
|
]
|
|
for fx, fy in flakes:
|
|
for angle in range(0, 360, 60):
|
|
rad = math.radians(angle)
|
|
end_x = fx + int(flake_size * math.cos(rad))
|
|
end_y = fy + int(flake_size * math.sin(rad))
|
|
self.draw.line([fx, fy, end_x, end_y], fill=snow_color, width=1)
|
|
|
|
def _draw_storm(self, x: int, y: int, size: int) -> None:
|
|
"""Draw a storm cloud with lightning bolt."""
|
|
self._draw_cloud(x, y, size)
|
|
bolt_color = self.WEATHER_COLORS['storm']
|
|
bolt_points = [
|
|
(x + size // 2, y + size // 2),
|
|
(x + 3 * size // 5, y + 2 * size // 3),
|
|
(x + 2 * size // 5, y + 2 * size // 3),
|
|
(x + size // 2, y + 5 * size // 6),
|
|
]
|
|
self.draw.polygon(bolt_points, fill=bolt_color)
|
|
|
|
def draw_weather_icon(self, condition: str, x: int, y: int, size: int = 16) -> None:
|
|
"""Draw a weather icon based on the condition."""
|
|
cond = condition.lower()
|
|
if cond in ('clear', 'sunny'):
|
|
self._draw_sun(x, y, size)
|
|
elif cond in ('clouds', 'cloudy', 'partly cloudy'):
|
|
self._draw_cloud(x, y, size)
|
|
elif cond in ('rain', 'drizzle', 'shower'):
|
|
self._draw_rain(x, y, size)
|
|
elif cond in ('snow', 'sleet', 'hail'):
|
|
self._draw_snow(x, y, size)
|
|
elif cond in ('thunderstorm', 'storm'):
|
|
self._draw_storm(x, y, size)
|
|
else:
|
|
self._draw_sun(x, y, size)
|
|
|
|
def draw_text_with_icons(self, text: str, icons: List[tuple] = None,
|
|
x: int = None, y: int = None,
|
|
color: tuple = (255, 255, 255)):
|
|
"""Draw text with weather icons at specified positions."""
|
|
self.draw_text(text, x, y, color)
|
|
if icons:
|
|
for icon_type, icon_x, icon_y in icons:
|
|
self.draw_weather_icon(icon_type, icon_x, icon_y)
|
|
self.update_display()
|
|
|
|
# ------------------------------------------------------------------
|
|
# Scrolling state (no-op interface compat)
|
|
# ------------------------------------------------------------------
|
|
|
|
def set_scrolling_state(self, is_scrolling: bool):
|
|
"""Set the current scrolling state (no-op for testing)."""
|
|
self._scrolling_state['is_scrolling'] = is_scrolling
|
|
if is_scrolling:
|
|
self._scrolling_state['last_scroll_activity'] = time.time()
|
|
|
|
def is_currently_scrolling(self) -> bool:
|
|
"""Check if display is currently scrolling."""
|
|
return self._scrolling_state['is_scrolling']
|
|
|
|
# ------------------------------------------------------------------
|
|
# Utility methods
|
|
# ------------------------------------------------------------------
|
|
|
|
def format_date_with_ordinal(self, dt):
|
|
"""Formats a datetime object into 'Mon Aug 30th' style."""
|
|
day = dt.day
|
|
if 11 <= day <= 13:
|
|
suffix = 'th'
|
|
else:
|
|
suffix = {1: 'st', 2: 'nd', 3: 'rd'}.get(day % 10, 'th')
|
|
return dt.strftime(f"%b %-d{suffix}")
|
|
|
|
# ------------------------------------------------------------------
|
|
# Snapshot / image capture
|
|
# ------------------------------------------------------------------
|
|
|
|
def save_snapshot(self, path: str) -> None:
|
|
"""Save the current display as a PNG image."""
|
|
self.image.save(path, format='PNG')
|
|
|
|
def get_image(self) -> Image.Image:
|
|
"""Return the current display image."""
|
|
return self.image
|
|
|
|
def get_image_base64(self) -> str:
|
|
"""Return the current display as a base64-encoded PNG string."""
|
|
import base64
|
|
import io
|
|
buffer = io.BytesIO()
|
|
self.image.save(buffer, format='PNG')
|
|
return base64.b64encode(buffer.getvalue()).decode('utf-8')
|
|
|
|
# ------------------------------------------------------------------
|
|
# Cleanup / reset
|
|
# ------------------------------------------------------------------
|
|
|
|
def reset(self):
|
|
"""Reset all tracking state (for test reuse)."""
|
|
self.clear_called = False
|
|
self.update_called = False
|
|
self.draw_calls = []
|
|
self.image = Image.new('RGB', (self._width, self._height), (0, 0, 0))
|
|
self.draw = ImageDraw.Draw(self.image)
|
|
self._scrolling_state = {
|
|
'is_scrolling': False,
|
|
'last_scroll_activity': 0,
|
|
'scroll_inactivity_threshold': 2.0,
|
|
'deferred_updates': [],
|
|
'max_deferred_updates': 50,
|
|
'deferred_update_ttl': 300.0,
|
|
}
|
|
|
|
def cleanup(self):
|
|
"""Clean up resources."""
|
|
self.image = Image.new('RGB', (self._width, self._height), (0, 0, 0))
|
|
self.draw = ImageDraw.Draw(self.image)
|