Merge branch 'dev' into main

Author: Nick Shorter

install.sh

@@ -6,15 +6,20 @@ then
 echo "Are you root?"
 exit 2
 fi
-apt update && apt upgrade -y
-apt install -y fonts-noto-mono
+apt update && apt upgrade -y && apt install -y fonts-noto-mono
+if [ 0 == $(echo $?) ]
+then
+echo "Error Occured While installing and updatings fonts"
+exit 1
+fi 
 
 mv -v $SOURCE_DIR/fonts/* /usr/share/fonts/
 mv -v $SOURCE_DIR/ohmyoled /usr/local/bin/
-if [[ -f /usr/lib/systemd/system/ohmyoled.service ]]
+if [ -f /usr/lib/systemd/system/ohmyoled.service ]
+then
 echo "ohmyoled service exists"
 else
-echo "Creating Systemd File"
+echo "Creating Systemd File for ohmyoled"
 cat <<EOF >> /usr/lib/systemd/system/ohmyoled.service
 [Unit]
 Description=OhMyOLED Service
@@ -27,21 +32,21 @@ WorkingDirectory=/usr/local/bin/
 [Install]
 WantedBy=multi-user.target
 EOF
-fi 
-
-if 
+fi
+ 
 ln -s /usr/lib/systemd/system/ohmyoled.service /etc/systemd/system/multi-user.target.wants/
 systemctl daemon-reload
 
-mkdir -p /etc/ohmyoled/
-if [[ -f /etc/ohmyoled/ecIcons_utf8.csv ]] then 
-echo "Icons File already Exists"
-else
-mv -v $SOURCE_DIR/ecIcons_utf8.csv /etc/ohmyoled/
-fi
+mkdir -p /etc/ohmyoled/ && mkdir -p /var/log/ohmyoled/
+if [ 0 == $(echo $?) ]
+then
+echo "Error Occured creating ohmyoled dirs"
+exit 1
+fi 
 
 echo "Created OhMyOled Config file to /etc/ohmyoled"
-if [[ -f /etc/ohmyoled/ohmyoled.conf ]] then 
+if [ -f /etc/ohmyoled/ohmyoled.conf ] 
+then
 echo "/etc/ohmyoled/ohmyoled.conf already exists"
 else
 mv -r $SOURCE_DIR/ohmyoled.conf /etc/ohmyoled/

lib/binary_build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION="1.2.0"
+VERSION="1.3.0"
 
 # Can't put full folders
 echo "Building the binary"

main.py

@@ -146,9 +146,9 @@ async def main_run(self, loop):
                     matrix_finish_time = time.perf_counter()
                     logger.info(f"{matrix} rendered for {matrix_finish_time - matrix_start_time:0.4f}s")
         except Exception as E:
-            logger.error(E)
-            traceback.print_exc()
-            loop.stop()
+                logger.error(E)
+                traceback.print_exc()
+                loop.stop()
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Run an OhMyOled Matix")

matrix/sport/sportmatrix.py

@@ -81,6 +81,7 @@ def build_finished_game_image(self, nextgame):
     def check_offseason(self, api) -> bool:
         try:
             start_time, end_time = api.schedule.positions[0].timestamp, api.schedule.positions[-1].timestamp
+            # Have to check for play offs
             if start_time <= datetime.now() <= end_time:
                 return True
         except Exception:
@@ -168,7 +169,7 @@ def build_standings_image(self, api, xpos) -> Tuple[int, int]:
     async def render(self, api, loop):
         try:
             if not api:
-                raise Exception("Error Occurrred inside of the sport matrix")
+                raise Exception("Error Ocurred inside of the sport matrix")
             self.clear()
             self.reload_image()
             if self.check_offseason(api):
@@ -192,7 +193,7 @@ async def render(self, api, loop):
                     time.sleep(3) if xpos == 1 else time.sleep(.001)
             else:
                 font = ImageFont.truetype("/usr/share/fonts/fonts/04b24.otf", 14)
-                self.draw_multiline_text((0, 0), "Baseball\nOffseason", font=font)
+                self.draw_multiline_text((0, 0), f"{api.sport.name}\nOffseason", font=font)
                 await self.render_image()
                 time.sleep(30)
 

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="ohmyoled",
-    version="1.2.0",
+    version="1.3.0",
     python_requires='>=3.8.9',
     packages=find_packages(),
     description="64x32 Oled Matrix Display",