X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomtask%2Fdays.py;h=04592a311e3a1abb3fc067699c72237059ee5b5a;hb=32f7f7084797cfa3a303e2c68ce46dfcf2b436bf;hp=ba466b52c792f81029a94f4bc9fcc21718dd500b;hpb=bf8b491d50379772879f1cc9cbe6846fe50ce63b;p=plomtask

diff --git a/plomtask/days.py b/plomtask/days.py
index ba466b5..04592a3 100644
--- a/plomtask/days.py
+++ b/plomtask/days.py
@@ -1,5 +1,5 @@
 """Collecting Day and date-related items."""
-from datetime import datetime
+from datetime import datetime, timedelta
 from sqlite3 import Row
 from plomtask.misc import HandledException
 from plomtask.db import DatabaseConnection
@@ -16,6 +16,11 @@ def date_valid(date: str):
     return result
 
 
+def todays_date():
+    """Return current date in DATE_FORMAT."""
+    return datetime.now().strftime(DATE_FORMAT)
+
+
 class Day:
     """Individual days defined by their dates."""
 
@@ -39,22 +44,42 @@ class Day:
 
     @classmethod
     def all(cls, db_conn: DatabaseConnection,
-            date_range: tuple[str, str] = ('', '')):
+            date_range: tuple[str, str] = ('', ''), fill_gaps: bool = False):
         """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_str(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_str(date_range[0], '2024-01-01')
+        end_date = date_from_range_str(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)):
             days += [cls.from_table_row(row)]
         days.sort()
+        if fill_gaps and len(days) > 1:
+            gapless_days = []
+            for i, day in enumerate(days):
+                gapless_days += [day]
+                if i < len(days) - 1:
+                    while day.next_date != days[i+1].date:
+                        day = Day(day.next_date)
+                        gapless_days += [day]
+            days = gapless_days
         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
@@ -62,6 +87,18 @@ class Day:
         """Return what weekday matches self.date."""
         return self.datetime.strftime('%A')
 
+    @property
+    def prev_date(self):
+        """Return date preceding date of this Day."""
+        prev_datetime = self.datetime - timedelta(days=1)
+        return prev_datetime.strftime(DATE_FORMAT)
+
+    @property
+    def next_date(self):
+        """Return date succeeding date of this Day."""
+        next_datetime = self.datetime + timedelta(days=1)
+        return next_datetime.strftime(DATE_FORMAT)
+
     def save(self, db_conn: DatabaseConnection):
         """Add (or re-write) self to database."""
         db_conn.exec('REPLACE INTO days VALUES (?, ?)',