From 07ba1f02a8c865236e2108d8cf025a7a0f7d0216 Mon Sep 17 00:00:00 2001
From: Hong Jiang <lazyseq@gmail.com>
Date: Mon, 11 Sep 2023 00:59:39 +0800
Subject: [PATCH] refactor: do not process .py file manually

Import the driver as a module in `Display.get_display_size()`.
---
 inkycal/display/display.py | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/inkycal/display/display.py b/inkycal/display/display.py
index d41264d..e24b355 100644
--- a/inkycal/display/display.py
+++ b/inkycal/display/display.py
@@ -3,12 +3,15 @@ Inkycal ePaper driving functions
 Copyright by aceisace
 """
 import os
+import logging
 from importlib import import_module
 from PIL import Image
 
 from inkycal.custom import top_level
 import glob
 
+def import_driver(model):
+    return import_module(f'inkycal.display.drivers.{model}')
 
 class Display:
     """Display class for inkycal
@@ -30,8 +33,7 @@ class Display:
             self.supports_colour = False
 
         try:
-            driver_path = f'inkycal.display.drivers.{epaper_model}'
-            driver = import_module(driver_path)
+            driver = import_driver(epaper_model)
             self._epaper = driver.EPD()
             self.model_name = epaper_model
 
@@ -168,26 +170,12 @@ class Display:
 
         >>> Display.get_display_size('model_name')
         """
-        if not isinstance(model_name, str):
-            print('model_name should be a string')
-            return
-        else:
-            driver_files = top_level + '/inkycal/display/drivers/*.py'
-            drivers = glob.glob(driver_files)
-            drivers = [i.split('/')[-1].split('.')[0] for i in drivers]
-            drivers.remove('__init__')
-            drivers.remove('epdconfig')
-            if model_name not in drivers:
-                print('This model name was not found. Please double check your spellings')
-                return
-            else:
-                with open(top_level + '/inkycal/display/drivers/' + model_name + '.py') as file:
-                    for line in file:
-                        if 'EPD_WIDTH=' in line.replace(" ", ""):
-                            width = int(line.rstrip().replace(" ", "").split('=')[-1])
-                        if 'EPD_HEIGHT=' in line.replace(" ", ""):
-                            height = int(line.rstrip().replace(" ", "").split('=')[-1])
-                return width, height
+        try:
+            driver = import_driver(model_name)
+            return driver.EPD_WIDTH, driver.EPD_HEIGHT
+        except Exception as e:
+            logging.error(f'Failed to load driver for ${model_name}. Check spelling?')
+            raise e;
 
     @classmethod
     def get_display_names(cls) -> list: