X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=plomtask%2Fdating.py;h=26b3ce3f4c2dae84fb44c8366d4a96882ced76ef;hb=refs%2Fheads%2Fmaster;hp=711da95efabfc97153cca3c5d85eb63348244397;hpb=8945aa6762977c04538c49c320417311b38232be;p=plomtask diff --git a/plomtask/dating.py b/plomtask/dating.py index 711da95..26b3ce3 100644 --- a/plomtask/dating.py +++ b/plomtask/dating.py @@ -3,8 +3,6 @@ from datetime import datetime, timedelta from plomtask.exceptions import BadFormatException DATE_FORMAT = '%Y-%m-%d' -MIN_RANGE_DATE = '2024-01-01' -MAX_RANGE_DATE = '2030-12-31' def valid_date(date_str: str) -> str: @@ -13,13 +11,11 @@ def valid_date(date_str: str) -> str: In any case, returns in DATE_FORMAT. """ if date_str == 'today': - date_str = todays_date() + date_str = date_in_n_days(0) elif date_str == 'yesterday': - date = datetime.now() - timedelta(days=1) - date_str = date.strftime(DATE_FORMAT) + date_str = date_in_n_days(-1) elif date_str == 'tomorrow': - date = datetime.now() + timedelta(days=1) - date_str = date.strftime(DATE_FORMAT) + date_str = date_in_n_days(1) try: dt = datetime.strptime(date_str, DATE_FORMAT) except (ValueError, TypeError) as e: @@ -28,6 +24,7 @@ def valid_date(date_str: str) -> str: return dt.strftime(DATE_FORMAT) -def todays_date() -> str: - """Return current date in DATE_FORMAT.""" - return datetime.now().strftime(DATE_FORMAT) +def date_in_n_days(n: int) -> str: + """Return in DATE_FORMAT date from today + n days.""" + date = datetime.now() + timedelta(days=n) + return date.strftime(DATE_FORMAT)