X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomtask%2Fdays.py;h=776658e14aa6f7f488eeda7546eb8612c2f50ee0;hb=836c33fc94dbb75d241717b7db6a3718edcc0464;hp=ba466b52c792f81029a94f4bc9fcc21718dd500b;hpb=bf8b491d50379772879f1cc9cbe6846fe50ce63b;p=plomtask
diff --git a/plomtask/days.py b/plomtask/days.py
index ba466b5..776658e 100644
--- a/plomtask/days.py
+++ b/plomtask/days.py
@@ -16,6 +16,11 @@ def date_valid(date: str):
return result
+def todays_date():
+ """Return current date in DATE_FORMAT."""
+ return str(datetime.now())[:10]
+
+
class Day:
"""Individual days defined by their dates."""
@@ -41,8 +46,16 @@ class Day:
def all(cls, db_conn: DatabaseConnection,
date_range: tuple[str, str] = ('', '')):
"""Return list of Days in database within date_range."""
- start_date = date_range[0] if date_range[0] else '2024-01-01'
- end_date = date_range[1] if date_range[1] else '2030-12-31'
+ def date_from_range_element(date_str: str, default: str):
+ if date_str == '':
+ date_str = default
+ elif date_str == 'today':
+ date_str = todays_date()
+ elif not date_valid(date_str):
+ raise HandledException(f'Bad date: {date_str}')
+ return date_str
+ start_date = date_from_range_element(date_range[0], '2024-01-01')
+ end_date = date_from_range_element(date_range[1], '2030-01-01')
days = []
sql = 'SELECT * FROM days WHERE date >= ? AND date <= ?'
for row in db_conn.exec(sql, (start_date, end_date)):
@@ -51,10 +64,13 @@ class Day:
return days
@classmethod
- def by_date(cls, db_conn: DatabaseConnection, date: str):
+ def by_date(cls, db_conn: DatabaseConnection,
+ date: str, create: bool = False):
"""Retrieve Day by date if in DB, else return None."""
for row in db_conn.exec('SELECT * FROM days WHERE date = ?', (date,)):
return cls.from_table_row(row)
+ if create:
+ return cls(date)
return None
@property