diff --git a/util/drawing.py b/util/drawing.py index 8f0512d..8e765c4 100644 --- a/util/drawing.py +++ b/util/drawing.py @@ -1,12 +1,12 @@ from datetime import datetime -from dateutil.relativedelta import relativedelta, MO, TU, WE, FR +from dateutil.relativedelta import relativedelta, MO, TU, WE, FR, SA def get_next_draw_date(game: str, from_date: str | None = None) -> str: """ Gets the next drawing date from the current or specified date for the given game If the current date is the next drawing date, the current date is returned - + :param game: megamillions or powerball :param from_date: date to get next drawing date from, if omitted the current date is used :return: next drawing date @@ -37,13 +37,13 @@ def get_next_draw_date(game: str, from_date: str | None = None) -> str: elif day_of_week in [5, 6, 0]: return_date = (from_date + relativedelta(weekday=TU)).strftime(return_date_format) elif game == 'powerball': - """drawings are on Monday, Wednesday, and Friday""" - if day_of_week in [0, 2, 4]: + """drawings are on Monday, Wednesday, and Saturday""" + if day_of_week in [0, 2, 5]: return_date = from_date.strftime(return_date_format) elif day_of_week == 1: return_date = (from_date + relativedelta(weekday=WE)).strftime(return_date_format) - elif day_of_week == 3: - return_date = (from_date + relativedelta(weekday=FR)).strftime(return_date_format) - elif day_of_week in [5, 6]: + elif day_of_week in [3, 4]: + return_date = (from_date + relativedelta(weekday=SA)).strftime(return_date_format) + elif day_of_week == 6: return_date = (from_date + relativedelta(weekday=MO)).strftime(return_date_format) return return_date