From 2e709d09bb6e9ae50a6ade1fdb37625880d989dd Mon Sep 17 00:00:00 2001 From: Alex Frantz Date: Thu, 25 Jun 2026 22:38:32 -0400 Subject: [PATCH] clean up --- modes/score.py | 3 +-- utils/colors.py | 9 --------- utils/data.py | 6 ------ utils/fonts.py | 10 ---------- utils/vars.py | 23 +++++++++++++++++++++++ 5 files changed, 24 insertions(+), 27 deletions(-) delete mode 100644 utils/colors.py delete mode 100644 utils/data.py delete mode 100644 utils/fonts.py create mode 100644 utils/vars.py diff --git a/modes/score.py b/modes/score.py index 34f7f0f..284605b 100644 --- a/modes/score.py +++ b/modes/score.py @@ -2,8 +2,7 @@ import requests import utils.logos as logos from PIL import Image, ImageDraw from rgbmatrix import graphics -from utils.colors import Colors -from utils.fonts import font, font_small +from utils.vars import Colors, font, font_small from time import time # --- State --- diff --git a/utils/colors.py b/utils/colors.py deleted file mode 100644 index 2d9952b..0000000 --- a/utils/colors.py +++ /dev/null @@ -1,9 +0,0 @@ -from enum import Enum - -# --- Pre-built colors --- -class Colors(Enum): - WHITE = (255, 255, 255) - YELLOW = (255, 200, 0) - RED = (255, 50, 50) - SABRES_BLUE = (0, 135, 48) - SABRES_GOLD = (252, 20, 210) \ No newline at end of file diff --git a/utils/data.py b/utils/data.py deleted file mode 100644 index e350b2f..0000000 --- a/utils/data.py +++ /dev/null @@ -1,6 +0,0 @@ -import os -from pathlib import Path - -SCRIPT_DIR = Path(__file__).parent.resolve() -ASSET_DIR = os.path.join(SCRIPT_DIR, "../assets") -LOGO_DIR = os.path.join(ASSET_DIR, "logos") \ No newline at end of file diff --git a/utils/fonts.py b/utils/fonts.py deleted file mode 100644 index 3ed9e59..0000000 --- a/utils/fonts.py +++ /dev/null @@ -1,10 +0,0 @@ -from rgbmatrix import graphics -from utils.data import ASSET_DIR -import os - -font = graphics.Font() -font_small = graphics.Font() -font_big = graphics.Font() -font.LoadFont(os.path.join(ASSET_DIR, "fonts/7x13.bdf")) -font_small.LoadFont(os.path.join(ASSET_DIR, "fonts/5x7.bdf")) -font_big.LoadFont(os.path.join(ASSET_DIR, "fonts/9x18.bdf")) \ No newline at end of file diff --git a/utils/vars.py b/utils/vars.py new file mode 100644 index 0000000..52ea50b --- /dev/null +++ b/utils/vars.py @@ -0,0 +1,23 @@ +from enum import Enum +from pathlib import Path +from rgbmatrix import graphics +import os + +# --- Pre-built colors --- +class Colors(Enum): + WHITE = (255, 255, 255) + YELLOW = (255, 200, 0) + RED = (255, 50, 50) + SABRES_BLUE = (0, 135, 48) + SABRES_GOLD = (252, 20, 210) + +SCRIPT_DIR = Path(__file__).parent.resolve() +ASSET_DIR = os.path.join(SCRIPT_DIR, "../assets") +LOGO_DIR = os.path.join(ASSET_DIR, "logos") + +font = graphics.Font() +font_small = graphics.Font() +font_big = graphics.Font() +font.LoadFont(os.path.join(ASSET_DIR, "fonts/7x13.bdf")) +font_small.LoadFont(os.path.join(ASSET_DIR, "fonts/5x7.bdf")) +font_big.LoadFont(os.path.join(ASSET_DIR, "fonts/9x18.bdf")) \ No newline at end of file