diff --git a/src/nhl_managers.py b/src/nhl_managers.py index 53589cc3..3be45d0a 100644 --- a/src/nhl_managers.py +++ b/src/nhl_managers.py @@ -35,62 +35,6 @@ class BaseNHLManager: fonts['status'] = ImageFont.load_default() return fonts - def _extract_game_details(self, game_event): - """Extract game details from an event.""" - if not game_event: - return None - - details = {} - try: - competition = game_event["competitions"][0] - status = competition["status"] - competitors = competition["competitors"] - game_date_str = game_event["date"] - - try: - details["start_time_utc"] = datetime.fromisoformat(game_date_str.replace("Z", "+00:00")) - except ValueError: - logging.warning(f"[NHL] Could not parse game date: {game_date_str}") - details["start_time_utc"] = None - - home_team = next(c for c in competitors if c.get("homeAway") == "home") - away_team = next(c for c in competitors if c.get("homeAway") == "away") - - details["status_text"] = status["type"]["shortDetail"] - details["period"] = status.get("period", 0) - details["clock"] = status.get("displayClock", "0:00") - details["is_live"] = status["type"]["state"] in ("in", "halftime") - details["is_final"] = status["type"]["state"] == "post" - details["is_upcoming"] = status["type"]["state"] == "pre" - - details["home_abbr"] = home_team["team"]["abbreviation"] - details["home_score"] = home_team.get("score", "0") - details["home_logo_path"] = self.logo_dir / f"{details['home_abbr']}.png" - - details["away_abbr"] = away_team["team"]["abbreviation"] - details["away_score"] = away_team.get("score", "0") - details["away_logo_path"] = self.logo_dir / f"{details['away_abbr']}.png" - - # Validate logo files - for logo_type in ['home', 'away']: - logo_path = details[f"{logo_type}_logo_path"] - if not logo_path.is_file(): - logging.warning(f"[NHL] {logo_type.title()} logo not found: {logo_path}") - details[f"{logo_type}_logo_path"] = None - else: - try: - with Image.open(logo_path) as img: - logging.debug(f"[NHL] {logo_type.title()} logo is valid: {img.format}, size: {img.size}") - except Exception as e: - logging.error(f"[NHL] {logo_type.title()} logo file exists but is not valid: {e}") - details[f"{logo_type}_logo_path"] = None - - return details - - except Exception as e: - logging.error(f"[NHL] Error parsing game details: {e}") - return None - def _load_and_resize_logo(self, logo_path: Path, max_size: tuple) -> Optional[Image.Image]: """Load and resize a logo image.""" if not logo_path or not logo_path.is_file(): @@ -111,6 +55,18 @@ class NHLLiveManager(BaseNHLManager): def __init__(self, config: dict, display_manager): super().__init__(config, display_manager) self.update_interval = self.nhl_config.get("live_update_interval", 30) # More frequent updates for live games + # Initialize with a test game + self.current_game = { + "home_abbr": "TBL", + "away_abbr": "DAL", + "home_score": "3", + "away_score": "2", + "period": 2, + "clock": "12:34", + "home_logo_path": self.logo_dir / "TBL.png", + "away_logo_path": self.logo_dir / "DAL.png" + } + logging.info("[NHL] Initialized NHLLiveManager with test game: TBL vs DAL") def update(self): """Update live game data.""" @@ -118,24 +74,44 @@ class NHLLiveManager(BaseNHLManager): if current_time - self.last_update < self.update_interval: return - # TODO: Implement live game data fetching + # For testing, we'll just update the clock to show it's working + if self.current_game: + minutes = int(self.current_game["clock"].split(":")[0]) + seconds = int(self.current_game["clock"].split(":")[1]) + seconds -= 1 + if seconds < 0: + seconds = 59 + minutes -= 1 + if minutes < 0: + minutes = 19 + if self.current_game["period"] < 3: + self.current_game["period"] += 1 + else: + self.current_game["period"] = 1 + self.current_game["clock"] = f"{minutes:02d}:{seconds:02d}" + logging.debug(f"[NHL] Updated test game clock: {self.current_game['clock']}") + self.last_update = current_time def display(self, force_clear: bool = False): """Display live game information.""" if not self.current_game: + logging.warning("[NHL] No game data available to display") return try: + # Create a new black image img = Image.new('RGB', (self.display_manager.width, self.display_manager.height), 'black') draw = ImageDraw.Draw(img) - # Load and resize logos + # Calculate logo sizes max_size = (self.display_manager.width // 3, self.display_manager.height // 2) + + # Load and resize logos home_logo = self._load_and_resize_logo(self.current_game["home_logo_path"], max_size) away_logo = self._load_and_resize_logo(self.current_game["away_logo_path"], max_size) - # Draw logos + # Draw home team logo if home_logo: home_x = self.display_manager.width // 4 - home_logo.width // 2 home_y = self.display_manager.height // 4 - home_logo.height // 2 @@ -144,6 +120,7 @@ class NHLLiveManager(BaseNHLManager): temp_draw.im.paste(home_logo, (home_x, home_y), home_logo) draw.im.paste(temp_img, (0, 0)) + # Draw away team logo if away_logo: away_x = self.display_manager.width // 4 - away_logo.width // 2 away_y = 3 * self.display_manager.height // 4 - away_logo.height // 2 @@ -173,142 +150,9 @@ class NHLLiveManager(BaseNHLManager): status_y = self.display_manager.height // 2 - 8 draw.text((status_x, status_y), f"{period_str} {clock}", font=self.fonts['status'], fill=(255, 255, 255)) + # Display the image self.display_manager.display_image(img) + logging.debug("[NHL] Successfully displayed test game") except Exception as e: - logging.error(f"[NHL] Error displaying live game: {e}") - -class NHLRecentManager(BaseNHLManager): - """Manager for recently completed NHL games.""" - def __init__(self, config: dict, display_manager): - super().__init__(config, display_manager) - self.recent_hours = self.nhl_config.get("recent_game_hours", 48) - self.update_interval = self.nhl_config.get("recent_update_interval", 300) # 5 minutes - - def update(self): - """Update recent game data.""" - current_time = time.time() - if current_time - self.last_update < self.update_interval: - return - - # TODO: Implement recent game data fetching - self.last_update = current_time - - def display(self, force_clear: bool = False): - """Display recent game information.""" - if not self.current_game: - return - - try: - img = Image.new('RGB', (self.display_manager.width, self.display_manager.height), 'black') - draw = ImageDraw.Draw(img) - - # Load and resize logos - max_size = (self.display_manager.width // 3, self.display_manager.height // 2) - home_logo = self._load_and_resize_logo(self.current_game["home_logo_path"], max_size) - away_logo = self._load_and_resize_logo(self.current_game["away_logo_path"], max_size) - - # Draw logos - if home_logo: - home_x = self.display_manager.width // 4 - home_logo.width // 2 - home_y = self.display_manager.height // 4 - home_logo.height // 2 - temp_img = Image.new('RGB', (self.display_manager.width, self.display_manager.height), 'black') - temp_draw = ImageDraw.Draw(temp_img) - temp_draw.im.paste(home_logo, (home_x, home_y), home_logo) - draw.im.paste(temp_img, (0, 0)) - - if away_logo: - away_x = self.display_manager.width // 4 - away_logo.width // 2 - away_y = 3 * self.display_manager.height // 4 - away_logo.height // 2 - temp_img = Image.new('RGB', (self.display_manager.width, self.display_manager.height), 'black') - temp_draw = ImageDraw.Draw(temp_img) - temp_draw.im.paste(away_logo, (away_x, away_y), away_logo) - draw.im.paste(temp_img, (0, 0)) - - # Draw scores - home_score = str(self.current_game["home_score"]) - away_score = str(self.current_game["away_score"]) - - home_score_x = self.display_manager.width // 2 - 10 - home_score_y = self.display_manager.height // 4 - 8 - away_score_x = self.display_manager.width // 2 - 10 - away_score_y = 3 * self.display_manager.height // 4 - 8 - - draw.text((home_score_x, home_score_y), home_score, font=self.fonts['score'], fill=(255, 255, 255)) - draw.text((away_score_x, away_score_y), away_score, font=self.fonts['score'], fill=(255, 255, 255)) - - # Draw "FINAL" status - status_x = self.display_manager.width // 2 - 20 - status_y = self.display_manager.height // 2 - 8 - draw.text((status_x, status_y), "FINAL", font=self.fonts['status'], fill=(255, 0, 0)) - - self.display_manager.display_image(img) - - except Exception as e: - logging.error(f"[NHL] Error displaying recent game: {e}") - -class NHLUpcomingManager(BaseNHLManager): - """Manager for upcoming NHL games.""" - def __init__(self, config: dict, display_manager): - super().__init__(config, display_manager) - self.update_interval = self.nhl_config.get("upcoming_update_interval", 300) # 5 minutes - - def update(self): - """Update upcoming game data.""" - current_time = time.time() - if current_time - self.last_update < self.update_interval: - return - - # TODO: Implement upcoming game data fetching - self.last_update = current_time - - def display(self, force_clear: bool = False): - """Display upcoming game information.""" - if not self.current_game: - return - - try: - img = Image.new('RGB', (self.display_manager.width, self.display_manager.height), 'black') - draw = ImageDraw.Draw(img) - - # Load and resize logos - max_size = (self.display_manager.width // 3, self.display_manager.height // 2) - home_logo = self._load_and_resize_logo(self.current_game["home_logo_path"], max_size) - away_logo = self._load_and_resize_logo(self.current_game["away_logo_path"], max_size) - - # Draw logos - if home_logo: - home_x = self.display_manager.width // 4 - home_logo.width // 2 - home_y = self.display_manager.height // 4 - home_logo.height // 2 - temp_img = Image.new('RGB', (self.display_manager.width, self.display_manager.height), 'black') - temp_draw = ImageDraw.Draw(temp_img) - temp_draw.im.paste(home_logo, (home_x, home_y), home_logo) - draw.im.paste(temp_img, (0, 0)) - - if away_logo: - away_x = self.display_manager.width // 4 - away_logo.width // 2 - away_y = 3 * self.display_manager.height // 4 - away_logo.height // 2 - temp_img = Image.new('RGB', (self.display_manager.width, self.display_manager.height), 'black') - temp_draw = ImageDraw.Draw(temp_img) - temp_draw.im.paste(away_logo, (away_x, away_y), away_logo) - draw.im.paste(temp_img, (0, 0)) - - # Draw game time - start_time = self.current_game["start_time_utc"] - if start_time: - local_time = start_time.astimezone() - time_str = local_time.strftime("%I:%M %p").lstrip('0') - date_str = local_time.strftime("%a %b %d") - - time_x = self.display_manager.width // 2 - 20 - time_y = self.display_manager.height // 2 - 8 - draw.text((time_x, time_y), time_str, font=self.fonts['time'], fill=(0, 255, 255)) - - date_x = self.display_manager.width // 2 - 20 - date_y = time_y + 10 - draw.text((date_x, date_y), date_str, font=self.fonts['status'], fill=(0, 255, 255)) - - self.display_manager.display_image(img) - - except Exception as e: - logging.error(f"[NHL] Error displaying upcoming game: {e}") \ No newline at end of file + logging.error(f"[NHL] Error displaying live game: {e}", exc_info=True) \ No newline at end of file