home
·
contact
·
privacy
projects
/
plomtask
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove more redundant code.
[plomtask]
/
plomtask
/
days.py
diff --git
a/plomtask/days.py
b/plomtask/days.py
index abfce06f51fc7ab43607ccd177dddc2194667391..258d38dbbf1d7f920f36ca06c9f8292506d16807 100644
(file)
--- a/
plomtask/days.py
+++ b/
plomtask/days.py
@@
-1,9
+1,8
@@
"""Collecting Day and date-related items."""
from __future__ import annotations
from datetime import datetime, timedelta
"""Collecting Day and date-related items."""
from __future__ import annotations
from datetime import datetime, timedelta
-from sqlite3 import Row
from plomtask.exceptions import BadFormatException, NotFoundException
from plomtask.exceptions import BadFormatException, NotFoundException
-from plomtask.db import DatabaseConnection
+from plomtask.db import DatabaseConnection
, BaseModel
DATE_FORMAT = '%Y-%m-%d'
DATE_FORMAT = '%Y-%m-%d'
@@
-25,11
+24,13
@@
def todays_date() -> str:
return datetime.now().strftime(DATE_FORMAT)
return datetime.now().strftime(DATE_FORMAT)
-class Day:
+class Day
(BaseModel[str])
:
"""Individual days defined by their dates."""
"""Individual days defined by their dates."""
+ table_name = 'days'
+ to_save = ['comment']
def __init__(self, date: str, comment: str = '') -> None:
def __init__(self, date: str, comment: str = '') -> None:
- self.
date
= valid_date(date)
+ self.
id_: str
= valid_date(date)
self.datetime = datetime.strptime(self.date, DATE_FORMAT)
self.comment = comment
self.datetime = datetime.strptime(self.date, DATE_FORMAT)
self.comment = comment
@@
-39,13
+40,6
@@
class Day:
def __lt__(self, other: Day) -> bool:
return self.date < other.date
def __lt__(self, other: Day) -> bool:
return self.date < other.date
- @classmethod
- def from_table_row(cls, db_conn: DatabaseConnection, row: Row) -> Day:
- """Make Day from database row, write to cache."""
- day = cls(row[0], row[1])
- db_conn.cached_days[day.date] = day
- return day
-
@classmethod
def all(cls, db_conn: DatabaseConnection,
date_range: tuple[str, str] = ('', ''),
@classmethod
def all(cls, db_conn: DatabaseConnection,
date_range: tuple[str, str] = ('', ''),
@@
-56,9
+50,9
@@
class Day:
start_date = valid_date(date_range[0] if date_range[0] else min_date)
end_date = valid_date(date_range[1] if date_range[1] else max_date)
days = []
start_date = valid_date(date_range[0] if date_range[0] else min_date)
end_date = valid_date(date_range[1] if date_range[1] else max_date)
days = []
- sql = 'SELECT
date FROM days WHERE date >= ? AND date
<= ?'
+ sql = 'SELECT
id FROM days WHERE id >= ? AND id
<= ?'
for row in db_conn.exec(sql, (start_date, end_date)):
for row in db_conn.exec(sql, (start_date, end_date)):
- days += [cls.by_
date
(db_conn, row[0])]
+ days += [cls.by_
id
(db_conn, row[0])]
days.sort()
if fill_gaps and len(days) > 1:
gapless_days = []
days.sort()
if fill_gaps and len(days) > 1:
gapless_days = []
@@
-72,22
+66,23
@@
class Day:
return days
@classmethod
return days
@classmethod
- def by_
date
(cls, db_conn: DatabaseConnection,
-
date: str, create: bool = False) -> Day:
+ def by_
id
(cls, db_conn: DatabaseConnection,
+ date: str, create: bool = False) -> Day:
"""Retrieve Day by date if in DB (prefer cache), else return None."""
"""Retrieve Day by date if in DB (prefer cache), else return None."""
- if date in db_conn.cached_days.keys():
- day = db_conn.cached_days[date]
- assert isinstance(day, Day)
+ day, _ = super()._by_id(db_conn, date)
+ if day:
return day
return day
- for row in db_conn.exec('SELECT * FROM days WHERE date = ?', (date,)):
- return cls.from_table_row(db_conn, row)
if not create:
raise NotFoundException(f'Day not found for date: {date}')
day = cls(date)
if not create:
raise NotFoundException(f'Day not found for date: {date}')
day = cls(date)
- db_conn.cached_days[date] = day
- assert isinstance(day, Day)
+ day.cache()
return day
return day
+ @property
+ def date(self) -> str:
+ """Return self.id_ under the assumption it's a date string."""
+ return self.id_
+
@property
def weekday(self) -> str:
"""Return what weekday matches self.date."""
@property
def weekday(self) -> str:
"""Return what weekday matches self.date."""
@@
-107,6
+102,4
@@
class Day:
def save(self, db_conn: DatabaseConnection) -> None:
"""Add (or re-write) self to DB and cache."""
def save(self, db_conn: DatabaseConnection) -> None:
"""Add (or re-write) self to DB and cache."""
- db_conn.exec('REPLACE INTO days VALUES (?, ?)',
- (self.date, self.comment))
- db_conn.cached_days[self.date] = self
+ self.save_core(db_conn, update_with_lastrowid=False)