mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-05-30 07:43:31 +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>
727 lines
29 KiB
Python
727 lines
29 KiB
Python
"""
|
|
Baseball Base Classes
|
|
|
|
This module provides baseball-specific base classes that extend the core sports functionality
|
|
with baseball-specific logic for innings, outs, bases, strikes, balls, etc.
|
|
"""
|
|
|
|
import logging
|
|
import time
|
|
from typing import Any, Dict, Optional
|
|
|
|
from PIL import Image, ImageDraw, ImageFont
|
|
|
|
from src.base_classes.data_sources import ESPNDataSource
|
|
from src.base_classes.sports import SportsCore, SportsLive, SportsRecent
|
|
|
|
|
|
class Baseball(SportsCore):
|
|
"""Base class for baseball sports with common functionality."""
|
|
|
|
def __init__(
|
|
self,
|
|
config: Dict[str, Any],
|
|
display_manager,
|
|
cache_manager,
|
|
logger: logging.Logger,
|
|
sport_key: str,
|
|
):
|
|
super().__init__(config, display_manager, cache_manager, logger, sport_key)
|
|
# Baseball-specific configuration
|
|
self.show_innings = self.mode_config.get("show_innings", True)
|
|
self.show_outs = self.mode_config.get("show_outs", True)
|
|
self.show_bases = self.mode_config.get("show_bases", True)
|
|
self.show_count = self.mode_config.get("show_count", True)
|
|
self.show_pitcher_batter = self.mode_config.get("show_pitcher_batter", False)
|
|
self.show_series_summary = self.mode_config.get("show_series_summary", False)
|
|
self.data_source = ESPNDataSource(logger)
|
|
self.sport = "baseball"
|
|
|
|
def _get_baseball_display_text(self, game: Dict) -> str:
|
|
"""Get baseball-specific display text."""
|
|
try:
|
|
display_parts = []
|
|
|
|
# Inning information
|
|
if self.show_innings:
|
|
inning = game.get("inning", "")
|
|
if inning:
|
|
display_parts.append(f"Inning: {inning}")
|
|
|
|
# Outs information
|
|
if self.show_outs:
|
|
outs = game.get("outs", 0)
|
|
if outs is not None:
|
|
display_parts.append(f"Outs: {outs}")
|
|
|
|
# Bases information
|
|
if self.show_bases:
|
|
bases = game.get("bases", "")
|
|
if bases:
|
|
display_parts.append(f"Bases: {bases}")
|
|
|
|
# Count information
|
|
if self.show_count:
|
|
strikes = game.get("strikes", 0)
|
|
balls = game.get("balls", 0)
|
|
if strikes is not None and balls is not None:
|
|
display_parts.append(f"Count: {balls}-{strikes}")
|
|
|
|
# Pitcher/Batter information
|
|
if self.show_pitcher_batter:
|
|
pitcher = game.get("pitcher", "")
|
|
batter = game.get("batter", "")
|
|
if pitcher:
|
|
display_parts.append(f"Pitcher: {pitcher}")
|
|
if batter:
|
|
display_parts.append(f"Batter: {batter}")
|
|
|
|
return " | ".join(display_parts) if display_parts else ""
|
|
|
|
except Exception as e:
|
|
self.logger.error(f"Error getting baseball display text: {e}")
|
|
return ""
|
|
|
|
def _is_baseball_game_live(self, game: Dict) -> bool:
|
|
"""Check if a baseball game is currently live."""
|
|
try:
|
|
# Check if game is marked as live
|
|
is_live = game.get("is_live", False)
|
|
if is_live:
|
|
return True
|
|
|
|
# Check inning to determine if game is active
|
|
inning = game.get("inning", "")
|
|
if inning and inning != "Final":
|
|
return True
|
|
|
|
return False
|
|
|
|
except Exception as e:
|
|
self.logger.error(f"Error checking if baseball game is live: {e}")
|
|
return False
|
|
|
|
def _get_baseball_game_status(self, game: Dict) -> str:
|
|
"""Get baseball-specific game status."""
|
|
try:
|
|
status = game.get("status_text", "")
|
|
inning = game.get("inning", "")
|
|
|
|
if self._is_baseball_game_live(game):
|
|
if inning:
|
|
return f"Live - {inning}"
|
|
else:
|
|
return "Live"
|
|
elif game.get("is_final", False):
|
|
return "Final"
|
|
elif game.get("is_upcoming", False):
|
|
return "Upcoming"
|
|
else:
|
|
return status
|
|
|
|
except Exception as e:
|
|
self.logger.error(f"Error getting baseball game status: {e}")
|
|
return ""
|
|
|
|
def _extract_game_details(self, game_event: Dict) -> Optional[Dict]:
|
|
"""Extract relevant game details from ESPN NCAA FB API response."""
|
|
details, home_team, away_team, status, situation = (
|
|
self._extract_game_details_common(game_event)
|
|
)
|
|
if details is None or home_team is None or away_team is None or status is None:
|
|
return
|
|
try:
|
|
# print(status["type"]["state"])
|
|
# exit()
|
|
game_status = status["type"]["name"].lower()
|
|
status_state = status["type"]["state"].lower()
|
|
# Get team abbreviations
|
|
home_abbr = home_team["team"]["abbreviation"]
|
|
away_abbr = away_team["team"]["abbreviation"]
|
|
|
|
# Check if this is a favorite team game
|
|
is_favorite_game = (
|
|
home_abbr in self.favorite_teams or away_abbr in self.favorite_teams
|
|
)
|
|
|
|
# Log all teams found for debugging
|
|
self.logger.debug(
|
|
f"Found game: {away_abbr} @ {home_abbr} (Status: {game_status}, State: {status_state})"
|
|
)
|
|
|
|
# Only log detailed information for favorite teams
|
|
if is_favorite_game:
|
|
self.logger.debug(f"Full status data: {game_event['status']}")
|
|
self.logger.debug(f"Status type: {game_status}, State: {status_state}")
|
|
self.logger.debug(f"Status detail: {status['type'].get('detail', '')}")
|
|
self.logger.debug(
|
|
f"Status shortDetail: {status['type'].get('shortDetail', '')}"
|
|
)
|
|
series = game_event["competitions"][0].get("series", None)
|
|
series_summary = ""
|
|
if series:
|
|
series_summary = series.get("summary", "")
|
|
# Get game state information
|
|
if status_state == "in":
|
|
# For live games, get detailed state
|
|
inning = game_event["status"].get(
|
|
"period", 1
|
|
) # Get inning from status period
|
|
|
|
# Get inning information from status
|
|
status_detail = status["type"].get("detail", "").lower()
|
|
status_short = status["type"].get("shortDetail", "").lower()
|
|
|
|
if is_favorite_game:
|
|
self.logger.debug(
|
|
f"Raw status detail: {status['type'].get('detail')}"
|
|
)
|
|
self.logger.debug(
|
|
f"Raw status short: {status['type'].get('shortDetail')}"
|
|
)
|
|
|
|
# Determine inning half from status information
|
|
inning_half = "top" # Default
|
|
|
|
# Handle end of inning: next inning is top
|
|
if "end" in status_detail or "end" in status_short:
|
|
inning_half = "top"
|
|
inning = (
|
|
game_event["status"].get("period", 1) + 1
|
|
) # Use period and increment for next inning
|
|
if is_favorite_game:
|
|
self.logger.debug(
|
|
f"Detected end of inning. Setting to Top {inning}"
|
|
)
|
|
# Handle middle of inning: next is bottom of current inning
|
|
elif "mid" in status_detail or "mid" in status_short:
|
|
inning_half = "bottom"
|
|
if is_favorite_game:
|
|
self.logger.debug(
|
|
f"Detected middle of inning. Setting to Bottom {inning}"
|
|
)
|
|
# Handle bottom of inning
|
|
elif (
|
|
"bottom" in status_detail
|
|
or "bot" in status_detail
|
|
or "bottom" in status_short
|
|
or "bot" in status_short
|
|
):
|
|
inning_half = "bottom"
|
|
if is_favorite_game:
|
|
self.logger.debug(f"Detected bottom of inning: {inning}")
|
|
# Handle top of inning
|
|
elif "top" in status_detail or "top" in status_short:
|
|
inning_half = "top"
|
|
if is_favorite_game:
|
|
self.logger.debug(f"Detected top of inning: {inning}")
|
|
|
|
if is_favorite_game:
|
|
self.logger.debug(f"Status detail: {status_detail}")
|
|
self.logger.debug(f"Status short: {status_short}")
|
|
self.logger.debug(f"Determined inning: {inning_half} {inning}")
|
|
|
|
# Get count and bases from situation
|
|
situation = game_event["competitions"][0].get("situation", {})
|
|
|
|
if is_favorite_game:
|
|
self.logger.debug(f"Full situation data: {situation}")
|
|
|
|
# Get count from the correct location in the API response
|
|
count = situation.get("count", {})
|
|
balls = count.get("balls", 0)
|
|
strikes = count.get("strikes", 0)
|
|
outs = situation.get("outs", 0)
|
|
|
|
# Add detailed logging for favorite team games
|
|
if is_favorite_game:
|
|
self.logger.debug(f"Full situation data: {situation}")
|
|
self.logger.debug(f"Count object: {count}")
|
|
self.logger.debug(
|
|
f"Raw count values - balls: {balls}, strikes: {strikes}"
|
|
)
|
|
self.logger.debug(f"Raw outs value: {outs}")
|
|
|
|
# Try alternative locations for count data
|
|
if balls == 0 and strikes == 0:
|
|
# First try the summary field
|
|
if "summary" in situation:
|
|
try:
|
|
count_summary = situation["summary"]
|
|
balls, strikes = map(int, count_summary.split("-"))
|
|
if is_favorite_game:
|
|
self.logger.debug(
|
|
f"Using summary count: {count_summary}"
|
|
)
|
|
except (ValueError, AttributeError):
|
|
if is_favorite_game:
|
|
self.logger.debug("Could not parse summary count")
|
|
else:
|
|
# Check if count is directly in situation
|
|
balls = situation.get("balls", 0)
|
|
strikes = situation.get("strikes", 0)
|
|
if is_favorite_game:
|
|
self.logger.debug(
|
|
f"Using direct situation count: balls={balls}, strikes={strikes}"
|
|
)
|
|
self.logger.debug(
|
|
f"Full situation keys: {list(situation.keys())}"
|
|
)
|
|
|
|
if is_favorite_game:
|
|
self.logger.debug(f"Final count: balls={balls}, strikes={strikes}")
|
|
|
|
# Get base runners
|
|
bases_occupied = [
|
|
situation.get("onFirst", False),
|
|
situation.get("onSecond", False),
|
|
situation.get("onThird", False),
|
|
]
|
|
|
|
if is_favorite_game:
|
|
self.logger.debug(f"Bases occupied: {bases_occupied}")
|
|
else:
|
|
# Default values for non-live games
|
|
inning = 1
|
|
inning_half = "top"
|
|
balls = 0
|
|
strikes = 0
|
|
outs = 0
|
|
bases_occupied = [False, False, False]
|
|
|
|
details.update(
|
|
{
|
|
"status": game_status,
|
|
"status_state": status_state,
|
|
"inning": inning,
|
|
"inning_half": inning_half,
|
|
"balls": balls,
|
|
"strikes": strikes,
|
|
"outs": outs,
|
|
"bases_occupied": bases_occupied,
|
|
"start_time": game_event["date"],
|
|
"series_summary": series_summary,
|
|
}
|
|
)
|
|
|
|
# Basic validation (can be expanded)
|
|
if not details["home_abbr"] or not details["away_abbr"]:
|
|
self.logger.warning(
|
|
f"Missing team abbreviation in event: {details['id']}"
|
|
)
|
|
return None
|
|
|
|
self.logger.debug(
|
|
f"Extracted: {details['away_abbr']}@{details['home_abbr']}, Status: {status['type']['name']}, Live: {details['is_live']}, Final: {details['is_final']}, Upcoming: {details['is_upcoming']}"
|
|
)
|
|
|
|
return details
|
|
except Exception as e:
|
|
# Log the problematic event structure if possible
|
|
self.logger.error(
|
|
f"Error extracting game details: {e} from event: {game_event.get('id')}",
|
|
exc_info=True,
|
|
)
|
|
return None
|
|
|
|
def display_series_summary(self, game: dict, draw_overlay: ImageDraw.ImageDraw):
|
|
if not self.show_series_summary:
|
|
return
|
|
|
|
series_summary = game.get("series_summary", "")
|
|
bbox = draw_overlay.textbbox((0, 0), series_summary, font=self.fonts['time'])
|
|
height = bbox[3] - bbox[1]
|
|
shots_y = (self.display_height - height) // 2
|
|
shots_width = draw_overlay.textlength(series_summary, font=self.fonts['time'])
|
|
shots_x = (self.display_width - shots_width) // 2
|
|
self._draw_text_with_outline(
|
|
draw_overlay, series_summary, (shots_x, shots_y), self.fonts['time']
|
|
)
|
|
|
|
class BaseballRecent(Baseball, SportsRecent):
|
|
"""Base class for recent baseball games."""
|
|
|
|
def __init__(
|
|
self,
|
|
config: Dict[str, Any],
|
|
display_manager,
|
|
cache_manager,
|
|
logger: logging.Logger,
|
|
sport_key: str,
|
|
):
|
|
super().__init__(config, display_manager, cache_manager, logger, sport_key)
|
|
|
|
|
|
def _custom_scorebug_layout(self, game: dict, draw_overlay: ImageDraw.ImageDraw):
|
|
self.display_series_summary(game, draw_overlay)
|
|
|
|
|
|
class BaseballLive(Baseball, SportsLive):
|
|
"""Base class for live baseball games."""
|
|
|
|
def __init__(
|
|
self,
|
|
config: Dict[str, Any],
|
|
display_manager,
|
|
cache_manager,
|
|
logger: logging.Logger,
|
|
sport_key: str,
|
|
):
|
|
super().__init__(config, display_manager, cache_manager, logger, sport_key)
|
|
|
|
def _test_mode_update(self):
|
|
if self.current_game and self.current_game["is_live"]:
|
|
# self.current_game["bases_occupied"] = [
|
|
# random.choice([True, False]) for _ in range(3)
|
|
# ]
|
|
# self.current_game["balls"] = random.choice([1, 2, 3])
|
|
# self.current_game["strikes"] = random.choice([1, 2])
|
|
# self.current_game["outs"] = random.choice([1, 2])
|
|
if self.current_game["inning_half"] == "top":
|
|
self.current_game["inning_half"] = "bottom"
|
|
else:
|
|
self.current_game["inning_half"] = "top"
|
|
self.current_game["inning"] += 1
|
|
self.current_game["balls"] = (self.current_game["balls"] + 1) % 4
|
|
self.current_game["strikes"] = (self.current_game["strikes"] + 1) % 3
|
|
self.current_game["outs"] = (self.current_game["outs"] + 1) % 3
|
|
self.current_game["bases_occupied"] = [
|
|
not b for b in self.current_game["bases_occupied"]
|
|
]
|
|
if self.current_game["inning"] % 2 == 0:
|
|
self.current_game["home_score"] = str(
|
|
int(self.current_game["home_score"]) + 1
|
|
)
|
|
else:
|
|
self.current_game["away_score"] = str(
|
|
int(self.current_game["away_score"]) + 1
|
|
)
|
|
|
|
def _draw_scorebug_layout(self, game: Dict, force_clear: bool = False) -> None:
|
|
"""Draw the detailed scorebug layout for a live NCAA FB game.""" # Updated docstring
|
|
try:
|
|
main_img = Image.new(
|
|
"RGBA", (self.display_width, self.display_height), (0, 0, 0, 255)
|
|
)
|
|
overlay = Image.new(
|
|
"RGBA", (self.display_width, self.display_height), (0, 0, 0, 0)
|
|
)
|
|
draw_overlay = ImageDraw.Draw(
|
|
overlay
|
|
) # Draw text elements on overlay first
|
|
|
|
home_logo = self._load_and_resize_logo(
|
|
game["home_id"],
|
|
game["home_abbr"],
|
|
game["home_logo_path"],
|
|
game.get("home_logo_url"),
|
|
)
|
|
away_logo = self._load_and_resize_logo(
|
|
game["away_id"],
|
|
game["away_abbr"],
|
|
game["away_logo_path"],
|
|
game.get("away_logo_url"),
|
|
)
|
|
|
|
if not home_logo or not away_logo:
|
|
self.logger.error(
|
|
f"Failed to load logos for live game: {game.get('id')}"
|
|
) # Changed log prefix
|
|
# Draw placeholder text if logos fail
|
|
draw_final = ImageDraw.Draw(main_img.convert("RGB"))
|
|
self._draw_text_with_outline(
|
|
draw_final, "Logo Error", (5, 5), self.fonts["status"]
|
|
)
|
|
self.display_manager.image.paste(main_img.convert("RGB"), (0, 0))
|
|
self.display_manager.update_display()
|
|
return
|
|
|
|
center_y = self.display_height // 2
|
|
|
|
# Draw logos (shifted slightly more inward than NHL perhaps)
|
|
home_x = (
|
|
self.display_width - home_logo.width + 10
|
|
) # adjusted from 18 # Adjust position as needed
|
|
home_y = center_y - (home_logo.height // 2)
|
|
main_img.paste(home_logo, (home_x, home_y), home_logo)
|
|
|
|
away_x = -10 # adjusted from 18 # Adjust position as needed
|
|
away_y = center_y - (away_logo.height // 2)
|
|
main_img.paste(away_logo, (away_x, away_y), away_logo)
|
|
|
|
# --- Live Game Specific Elements ---
|
|
|
|
# Define default text color
|
|
text_color = (255, 255, 255)
|
|
|
|
# Draw Inning (Top Center)
|
|
inning_half = game["inning_half"]
|
|
inning_num = game["inning"]
|
|
if game["is_final"]:
|
|
inning_text = "FINAL"
|
|
else:
|
|
inning_half_indicator = (
|
|
"▲" if game["inning_half"].lower() == "top" else "▼"
|
|
)
|
|
inning_num = game["inning"]
|
|
inning_text = f"{inning_half_indicator}{inning_num}"
|
|
|
|
inning_bbox = draw_overlay.textbbox(
|
|
(0, 0), inning_text, font=self.display_manager.font
|
|
)
|
|
inning_width = inning_bbox[2] - inning_bbox[0]
|
|
inning_x = (self.display_width - inning_width) // 2
|
|
inning_y = 1 # Position near top center
|
|
# draw_overlay.text((inning_x, inning_y), inning_text, fill=(255, 255, 255), font=self.display_manager.font)
|
|
self._draw_text_with_outline(
|
|
draw_overlay,
|
|
inning_text,
|
|
(inning_x, inning_y),
|
|
self.display_manager.font,
|
|
)
|
|
|
|
# --- REVISED BASES AND OUTS DRAWING ---
|
|
bases_occupied = game["bases_occupied"] # [1st, 2nd, 3rd]
|
|
outs = game.get("outs", 0)
|
|
inning_half = game["inning_half"]
|
|
|
|
# Define geometry
|
|
base_diamond_size = 7
|
|
out_circle_diameter = 3
|
|
out_vertical_spacing = 2 # Space between out circles
|
|
spacing_between_bases_outs = (
|
|
3 # Horizontal space between base cluster and out column
|
|
)
|
|
base_vert_spacing = 1 # Internal vertical space in base cluster
|
|
base_horiz_spacing = 1 # Internal horizontal space in base cluster
|
|
|
|
# Calculate cluster dimensions
|
|
base_cluster_height = (
|
|
base_diamond_size + base_vert_spacing + base_diamond_size
|
|
)
|
|
base_cluster_width = (
|
|
base_diamond_size + base_horiz_spacing + base_diamond_size
|
|
)
|
|
out_cluster_height = 3 * out_circle_diameter + 2 * out_vertical_spacing
|
|
out_cluster_width = out_circle_diameter
|
|
|
|
# Calculate overall start positions
|
|
overall_start_y = (
|
|
inning_bbox[3] + 0
|
|
) # Start immediately below inning text (moved up 3 pixels)
|
|
|
|
# Center the BASE cluster horizontally
|
|
bases_origin_x = (self.display_width - base_cluster_width) // 2
|
|
|
|
# Determine relative positions for outs based on inning half
|
|
if inning_half == "top": # Away batting, outs on left
|
|
outs_column_x = (
|
|
bases_origin_x - spacing_between_bases_outs - out_cluster_width
|
|
)
|
|
else: # Home batting, outs on right
|
|
outs_column_x = (
|
|
bases_origin_x + base_cluster_width + spacing_between_bases_outs
|
|
)
|
|
|
|
# Calculate vertical alignment offset for outs column (center align with bases cluster)
|
|
outs_column_start_y = (
|
|
overall_start_y + (base_cluster_height // 2) - (out_cluster_height // 2)
|
|
)
|
|
|
|
# --- Draw Bases (Diamonds) ---
|
|
base_color_occupied = (255, 255, 255)
|
|
base_color_empty = (255, 255, 255) # Outline color
|
|
h_d = base_diamond_size // 2
|
|
|
|
# 2nd Base (Top center relative to bases_origin_x)
|
|
c2x = bases_origin_x + base_cluster_width // 2
|
|
c2y = overall_start_y + h_d
|
|
poly2 = [
|
|
(c2x, overall_start_y),
|
|
(c2x + h_d, c2y),
|
|
(c2x, c2y + h_d),
|
|
(c2x - h_d, c2y),
|
|
]
|
|
if bases_occupied[1]:
|
|
draw_overlay.polygon(poly2, fill=base_color_occupied)
|
|
else:
|
|
draw_overlay.polygon(poly2, outline=base_color_empty)
|
|
|
|
base_bottom_y = c2y + h_d # Bottom Y of 2nd base diamond
|
|
|
|
# 3rd Base (Bottom left relative to bases_origin_x)
|
|
c3x = bases_origin_x + h_d
|
|
c3y = base_bottom_y + base_vert_spacing + h_d
|
|
poly3 = [
|
|
(c3x, base_bottom_y + base_vert_spacing),
|
|
(c3x + h_d, c3y),
|
|
(c3x, c3y + h_d),
|
|
(c3x - h_d, c3y),
|
|
]
|
|
if bases_occupied[2]:
|
|
draw_overlay.polygon(poly3, fill=base_color_occupied)
|
|
else:
|
|
draw_overlay.polygon(poly3, outline=base_color_empty)
|
|
|
|
# 1st Base (Bottom right relative to bases_origin_x)
|
|
c1x = bases_origin_x + base_cluster_width - h_d
|
|
c1y = base_bottom_y + base_vert_spacing + h_d
|
|
poly1 = [
|
|
(c1x, base_bottom_y + base_vert_spacing),
|
|
(c1x + h_d, c1y),
|
|
(c1x, c1y + h_d),
|
|
(c1x - h_d, c1y),
|
|
]
|
|
if bases_occupied[0]:
|
|
draw_overlay.polygon(poly1, fill=base_color_occupied)
|
|
else:
|
|
draw_overlay.polygon(poly1, outline=base_color_empty)
|
|
|
|
# --- Draw Outs (Vertical Circles) ---
|
|
circle_color_out = (255, 255, 255)
|
|
circle_color_empty_outline = (100, 100, 100)
|
|
|
|
for i in range(3):
|
|
cx = outs_column_x
|
|
cy = outs_column_start_y + i * (
|
|
out_circle_diameter + out_vertical_spacing
|
|
)
|
|
coords = [cx, cy, cx + out_circle_diameter, cy + out_circle_diameter]
|
|
if i < outs:
|
|
draw_overlay.ellipse(coords, fill=circle_color_out)
|
|
else:
|
|
draw_overlay.ellipse(coords, outline=circle_color_empty_outline)
|
|
|
|
# --- Draw Balls-Strikes Count (BDF Font) ---
|
|
balls = game.get("balls", 0)
|
|
strikes = game.get("strikes", 0)
|
|
|
|
# Add debug logging for count with cooldown
|
|
current_time = time.time()
|
|
if (
|
|
game["home_abbr"] in self.favorite_teams
|
|
or game["away_abbr"] in self.favorite_teams
|
|
) and current_time - self.last_count_log_time >= self.count_log_interval:
|
|
self.logger.debug(f"Displaying count: {balls}-{strikes}")
|
|
self.logger.debug(
|
|
f"Raw count data: balls={game.get('balls')}, strikes={game.get('strikes')}"
|
|
)
|
|
self.last_count_log_time = current_time
|
|
|
|
count_text = f"{balls}-{strikes}"
|
|
bdf_font = self.display_manager.calendar_font
|
|
bdf_font.set_char_size(height=7 * 64) # Set 7px height
|
|
count_text_width = self.display_manager.get_text_width(count_text, bdf_font)
|
|
|
|
# Position below the base/out cluster
|
|
cluster_bottom_y = (
|
|
overall_start_y + base_cluster_height
|
|
) # Find the bottom of the taller part (bases)
|
|
count_y = cluster_bottom_y + 2 # Start 2 pixels below cluster
|
|
|
|
# Center horizontally within the BASE cluster width
|
|
count_x = bases_origin_x + (base_cluster_width - count_text_width) // 2
|
|
|
|
# Ensure draw object is set and draw text
|
|
self.display_manager.draw = draw_overlay
|
|
# self.display_manager._draw_bdf_text(count_text, count_x, count_y, text_color, font=bdf_font)
|
|
# Use _draw_text_with_outline for count text
|
|
# self._draw_text_with_outline(draw, count_text, (count_x, count_y), bdf_font, fill=text_color)
|
|
|
|
# Draw Balls-Strikes Count with outline using BDF font
|
|
# Define outline color (consistent with _draw_text_with_outline default)
|
|
outline_color_for_bdf = (0, 0, 0)
|
|
|
|
# Draw outline
|
|
for dx_offset, dy_offset in [
|
|
(-1, -1),
|
|
(-1, 0),
|
|
(-1, 1),
|
|
(0, -1),
|
|
(0, 1),
|
|
(1, -1),
|
|
(1, 0),
|
|
(1, 1),
|
|
]:
|
|
self.display_manager._draw_bdf_text(
|
|
count_text,
|
|
count_x + dx_offset,
|
|
count_y + dy_offset,
|
|
color=outline_color_for_bdf,
|
|
font=bdf_font,
|
|
)
|
|
|
|
# Draw main text
|
|
self.display_manager._draw_bdf_text(
|
|
count_text, count_x, count_y, color=text_color, font=bdf_font
|
|
)
|
|
|
|
# Draw Team:Score at the bottom (matching main branch format)
|
|
score_font = self.display_manager.font # Use PressStart2P
|
|
outline_color = (0, 0, 0)
|
|
score_text_color = (
|
|
255,
|
|
255,
|
|
255,
|
|
) # Use a specific name for score text color
|
|
|
|
# Helper function for outlined text
|
|
def draw_bottom_outlined_text(x, y, text):
|
|
self._draw_text_with_outline(
|
|
draw_overlay,
|
|
text,
|
|
(x, y),
|
|
score_font,
|
|
fill=score_text_color,
|
|
outline_color=outline_color,
|
|
)
|
|
|
|
away_abbr = game["away_abbr"]
|
|
home_abbr = game["home_abbr"]
|
|
away_score_str = str(game["away_score"])
|
|
home_score_str = str(game["home_score"])
|
|
|
|
away_text = f"{away_abbr}:{away_score_str}"
|
|
home_text = f"{home_abbr}:{home_score_str}"
|
|
|
|
# Calculate Y position (bottom edge)
|
|
# Get font height (approximate or precise)
|
|
try:
|
|
font_height = score_font.getbbox("A")[3] - score_font.getbbox("A")[1]
|
|
except AttributeError:
|
|
font_height = 8 # Fallback for default font
|
|
score_y = (
|
|
self.display_height - font_height - 2
|
|
) # 2 pixels padding from bottom
|
|
|
|
# Away Team:Score (Bottom Left)
|
|
away_score_x = 2 # 2 pixels padding from left
|
|
draw_bottom_outlined_text(away_score_x, score_y, away_text)
|
|
|
|
# Home Team:Score (Bottom Right)
|
|
home_text_bbox = draw_overlay.textbbox((0, 0), home_text, font=score_font)
|
|
home_text_width = home_text_bbox[2] - home_text_bbox[0]
|
|
home_score_x = (
|
|
self.display_width - home_text_width - 2
|
|
) # 2 pixels padding from right
|
|
draw_bottom_outlined_text(home_score_x, score_y, home_text)
|
|
|
|
# Draw gambling odds if available
|
|
if "odds" in game and game["odds"]:
|
|
self._draw_dynamic_odds(
|
|
draw_overlay, game["odds"], self.display_width, self.display_height
|
|
)
|
|
|
|
# Composite the text overlay onto the main image
|
|
main_img = Image.alpha_composite(main_img, overlay)
|
|
main_img = main_img.convert("RGB") # Convert for display
|
|
|
|
# Display the final image
|
|
self.display_manager.image.paste(main_img, (0, 0))
|
|
self.display_manager.update_display() # Update display here for live
|
|
|
|
except Exception as e:
|
|
self.logger.error(
|
|
f"Error displaying live Baseball game: {e}", exc_info=True
|
|
) # Changed log prefix
|