From 97635dd3f2daae86fa42320a5e2b8b0b6f17cbbe Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Wed, 4 Mar 2026 20:11:11 -0500 Subject: [PATCH] Change varible import to new util function --- util/scrape.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/util/scrape.py b/util/scrape.py index 9dd6eeb..ba2e3a2 100644 --- a/util/scrape.py +++ b/util/scrape.py @@ -3,14 +3,13 @@ Utility functions for scaping web data relative to selected games """ -import os -from dotenv import load_dotenv - import httpx from dateutil import parser, utils from bs4 import BeautifulSoup -load_dotenv() +from util.environment import load_environment_variables + +project_variables: dict = load_environment_variables() def scrape_game_history(game: str, year: int = utils.today().year) -> dict: """ @@ -30,20 +29,21 @@ def scrape_game_history(game: str, year: int = utils.today().year) -> dict: """ drawings = {} - url = f"{os.getenv('BASE_SCRAPE_URL')}{game}/numbers/{year}" + url = f"{project_variables['LP_BASE_SCRAPE_URL']}{game}/numbers/{year}" page = httpx.get(url) soup = BeautifulSoup(page.text, 'html.parser') - results = soup.find_all(os.getenv('RESULT_CONTAINER'), class_=os.getenv('RESULT_CLASS')) + results = soup.find_all(project_variables['LP_RESULT_CONTAINER'], class_=project_variables['LP_RESULT_CLASS']) for result in results: pick5 = [] - draw_date = parser.parse(result.find(os.getenv('DRAW_DATE_CONTAINER'), - class_=os.getenv('DRAW_DATE_CLASS')).text).date().strftime('%Y-%m-%d') - main_balls = result.find_all(os.getenv('BALL_CONTAINER'), class_=os.getenv('BALL_CLASS')) - game_ball = result.find(os.getenv('BALL_CONTAINER'), - class_=[os.getenv('POWERBALL_CLASS'), os.getenv('MEGABALL_CLASS')]) - multiplier = result.find(os.getenv('BALL_CONTAINER'), - class_=[os.getenv('POWERBALL_MULTIPLIER_CLASS'), os.getenv('MEGA_MILLIONS_MULTIPLIER_CLASS')]) + draw_date = parser.parse(result.find(project_variables['LP_DRAW_DATE_CONTAINER'], + class_=project_variables['LP_DRAW_DATE_CLASS']).text).date().strftime('%Y-%m-%d') + main_balls = result.find_all(project_variables['LP_BALL_CONTAINER'], class_=project_variables['LP_BALL_CLASS']) + game_ball = result.find(project_variables['LP_BALL_CONTAINER'], + class_=[project_variables['LP_POWERBALL_CLASS'], project_variables['LP_MEGABALL_CLASS']]) + multiplier = result.find(project_variables['LP_BALL_CONTAINER'], + class_=[project_variables['LP_POWERBALL_MULTIPLIER_CLASS'], + project_variables['LP_MEGA_MILLIONS_MULTIPLIER_CLASS']]) for ball in main_balls: pick5.append(int(ball.text.strip()))