X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomtask%2Fdays.py;h=0936d047aa3eda7c4ce9374c90ca3f9ad3362ad5;hb=12bbfea600184c9e2657cc9a0c705848a4dae29a;hp=d64b34b6bc69c01fd6d6a17437bbc90f357d301a;hpb=9e32ae00d4435932d55695be4e757ff109c76f26;p=plomtask

diff --git a/plomtask/days.py b/plomtask/days.py
index d64b34b..0936d04 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,14 +16,20 @@ 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."""
 
-    def __init__(self, date: str):
+    def __init__(self, date: str, comment: str = ''):
         self.date = date
         self.datetime = date_valid(self.date)
         if not self.datetime:
             raise HandledException(f'Given date of wrong format: {self.date}')
+        self.comment = comment
 
     def __eq__(self, other: object):
         return isinstance(other, self.__class__) and self.date == other.date
@@ -34,14 +40,22 @@ class Day:
     @classmethod
     def from_table_row(cls, row: Row):
         """Make new Day from database row."""
-        return cls(row[0])
+        return cls(row[0], row[1])
 
     @classmethod
     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_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)):
@@ -50,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
@@ -61,6 +78,19 @@ 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 (?)', (self.date,))
+        db_conn.exec('REPLACE INTO days VALUES (?, ?)',
+                     (self.date, self.comment))