From 148bdaefc4c05d48dc3740bfce99191337c9291e Mon Sep 17 00:00:00 2001 From: Josh Wright Date: Mon, 19 Feb 2024 01:29:34 -0500 Subject: [PATCH 1/3] fix: creates data folder --- app/routes.py | 2 +- app/scoreboard/get_data.py | 2 +- app/scoreboard/update_nhl_standings_db.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/routes.py b/app/routes.py index aff021e..dc39732 100644 --- a/app/routes.py +++ b/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(): diff --git a/app/scoreboard/get_data.py b/app/scoreboard/get_data.py index f7f5c6a..23b59d0 100644 --- a/app/scoreboard/get_data.py +++ b/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() diff --git a/app/scoreboard/update_nhl_standings_db.py b/app/scoreboard/update_nhl_standings_db.py index 45e9120..c1e4455 100644 --- a/app/scoreboard/update_nhl_standings_db.py +++ b/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) From c926821e1acc3ce944eee82b45ef66e488e9f8d8 Mon Sep 17 00:00:00 2001 From: Josh Wright Date: Mon, 19 Feb 2024 01:31:39 -0500 Subject: [PATCH 2/3] .gitignore: update gitignore --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9aae150..09d6e93 100644 --- a/.gitignore +++ b/.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__ From 5beb7e2b4498e4a74211d419e43294ca140bc315 Mon Sep 17 00:00:00 2001 From: Josh Wright Date: Mon, 19 Feb 2024 02:07:08 -0500 Subject: [PATCH 3/3] fix: last period type --- app/scoreboard/process_data.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/scoreboard/process_data.py b/app/scoreboard/process_data.py index 8d11926..b78d2b1 100644 --- a/app/scoreboard/process_data.py +++ b/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