diff --git a/scoreboard.py b/scoreboard.py index 6f09b51..fd8f086 100644 --- a/scoreboard.py +++ b/scoreboard.py @@ -1,6 +1,7 @@ import requests import os import govee +import math import pygame from enum import Enum from time import sleep, time @@ -366,7 +367,8 @@ def run(): preferred_games = [] preferred_teams = [ "BUF", - "TOR" + "TOR", + "COL" ] while True: @@ -392,26 +394,45 @@ def run(): preferred_game_on = True preferred_games.append(game['id']) - # either show preferred games or all games - # depending on availability - if not preferred_game_on or len(preferred_games) <= 0: - if now - last_switch > page_display_time: - current_page = (current_page + 4) % max(len(games), 1) - last_switch = now - - print('Drawing all games, no preferred games found') - draw_all_games(canvas, games) - else: - if len(preferred_games) > 1 and now - last_switch > page_display_time: - if current_preferred_game + 1 > len(preferred_games): - current_preferred_game = 0 - else: + # cycle through preferred games and all games + all_games_max_page = math.ceil(len(games) / 4) + if now - last_switch > page_display_time: + if preferred_game_on and len(preferred_games) > 0 and current_preferred_game <= len(preferred_games): + if current_preferred_game + 1 <= len(preferred_games): current_preferred_game = (current_preferred_game + 1) % max(len(games), 1) + single_preferred_game = [g for g in games if preferred_games[current_preferred_game] == g['id']][0] + print(f'Switching to preferred game {single_preferred_game['home']} vs {single_preferred_game['away']}') + draw_single_game(canvas, single_preferred_game) + else: + if all_games_max_page >= current_page: + current_preferred_game = 0 + else: + print('Drawing all games, no preferred games found') + draw_all_games(canvas, games) + last_switch = now - single_preferred_game = [g for g in games if preferred_games[current_preferred_game] == g['id']][0] - print(f'Switching to preferred game {single_preferred_game['home']} vs {single_preferred_game['away']}') - draw_single_game(canvas, single_preferred_game) + + + + # if not preferred_game_on or len(preferred_games) <= 0: + # if now - last_switch > page_display_time: + # current_page = (current_page + 4) % max(len(games), 1) + # last_switch = now + + # print('Drawing all games, no preferred games found') + # draw_all_games(canvas, games) + # else: + # if len(preferred_games) > 1 and now - last_switch > page_display_time: + # if current_preferred_game + 1 > len(preferred_games): + # current_preferred_game = 0 + # else: + # current_preferred_game = (current_preferred_game + 1) % max(len(games), 1) + + # last_switch = now + # single_preferred_game = [g for g in games if preferred_games[current_preferred_game] == g['id']][0] + # print(f'Switching to preferred game {single_preferred_game['home']} vs {single_preferred_game['away']}') + # draw_single_game(canvas, single_preferred_game) else: canvas.Clear()