diff --git a/src/base_classes/baseball.py b/src/base_classes/baseball.py index 9dd6a7b5..6bfeb5aa 100644 --- a/src/base_classes/baseball.py +++ b/src/base_classes/baseball.py @@ -329,7 +329,7 @@ class Baseball(SportsCore): return series_summary = game.get("series_summary", "") - font = ImageFont.truetype("assets/fonts/4x6-font.ttf", 6) + font = self.fonts.get('detail', ImageFont.load_default()) bbox = draw_overlay.textbbox((0, 0), series_summary, font=self.fonts['time']) height = bbox[3] - bbox[1] shots_y = (self.display_height - height) // 2 diff --git a/src/base_classes/basketball.py b/src/base_classes/basketball.py index e4647703..e00782e1 100644 --- a/src/base_classes/basketball.py +++ b/src/base_classes/basketball.py @@ -201,14 +201,7 @@ class BasketballLive(Basketball, SportsLive): # Draw records or rankings if enabled if self.show_records or self.show_ranking: - try: - record_font = ImageFont.truetype("assets/fonts/4x6-font.ttf", 6) - self.logger.debug(f"Loaded 6px record font successfully") - except IOError: - record_font = ImageFont.load_default() - self.logger.warning( - f"Failed to load 6px font, using default font (size: {record_font.size})" - ) + record_font = self.fonts.get('detail', ImageFont.load_default()) # Get team abbreviations away_abbr = game.get("away_abbr", "") diff --git a/src/base_classes/football.py b/src/base_classes/football.py index a905bb02..24d0873b 100644 --- a/src/base_classes/football.py +++ b/src/base_classes/football.py @@ -308,13 +308,8 @@ class FootballLive(Football, SportsLive): # Draw records or rankings if enabled if self.show_records or self.show_ranking: - try: - record_font = ImageFont.truetype("assets/fonts/4x6-font.ttf", 6) - self.logger.debug(f"Loaded 6px record font successfully") - except IOError: - record_font = ImageFont.load_default() - self.logger.warning(f"Failed to load 6px font, using default font (size: {record_font.size})") - + record_font = self.fonts.get('detail', ImageFont.load_default()) + # Get team abbreviations away_abbr = game.get('away_abbr', '') home_abbr = game.get('home_abbr', '') diff --git a/src/base_classes/hockey.py b/src/base_classes/hockey.py index c98f896d..c54b5fa8 100644 --- a/src/base_classes/hockey.py +++ b/src/base_classes/hockey.py @@ -255,7 +255,7 @@ class HockeyLive(Hockey, SportsLive): # Shots on Goal if self.show_shots_on_goal: - shots_font = ImageFont.truetype("assets/fonts/4x6-font.ttf", 6) + shots_font = self.fonts.get('detail', ImageFont.load_default()) home_shots = str(game.get("home_shots", "0")) away_shots = str(game.get("away_shots", "0")) shots_text = f"{away_shots} SHOTS {home_shots}" @@ -276,14 +276,7 @@ class HockeyLive(Hockey, SportsLive): # Draw records or rankings if enabled if self.show_records or self.show_ranking: - try: - record_font = ImageFont.truetype("assets/fonts/4x6-font.ttf", 6) - self.logger.debug(f"Loaded 6px record font successfully") - except IOError: - record_font = ImageFont.load_default() - self.logger.warning( - f"Failed to load 6px font, using default font (size: {record_font.size})" - ) + record_font = self.fonts.get('detail', ImageFont.load_default()) # Get team abbreviations away_abbr = game.get("away_abbr", "") diff --git a/src/base_classes/sports.py b/src/base_classes/sports.py index b4e73b50..74e11fb7 100644 --- a/src/base_classes/sports.py +++ b/src/base_classes/sports.py @@ -863,13 +863,8 @@ class SportsUpcoming(SportsCore): # Draw records or rankings if enabled if self.show_records or self.show_ranking: - try: - record_font = ImageFont.truetype("assets/fonts/4x6-font.ttf", 6) - self.logger.debug(f"Loaded 6px record font successfully") - except IOError: - record_font = ImageFont.load_default() - self.logger.warning(f"Failed to load 6px font, using default font (size: {record_font.size})") - + record_font = self.fonts.get('detail', ImageFont.load_default()) + # Get team abbreviations away_abbr = game.get('away_abbr', '') home_abbr = game.get('home_abbr', '') @@ -1172,13 +1167,8 @@ class SportsRecent(SportsCore): # Draw records or rankings if enabled if self.show_records or self.show_ranking: - try: - record_font = ImageFont.truetype("assets/fonts/4x6-font.ttf", 6) - self.logger.debug(f"Loaded 6px record font successfully") - except IOError: - record_font = ImageFont.load_default() - self.logger.warning(f"Failed to load 6px font, using default font (size: {record_font.size})") - + record_font = self.fonts.get('detail', ImageFont.load_default()) + # Get team abbreviations away_abbr = game.get('away_abbr', '') home_abbr = game.get('home_abbr', '')