From d179700c6cb46d26cf64db7d73239f4f1d84e8dc Mon Sep 17 00:00:00 2001 From: Chuck <33324927+ChuckBuilds@users.noreply.github.com> Date: Wed, 13 Aug 2025 21:35:53 -0500 Subject: [PATCH] Removed the problematic os.path.dirname(os.path.abspath(__file__)) pattern --- src/ncaa_fb_managers.py | 13 +++++-------- src/ncaam_basketball_managers.py | 11 ++++------- src/soccer_managers.py | 11 ++++------- 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/ncaa_fb_managers.py b/src/ncaa_fb_managers.py index a3e5089d..6436a1a7 100644 --- a/src/ncaa_fb_managers.py +++ b/src/ncaa_fb_managers.py @@ -211,14 +211,11 @@ class BaseNCAAFBManager: # Renamed class """Load fonts used by the scoreboard.""" fonts = {} try: - script_dir = os.path.dirname(os.path.abspath(__file__)) - ps2p = os.path.abspath(os.path.join(script_dir, "../assets/fonts/PressStart2P-Regular.ttf")) - font_4x6 = os.path.abspath(os.path.join(script_dir, "../assets/fonts/4x6-font.ttf")) - fonts['score'] = ImageFont.truetype(ps2p, 10) - fonts['time'] = ImageFont.truetype(ps2p, 8) - fonts['team'] = ImageFont.truetype(ps2p, 8) - fonts['status'] = ImageFont.truetype(font_4x6, 6) # Using 4x6 for status - fonts['detail'] = ImageFont.truetype(font_4x6, 6) # Added detail font + fonts['score'] = ImageFont.truetype("assets/fonts/PressStart2P-Regular.ttf", 10) + fonts['time'] = ImageFont.truetype("assets/fonts/PressStart2P-Regular.ttf", 8) + fonts['team'] = ImageFont.truetype("assets/fonts/PressStart2P-Regular.ttf", 8) + fonts['status'] = ImageFont.truetype("assets/fonts/4x6-font.ttf", 6) # Using 4x6 for status + fonts['detail'] = ImageFont.truetype("assets/fonts/4x6-font.ttf", 6) # Added detail font logging.info("[NCAAFB] Successfully loaded fonts") # Changed log prefix except IOError: logging.warning("[NCAAFB] Fonts not found, using default PIL font.") # Changed log prefix diff --git a/src/ncaam_basketball_managers.py b/src/ncaam_basketball_managers.py index 8a379009..640f1a9f 100644 --- a/src/ncaam_basketball_managers.py +++ b/src/ncaam_basketball_managers.py @@ -213,13 +213,10 @@ class BaseNCAAMBasketballManager: """Load fonts used by the scoreboard.""" fonts = {} try: - script_dir = os.path.dirname(os.path.abspath(__file__)) - ps2p = os.path.abspath(os.path.join(script_dir, "../assets/fonts/PressStart2P-Regular.ttf")) - font_4x6 = os.path.abspath(os.path.join(script_dir, "../assets/fonts/4x6-font.ttf")) - fonts['score'] = ImageFont.truetype(ps2p, 10) - fonts['time'] = ImageFont.truetype(ps2p, 8) - fonts['team'] = ImageFont.truetype(ps2p, 8) - fonts['status'] = ImageFont.truetype(font_4x6, 6) + fonts['score'] = ImageFont.truetype("assets/fonts/PressStart2P-Regular.ttf", 10) + fonts['time'] = ImageFont.truetype("assets/fonts/PressStart2P-Regular.ttf", 8) + fonts['team'] = ImageFont.truetype("assets/fonts/PressStart2P-Regular.ttf", 8) + fonts['status'] = ImageFont.truetype("assets/fonts/4x6-font.ttf", 6) logging.info("[NCAAMBasketball] Successfully loaded Press Start 2P font for all text elements") except IOError: logging.warning("[NCAAMBasketball] Press Start 2P font not found, trying 4x6 font.") diff --git a/src/soccer_managers.py b/src/soccer_managers.py index b2ad4d4e..c4ec4142 100644 --- a/src/soccer_managers.py +++ b/src/soccer_managers.py @@ -312,13 +312,10 @@ class BaseSoccerManager: """Load fonts used by the scoreboard.""" fonts = {} try: - script_dir = os.path.dirname(os.path.abspath(__file__)) - ps2p = os.path.abspath(os.path.join(script_dir, "../assets/fonts/PressStart2P-Regular.ttf")) - font_4x6 = os.path.abspath(os.path.join(script_dir, "../assets/fonts/4x6-font.ttf")) - fonts['score'] = ImageFont.truetype(ps2p, 10) # Slightly larger score - fonts['time'] = ImageFont.truetype(ps2p, 8) - fonts['team'] = ImageFont.truetype(font_4x6, 6) # Keep team abbr small - fonts['status'] = ImageFont.truetype(font_4x6, 6) # Keep status small + fonts['score'] = ImageFont.truetype("assets/fonts/PressStart2P-Regular.ttf", 10) # Slightly larger score + fonts['time'] = ImageFont.truetype("assets/fonts/PressStart2P-Regular.ttf", 8) + fonts['team'] = ImageFont.truetype("assets/fonts/4x6-font.ttf", 6) # Keep team abbr small + fonts['status'] = ImageFont.truetype("assets/fonts/4x6-font.ttf", 6) # Keep status small logging.info("[Soccer] Successfully loaded custom fonts") except IOError: logging.warning("[Soccer] Custom fonts not found, using default PIL font.")