diff --git a/Dockerfile b/Dockerfile index b6d2c17..40b89e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM python:3.9 +ENV TZ="America/New_York" RUN mkdir -p /usr/src/app WORKDIR /usr/src/app COPY . . diff --git a/app.py b/app.py index 77f657c..8e78170 100644 --- a/app.py +++ b/app.py @@ -21,6 +21,9 @@ scheduler.init_app(app) scheduler.start() +# Logging +logging.basicConfig(format="%(asctime)s %(levelname)-8s %(message)s", level=logging.INFO, datefmt="%Y-%m-%d %H:%M:%S") + @app.route("/") def index(): diff --git a/src/scrapers/reg_hours_scraper.py b/src/scrapers/reg_hours_scraper.py index 5ab76ce..0452ed2 100644 --- a/src/scrapers/reg_hours_scraper.py +++ b/src/scrapers/reg_hours_scraper.py @@ -39,7 +39,7 @@ def fetch_reg_building(): date = datetime.now() + timedelta(days=i) # Get spreadsheet info - weekday = DAYS_OF_WEEK[i] + weekday = DAYS_OF_WEEK[date.weekday()] names = vals["Name"] # Add to database @@ -86,7 +86,7 @@ def fetch_reg_bowling(vals): date = datetime.now() + timedelta(days=i) # Get spreadsheet info - weekday = DAYS_OF_WEEK[i] + weekday = DAYS_OF_WEEK[date.weekday()] names = vals["Name"] # Add to database @@ -121,7 +121,7 @@ def fetch_reg_court(vals): date = datetime.now() + timedelta(days=i) # Get spreadsheet info - weekday = DAYS_OF_WEEK[i] + weekday = DAYS_OF_WEEK[date.weekday()] names = vals["Name"] # Add to database @@ -156,7 +156,7 @@ def fetch_reg_pool(vals): date = datetime.now() + timedelta(days=i) # Get spreadsheet info - weekday = DAYS_OF_WEEK[i] + weekday = DAYS_OF_WEEK[date.weekday()] names = vals["Name"] # Add to database @@ -196,7 +196,7 @@ def fetch_reg_fc(vals): date = datetime.now() + timedelta(days=i) # Get spreadsheet info - weekday = DAYS_OF_WEEK[i] + weekday = DAYS_OF_WEEK[date.weekday()] names = vals["Name"] # Add to database diff --git a/src/scrapers/sp_hours_scraper.py b/src/scrapers/sp_hours_scraper.py index f218048..2ed147f 100644 --- a/src/scrapers/sp_hours_scraper.py +++ b/src/scrapers/sp_hours_scraper.py @@ -45,9 +45,9 @@ def fetch_sp_facility(): # Check if hours exist and is within next 7 days if hours and within_week(date): - if hours == MARKER_CLOSED: - clean_hours(date, get_facility_id(name)) - else: + # Clean hours from database + clean_hours(date, get_facility_id(name)) + if hours != MARKER_CLOSED: parse_special_hours(hours, type, date, get_facility_id(name)) @@ -101,9 +101,6 @@ def add_special_facility_hours(start_time, end_time, facility_id, court_type=Non start_unix = unix_time(start_time) end_unix = unix_time(end_time) - # Clean hours from database - clean_hours(start_time, facility_id) - # Create hours hrs = OpenHours( end_time=end_unix,