Merge pull request #35 from TheFinalJoke/sportmatrix

Started the offseason

Author: TheFinalJoke

lib/deprecated_install.sh

@@ -12,7 +12,7 @@ echo "It Could take 10-20 Mins"
 echo "On RASPBERRY PI ZERO It Could take longer than 20 mins"
 echo "Installing Build Essentials"
 sleep 5
-apt install -y build-essential git libssl-dev libffi-dev python3-openssl python-dev python3-setuptools python3-pip python3-dev python3-pillow python3-numpy python3-gpiozero python3-cairosvg libatlas3-base libatlas-base-dev libraqm-dev jq pastebinit neofetch zsh dbus libjpeg-dev zlib1g-dev
+apt install -y build-essential git libssl-dev libffi-dev python3-openssl python-dev python3-setuptools python3-pip python3-dev python3-pillow python3-numpy python3-gpiozero python3-cairosvg libatlas3-base libatlas-base-dev libraqm-dev jq pastebinit neofetch zsh dbus libjpeg-dev zlib1g-dev libxml2-dev libxslt-dev python-dev libbz2-dev liblzma-dev
 cd /usr/local/bin/ 
 if [ ! -f /usr/local/bin/Python-3.8.9.tgz ]
 then 

lib/sports/sports.py

@@ -42,7 +42,7 @@ async def run(self):
             self.logger.debug('Got basketball in config')
             basketball = Basketball(self.token, self.config['sport'], self.headers)
             basketball_return = await basketball.run()
-            sport_data['Sport'].update({'baseketball': basketball_return})
+            sport_data['Sport'].update({'basketball': basketball_return})
         elif 'hockey' == self.sport.get('sport').lower():
             self.logger.debug('Got Hockey from Config')
             hockey = Hockey(self.token, self.config['sport'], self.headers)
@@ -53,6 +53,7 @@ async def run(self):
 class Sport(Caller):
     def __init__(self, api) -> None:
         super().__init__()
+        self.api_type = ""
         self.api = api
         self.full_sport = self.api['Sport']
         self.sport = [*self.full_sport]
@@ -75,7 +76,6 @@ def __init__(self, api) -> None:
             self._vs = [(game.get('game_id'), (game['teams']['home']['name'], game['teams']['away']['name'])) for game in self.next_game]
             self._status = [(game.get('game_id'), game.get('status')) for game in self.next_game]
             self._game_result = {game.get('game_id'): game.get('score') for game in self.next_game}
-            
     def __repr__(self):
         attrs = [
             f"length={self._length}",
@@ -101,7 +101,7 @@ def build_standings(self):
         position = []
         # Can Be Empty Must try and except for that
         for pos in self.main_sport['standings'].get('response')[0]:
-            if pos.get('stage') != "MLB - Regular Season":
+            if pos.get('stage') != "MLB - Regular Season" or pos.get('stage') != "NBA - Regular Season":
                 continue
             position.append({'name': pos.get('team').get('name'),
                     'position': pos.get('position'),
@@ -183,4 +183,7 @@ def get_scores(self):
         return self._game_result
 
     def get_specific_score(self, game_id):
-        return self._game_result.get(game_id)
+        return self._game_result.get(game_id)
+
+class APISports(Sport):
+    pass

main.py

@@ -74,7 +74,7 @@ def poll_rgbmatrix(self):
         return rgboptions
 
     async def init_matrix(self, matrix):
-        verified_modules = [TimeMatrix(matrix)]
+        verified_modules = [] #[TimeMatrix(matrix)]
         modules = self.get_modules_to_run()
         if 'weather' in modules:
             self.logger.debug("Initialized Weather")

matrix/matrix.py

@@ -61,6 +61,9 @@ def make_new_image(self, size: Tuple[int]) -> Image:
 
     def add_image_to_images(self, image: Image) -> None:
         self.images.append(image)
+    
+    def paste_image(self, image: Image, position: Tuple[int, int]) -> None:
+        self.image.paste(image, position)
 
     def reset_image_queue(self) -> None:
         self.images = deque([self.image])

matrix/sport/sportmatrix.py

@@ -1,17 +1,20 @@
 #!/usr/bin/env python3
 
 import asyncio
+import os
 import time
+import urllib.request
+from datetime import datetime
 from typing import List, Dict, Tuple
 from collections import deque
 from datetime import datetime, timedelta
-from PIL import ImageFont, Image
+from PIL import ImageFont, Image, ImageDraw
 from lib.sports.sports import Sport
 from matrix.matrix import Matrix
 from lib.sports.baseball.baseball import Baseball
 from lib.sports.basketball.basketball import Basketball
 from lib.sports.hockey.hockey import Hockey
-
+from matrix.sport.team_mapping import BASEBALL_TEAMS, BASKETBALL_TEAMS
 class BaseballMatrix(Matrix):
     def __init__(self, matrix, api, logger) -> None:
         self.matrix = matrix
@@ -64,13 +67,17 @@ def baseball_divisions(self, standings: List[Dict]) -> List[str]:
 
     def determine_nextgame(self, nextgame_api):
         now = datetime.now()
-        last_16 = now - timedelta(hours=16)
         status = ("FT", "ABD")
         for game in nextgame_api:
-            if last_16 <= datetime.fromtimestamp(game['timestamp']) <= now:
+            if "IN" in game['status']:
+                # During the game
+                return game
+            if game['status'] == "FT" and datetime.fromtimestamp(game['timestamp']).date() == datetime.today().date():
+                # Same Day will display for the rest of the day
                 return game
             if game['status'] not in status:
                 return game
+    
     def away_team(self, nextgame_data):
         away = nextgame_data['teams']['away']
         away.update(nextgame_data['score']['away'])
@@ -79,64 +86,186 @@ def home_team(self, nextgame_data):
         home = nextgame_data['teams']['home']
         home.update(nextgame_data['score']['home'])
         return home
-    def render_baseball_standings(self, api):
-        self.clear()
-        self.reload_image()
-        scrolling_font = ImageFont.truetype("/usr/share/fonts/fonts/04B_03B_.TTF", 8)
-        if 'baseball'in api.sport:
-            self.logger.info("Found Baseball, Displaying Baseball Matrix")
-            color = (156,163,173)
-            # Can't Have multiple images and or buffers
-            american, national = self.baseball_divisions(api.standings)
-            american.extend(national)
-            text = "\n".join(american)
-            img_width, img_height = self.get_text_size(text)
-            self.logger.info("Displaying Standings")
-            ypos = 0
-            while ypos < 100:
-                ypos += 1
-                if ypos == 1 or ypos % 8 == 0:
-                    xpos = 0
-                    pause = True
-                    while xpos < img_width:
-                        if xpos > 100:
-                            break
-                        self.reload_image()
-                        self.draw_multiline_text((-xpos, -ypos-ypos), text, font=scrolling_font, fill=color, spacing=1) if ypos > 1 else self.draw_multiline_text((-xpos, 0), text, font=scrolling_font, fill=color, spacing=1)
-                        self.render_image()
-                        time.sleep(3) if pause else time.sleep(0)
-                        xpos += 1 
-                        pause = False
-                self.reload_image()
-                self.image_resize(64, img_height)
-                self.draw_multiline_text((0, -ypos), text, font=scrolling_font, fill=color, spacing=1)
-                self.render_image(yoffset=-ypos)
-    def render_baseball_nextgame(self, api):
-        self.clear()
-        self.reload_image()
-        self.draw_rectangle([(0,0), (63, 31)])
-        self.draw_line([(32,0), (32,32)])
+
+    def get_logo(self, logo_url, name):
+        file_name = f"/tmp/{name}.png"
+        if not os.path.isfile(file_name):
+            urllib.request.urlretrieve(logo_url, file_name)
+        return file_name
+        
+    def build_in_game_image(self, nextgame):
+        middle_image = self.make_new_image((34,16))
+        middle_draw = ImageDraw.Draw(middle_image)
         font = ImageFont.truetype("/usr/share/fonts/fonts/04B_03B_.TTF", 8)
-        self.draw_text((28, 14), "VS", font=font)
-        nextgame = self.determine_nextgame(api.next_game)
-        away_data = self.away_team(nextgame_data=nextgame)
+        status = nextgame['status']
+        score = (nextgame['teams']['home']['total'], nextgame['teams']['away']['total'])
+        middle_draw.multiline_text((10,0), f"{status}\n{score[0]}-{score[1]}", font=font)
+        return middle_image, (15, 0)
+    def build_finished_game_image(self, nextgame):
+        middle_image = self.make_new_image((34,16))
+        middle_draw = ImageDraw.Draw(middle_image)
+        font = ImageFont.truetype("/usr/share/fonts/fonts/04B_03B_.TTF", 8)
+        status = nextgame['status']
+        score = (nextgame['teams']['home']['total'], nextgame['teams']['away']['total'])
+        middle_draw.multiline_text((10,0), f"{status}\n{score[0]}-{score[1]}", font=font)
+        return middle_image, (15, 0)
+        
+    def check_offseason(self, api):
+        try:
+            start_time, end_time = api.get_timestamps[0][1], api.get_timestamps[-1][1]
+            if datetime.fromtimestamp(start_time) <= datetime.now() <= datetime.fromtimestamp(end_time):
+                return True
+        except Exception:
+            return False
+    def build_next_game_image(self, nextgame):
+        middle_image = self.make_new_image((34,16))
+        middle_draw = ImageDraw.Draw(middle_image)
+        font = ImageFont.truetype("/usr/share/fonts/fonts/04B_03B_.TTF", 8)
+        time = datetime.fromtimestamp(nextgame['timestamp']).strftime("%I:%M%p %a")
+        time = "\n   ".join(time.split())
+        middle_draw.multiline_text((0,0), f'{time}', font=font)
+        return middle_image, (15, 0)
+
+    def build_home_away_image(self, nextgame):
         home_data = self.home_team(nextgame)
-        self.render_image()
-        breakpoint()
-            
+        home_logo = Image.open(self.get_logo(home_data['logo'], home_data['id']))
+        home_logo.thumbnail((16,16))
+        away_data = self.away_team(nextgame)
+        away_logo = Image.open(self.get_logo(away_data['logo'], away_data['id']))
+        away_logo.thumbnail((16,16))
+        return (home_logo, (-2,0)), (away_logo, (50, 0))
+
+    def build_middle_nextgame(self, api):
+        nextgame = self.determine_nextgame(api.next_game)
+        if "IN" in nextgame['status']: 
+            return self.build_in_game_image(nextgame)
+        elif "NS" == nextgame['status']:
+            return self.build_next_game_image(nextgame)
+        elif "FT" == nextgame['status']:
+            return self.build_finished_game_image(nextgame)
+
+    def build_middle_image(self, api):
+        nextgame = self.determine_nextgame(api.next_game)
+        home_image, away_image = self.build_home_away_image(nextgame)
+        middle_image = self.build_middle_nextgame(api)
+        master_middle_image = self.make_new_image((64, 16))
+        master_middle_image.paste(home_image[0], home_image[1])
+        master_middle_image.paste(away_image[0], away_image[1])
+        master_middle_image.paste(middle_image[0], middle_image[1])
+        return master_middle_image, (0,9)
+    
+    def build_top_home_away_images(self, nextgame, xpos):
+        font = ImageFont.truetype("/usr/share/fonts/fonts/04B_03B_.TTF", 8)
+        top_home_image = self.make_new_image((22,8))
+        top_home_draw = ImageDraw.Draw(top_home_image)
+        top_away_image = self.make_new_image((22,8))
+        top_away_draw = ImageDraw.Draw(top_away_image)
+        hometeam = nextgame['teams']['home']['name']
+        awayteam = nextgame['teams']['away']['name']
+        top_home_draw.text((-xpos,0), hometeam, font=font)
+        top_away_draw.text((-xpos,0), awayteam, font=font)
+        return top_home_image, top_away_image
+
+    def build_top_image(self, api, xpos):
+        nextgame = self.determine_nextgame(api.next_game)
+        master_top_image = self.make_new_image((64, 8))
+        home_image, away_image = self.build_top_home_away_images(nextgame, xpos)
+        top_middle_image = self.make_new_image((22,8))
+        top_middle_draw = ImageDraw.Draw(top_middle_image)
+        top_middle_draw.text((5,0), "VS", font=ImageFont.truetype("/usr/share/fonts/fonts/04B_03B_.TTF", 8))
+        master_top_image.paste(home_image, (0,0))
+        master_top_image.paste(away_image, (44,0))
+        master_top_image.paste(top_middle_image, (22,0))
+        return master_top_image, (0,0)
+    
+    def build_standings_image(self, api, xpos) -> Tuple[int, int]:
+        """,
+        This is most bottom Image
+        """
+        standings_image = Image.new("RGB", (64,8))
+        standings_draw = ImageDraw.Draw(standings_image)
+        scrolling_font = ImageFont.truetype("/usr/share/fonts/fonts/04B_03B_.TTF", 8)
+        color = (156,163,173)
+        # Can't Have multiple images and or buffers
+        american, national = self.baseball_divisions(api.standings)
+        american.extend(national)
+        text = " ".join(american)
+        img_width, img_height = self.get_text_size(text)
+        standings_draw.text(
+            (-xpos, 0), 
+            text, 
+            font=scrolling_font, 
+            fill=color
+        )
+        return standings_image, (0, 25)
+
     def render(self, api):
         self.clear()
         self.reload_image()
-        scrolling_font = ImageFont.truetype("/usr/share/fonts/fonts/04B_03B_.TTF", 8)
         if 'baseball'in api.sport:
             # Check Data if Offseason if yes Diplay Offseason, Otherwise Display Data
             # Check data if Game is active, if yes Display game -> Score Inning AT bat Maybe?
             # Else Display next game
             # Only do standings right now
-            self.render_baseball_standings(api)
-            # self.render_baseball_nextgame(api)
+            self.logger.info("Found Baseball, Displaying Baseball Matrix")
+            if self.check_offseason(api):
+                xpos = 0
+                xpos_for_top = 0 
+                while xpos < 2700:
+                    self.reload_image()
+                    images = (
+                        self.build_standings_image(api, xpos),
+                        self.build_middle_image(api),
+                        self.build_top_image(api, xpos_for_top),
+                    )
+                    for image, position in images:
+                        self.paste_image(image, position)
+                    self.render_image()
+                    xpos +=1
+                    xpos_for_top += 1
+                    if xpos_for_top == 100:
+                        xpos_for_top = 0
+                    time.sleep(3) if xpos == 1 else time.sleep(.05)
+            else:
+                font = ImageFont.truetype("/usr/share/fonts/fonts/04b24.otf", 14)
+                self.draw_multiline_text((0, 0), "Basketball\nOffseason", font=font)
+                self.render_image()
+                time.sleep(30)
         if 'basketball' in api.sport:
-            sportmatrix = BasketballMatrix(self.matrix, api, self.logger)
+            # Check Data if Offseason if yes Diplay Offseason, Otherwise Display Data
+            # Check data if Game is active, if yes Display game -> Score Inning AT bat Maybe?
+            # Else Display next game
+            # Only do standings right now
+            self.logger.info("Found Basketball, Displaying Basketball Matrix")
+            if self.check_offseason(api):
+                xpos = 0
+                xpos_for_top = 0 
+                while xpos < 2700:
+                    self.reload_image()
+                    images = (
+                        self.build_standings_image(api, xpos),
+                        self.build_middle_image(api),
+                        self.build_top_image(api, xpos_for_top),
+                    )
+                    for image, position in images:
+                        self.paste_image(image, position)
+                    self.render_image()
+                    xpos +=1
+                    xpos_for_top += 1
+                    if xpos_for_top == 100:
+                        xpos_for_top = 0
+                    time.sleep(3) if xpos == 1 else time.sleep(.05)
+            else:
+                font = ImageFont.truetype("/usr/share/fonts/fonts/04b24.otf", 14)
+                self.draw_multiline_text((0, 0), "Basketball\nOffseason", font=font)
+                self.render_image()
+                time.sleep(30)
         if 'hockey' in api.sport:
-            sportmatrix = HockeyMatrix(self.matrix, api, self.logger)
-
+            self.logger.info("Found Hockey, Displaying Hockey Matrix")
+            if self.check_offseason(api):
+                sportmatrix = HockeyMatrix(self.matrix, api, self.logger)
+            else:
+                font = ImageFont.truetype("/usr/share/fonts/fonts/04b24.otf", 14)
+                self.draw_multiline_text((0, 0), "Hockey\nOffseason", font=font)
+                self.render_image()
+                time.sleep(30)