Merge develop into main for v3.0.2 (#23)

.gitignore

@@ -1,7 +1,7 @@
 /nhle_scoreboard_response.txt
 /nhle_standings_response.txt
-/nhl_standings.db
-/scoreboard_data.json
+/app/data/nhl_standings.db
+/app/data/scoreboard_data.json
 /__pycache__
 /app/__pycache__
 /app/scoreboard/__pycache__

app/routes.py

@@ -3,7 +3,7 @@ from flask import render_template, jsonify
 from app.scoreboard.process_data import extract_game_info
 import json
 
-SCOREBOARD_DATA_FILE = 'scoreboard_data.json'
+SCOREBOARD_DATA_FILE = 'app/data/scoreboard_data.json'
 
 @app.route('/')
 def index():

app/scoreboard/get_data.py

@@ -2,7 +2,7 @@ import requests
 from datetime import datetime
 import json
 
-SCOREBOARD_DATA_FILE = 'scoreboard_data.json'
+SCOREBOARD_DATA_FILE = 'app/data/scoreboard_data.json'
 
 def get_scoreboard_data():
     now = datetime.now()

app/scoreboard/process_data.py

@@ -7,6 +7,7 @@ def extract_game_info(scoreboard_data):
 
     extracted_info = []
     for game in scoreboard_data.get("games", []):
+        game_state = convert_game_state(game["gameState"])
         extracted_info.append({
             "Home Team": game["homeTeam"]["name"]["default"],
             "Home Score": game["homeTeam"]["score"],
@@ -14,7 +15,7 @@ def extract_game_info(scoreboard_data):
             "Away Score": game["awayTeam"]["score"],
             "Home Logo": game["homeTeam"]["logo"],
             "Away Logo": game["awayTeam"]["logo"],
-            "Game State": convert_game_state(game["gameState"]),
+            "Game State": game_state,
             "Period": process_period(game),
             "Time Remaining": process_time_remaining(game),
             "Time Running": game["clock"]["running"],
@@ -27,7 +28,7 @@ def extract_game_info(scoreboard_data):
             "Away Shots": game["awayTeam"]["sog"] if game["gameState"] not in ["PRE", "FUT"] else 0,
             "Home Power Play": get_power_play_info(game, game["homeTeam"]["name"]["default"]),
             "Away Power Play": get_power_play_info(game, game["awayTeam"]["name"]["default"]),
-            "Last Period Type": get_game_outcome(game)
+            "Last Period Type": get_game_outcome(game, game_state)
         })
 
     # Sort games based on priority
@@ -70,8 +71,8 @@ def get_power_play_info(game, team_name):
                 return f"PP {game['situation']['timeRemaining']}"
     return ""
 
-def get_game_outcome(game):
-    return game["gameOutcome"]["lastPeriodType"] if game["gameState"] == "FINAL" else "N/A"
+def get_game_outcome(game, game_state):
+    return game["gameOutcome"]["lastPeriodType"] if game_state == "FINAL" else "N/A"
 
 def calculate_game_priority(game):
     # Return 0 if game is in certain states

app/scoreboard/update_nhl_standings_db.py

@@ -46,7 +46,7 @@ def extract_standings_info():
 
 def update_nhl_standings():
     # Connect to SQLite database
-    conn = sqlite3.connect("nhl_standings.db")
+    conn = sqlite3.connect("app/data/nhl_standings.db")
 
     # Create standings table if it doesn't exist
     create_standings_table(conn)