Merge pull request #7 from azaroth08/dev

Dev

Author: azaroth08

requirements.txt

@@ -3,7 +3,6 @@ ephem==3.7.7.0
 fastjsonschema>=2.14.4
 geocoder==1.38.1
 gpiozero==1.6.2
-httpx==0.20.0
 nhl-api-py
 noaa-sdk>=0.1.18
 printtools==1.2

src/renderer/goal.py

@@ -1,8 +1,9 @@
 from PIL import Image, ImageFont, ImageDraw, ImageSequence
-from utils import center_text, convert_date_format
+from utils import center_text, convert_date_format,strip_accents
 from renderer.matrix import MatrixPixels
 import debug
 
+
 """
     Show the details of a goal:
             - Time of the goal and which period
@@ -72,13 +73,13 @@ def draw_scorer(self):
 
         self.matrix.draw_text(
                 (8, 20), 
-                self.scorer["info"]["firstName"]["default"].upper(),
+                strip_accents(self.scorer["info"]["firstName"]["default"].upper()),
                 font=self.font, 
                 fill=(255,255,255)
             )
         self.matrix.draw_text(
                 (8, 26), 
-                self.scorer["info"]["lastName"]["default"].upper(),
+                strip_accents(self.scorer["info"]["lastName"]["default"].upper()),
                 font=self.font, 
                 fill=(255,255,255)
             )
@@ -94,7 +95,7 @@ def draw_details(self):
 
         scorer_name_coord = self.matrix.draw_text(
                 (1, 8), 
-                self.scorer["info"]["lastName"]["default"].upper(), 
+                strip_accents(self.scorer["info"]["lastName"]["default"].upper()), 
                 font=self.font, 
                 fill=(255, 255, 255)
             )
@@ -118,7 +119,7 @@ def draw_details(self):
             for i in range(len(self.assists)):
                 assist_name_coord = self.matrix.draw_text(
                     (1, assists_y_pos), 
-                    self.assists[i]["info"]["lastName"]["default"].upper(), 
+                    strip_accents(self.assists[i]["info"]["lastName"]["default"].upper()), 
                     font=self.font, 
                     fill=(255, 255, 255)
                 )

src/renderer/penalty.py

@@ -1,5 +1,5 @@
 from PIL import Image, ImageFont, ImageDraw, ImageSequence
-from utils import center_text, convert_date_format
+from utils import center_text, convert_date_format, strip_accents
 from renderer.matrix import MatrixPixels
 import debug
 from nhl_api.info import TeamInfo
@@ -67,7 +67,7 @@ def draw_penalty(self):
 
         self.matrix.draw_text_layout(
             self.layout.last_name, 
-            self.player["lastName"]["default"]
+            strip_accents(self.player["lastName"]["default"])
         )
         self.matrix.draw_text_layout(
             self.layout.minutes, 

src/utils.py

@@ -10,6 +10,7 @@
 import dbus
 import json
 from iso6709 import Location
+import unicodedata
 
 uid = int(os.stat("./VERSION").st_uid)
 gid = int(os.stat("./VERSION").st_uid)
@@ -291,3 +292,6 @@ def round_normal(n, decimals=0):
     multiplier = 10 ** decimals
     value = math.floor(n * multiplier + 0.5) / multiplier
     return int(value) if decimals == 0 else value
+
+def strip_accents(str):
+    return "".join(c for c in unicodedata.normalize("NFD", str) if not unicodedata.combining(c))