fix: revert font generation

feram18 · Oct 6, 2022 · c57c0f3 · c57c0f3
1 parent cdcf144
commit c57c0f3
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,6 @@
 # Log Files
 *.log*
 
-# Generated Fonts
-assets/fonts/*.pbm
-assets/fonts/*.pil
-
 # Submodules
 rpi-rgb-led-matrix/*
 

diff --git a/assets/fonts/tom-thumb.pbm b/assets/fonts/tom-thumb.pbm
diff --git a/assets/fonts/tom-thumb.pil b/assets/fonts/tom-thumb.pil
diff --git a/config/layout/w64h32.json b/config/layout/w64h32.json
@@ -1,5 +1,5 @@
 {
-    "font": "tom-thumb",
+    "font": "assets/fonts/tom-thumb.pil",
     "standings": {
         "constructors": {
             "row_height": 8,

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -10,7 +10,7 @@
 @pytest.mark.skipif(not sys.platform.startswith('linux'), reason='Requires Linux')
 class TestUtils:
     def setup_method(self):
-        self.font = utils.load_font('tom-thumb')
+        self.font = utils.load_font('assets/fonts/tom-thumb.bdf')
 
     def test_read_json(self, caplog):
         caplog.clear()

diff --git a/utils.py b/utils.py
@@ -52,25 +52,15 @@ def read_json(filename: str) -> dict:
     logging.error(f"Couldn't find file at {filename}")
 
 
-def load_font(name: str) -> ImageFont:
+def load_font(path: str) -> ImageFont:
     """
     Return ImageFont object from given font name
-    :param name: Font name
+    :param path: Font path
     :return: font: ImageFont object
     """
-    path = f'{FONTS_DIR}/{name}.pil'
     if os.path.isfile(path):
         return ImageFont.load(path)
-
-    path = f'{FONTS_DIR}/{name}.bdf'
-    if os.path.isfile(path):
-        return load_font(convert_font(path))
-
-    path = f'{LIB_FONTS_DIR}/{name}.bdf'
-    if os.path.isfile(path):
-        return load_font(convert_font(path))
-
-    logging.error(f"Couldn't find font {name}.")
+    logging.error(f"Couldn't find font {path}.")
 
 
 def convert_font(filename: str) -> str: