X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomtask%2Fdays.py;h=04592a311e3a1abb3fc067699c72237059ee5b5a;hb=32f7f7084797cfa3a303e2c68ce46dfcf2b436bf;hp=776658e14aa6f7f488eeda7546eb8612c2f50ee0;hpb=736d41c2813776569a37805e4637a380290a1656;p=plomtask
diff --git a/plomtask/days.py b/plomtask/days.py
index 776658e..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
@@ -18,7 +18,7 @@ def date_valid(date: str):
def todays_date():
"""Return current date in DATE_FORMAT."""
- return str(datetime.now())[:10]
+ return datetime.now().strftime(DATE_FORMAT)
class Day:
@@ -44,9 +44,9 @@ 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."""
- def date_from_range_element(date_str: str, default: str):
+ def date_from_range_str(date_str: str, default: str):
if date_str == '':
date_str = default
elif date_str == 'today':
@@ -54,13 +54,22 @@ class Day:
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')
+ 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
@@ -78,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 (?, ?)',