alex/scoreboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2nd attempt at cycling

Browse Source
This commit is contained in:
Alex Frantz
2026-05-05 17:39:47 -04:00
parent 43755aba7b
commit 8233bf4d1b
1 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scoreboard.py
+22 -33
View File
@@ -397,47 +397,36 @@ def run():
# cycle through preferred games and all games # cycle through preferred games and all games
all_games_max_page = math.ceil(len(games) / 4) all_games_max_page = math.ceil(len(games) / 4)
if now - last_switch > page_display_time: if now - last_switch > page_display_time:
if preferred_game_on and len(preferred_games) > 0 and current_preferred_game <= len(preferred_games): if len(current_preferred_game) > 0:
if current_preferred_game + 1 <= len(preferred_games): if current_preferred_game <= len(preferred_games):
current_preferred_game = (current_preferred_game + 1) % max(len(games), 1) if current_preferred_game == len(preferred_games):
current_page = 0
current_page = (current_page + 4) % max(len(games), 1)
print('Drawing all games, no preferred games found')
draw_all_games(canvas, games, current_page)
else:
current_preferred_game += 1
single_preferred_game = [g for g in games if preferred_games[current_preferred_game] == g['id']][0] 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']}') print(f'Switching to preferred game {single_preferred_game['home']} vs {single_preferred_game['away']}')
draw_single_game(canvas, single_preferred_game) draw_single_game(canvas, single_preferred_game)
elif current_page <= all_games_max_page:
if len(preferred_games) >= current_preferred_game: if current_page == all_games_max_page:
current_page = 0
else:
if all_games_max_page >= current_page:
current_preferred_game = 0 current_preferred_game = 0
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: else:
print(all_games_max_page)
current_page = (current_page + 4) % max(len(games), 1) current_page = (current_page + 4) % max(len(games), 1)
print('Drawing all games, no preferred games found') print('Drawing all games, no preferred games found')
draw_all_games(canvas, games) draw_all_games(canvas, games, current_page)
else:
if current_page >= all_games_max_page:
current_page = (current_page + 4) % max(len(games), 1)
else:
current_page = 0
last_switch = now print('Drawing all games, no preferred games found')
draw_all_games(canvas, games, current_page)
# 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: else:
canvas.Clear() canvas.Clear()