X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=plomtask%2Ftodos.py;h=ebe35ac56bb78af42a10644c9209b34778527c0e;hb=8f6b4ec61b126d6edbfda4f20d62398d92390a95;hp=348dbddcbb96338ba1f1e10da50e094e36b92f63;hpb=89624d5e05480c832a079008bbb9992f411be0dd;p=plomtask diff --git a/plomtask/todos.py b/plomtask/todos.py index 348dbdd..ebe35ac 100644 --- a/plomtask/todos.py +++ b/plomtask/todos.py @@ -26,12 +26,12 @@ class Todo(BaseModel): self.children: list[Todo] = [] self.parents: list[Todo] = [] self.conditions: list[Condition] = [] - self.fulfills: list[Condition] = [] - self.undoes: list[Condition] = [] + self.enables: list[Condition] = [] + self.disables: list[Condition] = [] if not self.id_: self.conditions = process.conditions[:] - self.fulfills = process.fulfills[:] - self.undoes = process.undoes[:] + self.enables = process.enables[:] + self.disables = process.disables[:] @classmethod def from_table_row(cls, db_conn: DatabaseConnection, @@ -47,30 +47,24 @@ class Todo(BaseModel): return todo @classmethod - def by_id(cls, db_conn: DatabaseConnection, id_: int | None) -> Todo: + def by_id(cls, db_conn: DatabaseConnection, id_: int) -> Todo: """Get Todo of .id_=id_ and children (from DB cache if possible).""" - if id_: - todo, from_cache = super()._by_id(db_conn, id_) - else: - todo, from_cache = None, False + todo, from_cache = super()._by_id(db_conn, id_) if todo is None: raise NotFoundException(f'Todo of ID not found: {id_}') if not from_cache: - for row in db_conn.exec('SELECT child FROM todo_children ' - 'WHERE parent = ?', (id_,)): - todo.children += [cls.by_id(db_conn, row[0])] - for row in db_conn.exec('SELECT parent FROM todo_children ' - 'WHERE child = ?', (id_,)): - todo.parents += [cls.by_id(db_conn, row[0])] - for row in db_conn.exec('SELECT condition FROM todo_conditions ' - 'WHERE todo = ?', (id_,)): - todo.conditions += [Condition.by_id(db_conn, row[0])] - for row in db_conn.exec('SELECT condition FROM todo_fulfills ' - 'WHERE todo = ?', (id_,)): - todo.fulfills += [Condition.by_id(db_conn, row[0])] - for row in db_conn.exec('SELECT condition FROM todo_undoes ' - 'WHERE todo = ?', (id_,)): - todo.undoes += [Condition.by_id(db_conn, row[0])] + for t_id in db_conn.column_where('todo_children', 'child', + 'parent', id_): + todo.children += [cls.by_id(db_conn, t_id)] + for t_id in db_conn.column_where('todo_children', 'parent', + 'child', id_): + todo.parents += [cls.by_id(db_conn, t_id)] + for name in ('conditions', 'enables', 'disables'): + table = f'todo_{name}' + for cond_id in db_conn.column_where(table, 'condition', + 'todo', todo.id_): + target = getattr(todo, name) + target += [Condition.by_id(db_conn, cond_id)] assert isinstance(todo, Todo) return todo @@ -78,33 +72,34 @@ class Todo(BaseModel): def by_date(cls, db_conn: DatabaseConnection, date: str) -> list[Todo]: """Collect all Todos for Day of date.""" todos = [] - for row in db_conn.exec('SELECT id FROM todos WHERE day = ?', (date,)): - todos += [cls.by_id(db_conn, row[0])] + for id_ in db_conn.column_where('todos', 'id', 'day', date): + todos += [cls.by_id(db_conn, id_)] return todos + @staticmethod + def _x_ablers_for_at(db_conn: DatabaseConnection, name: str, + cond: Condition, date: str) -> list[Todo]: + """Collect all Todos of day that [name] condition.""" + assert isinstance(cond.id_, int) + x_ablers = [] + table = f'todo_{name}' + for id_ in db_conn.column_where(table, 'todo', 'condition', cond.id_): + todo = Todo.by_id(db_conn, id_) + if todo.date == date: + x_ablers += [todo] + return x_ablers + @classmethod - def enablers_for_at(cls, db_conn: DatabaseConnection, condition: Condition, - date: str) -> list[Todo]: + def enablers_for_at(cls, db_conn: DatabaseConnection, + condition: Condition, date: str) -> list[Todo]: """Collect all Todos of day that enable condition.""" - enablers = [] - for row in db_conn.exec('SELECT todo FROM todo_fulfills ' - 'WHERE condition = ?', (condition.id_,)): - todo = cls.by_id(db_conn, row[0]) - if todo.date == date: - enablers += [todo] - return enablers + return cls._x_ablers_for_at(db_conn, 'enables', condition, date) @classmethod def disablers_for_at(cls, db_conn: DatabaseConnection, condition: Condition, date: str) -> list[Todo]: """Collect all Todos of day that disable condition.""" - disablers = [] - for row in db_conn.exec('SELECT todo FROM todo_undoes ' - 'WHERE condition = ?', (condition.id_,)): - todo = cls.by_id(db_conn, row[0]) - if todo.date == date: - disablers += [todo] - return disablers + return cls._x_ablers_for_at(db_conn, 'disables', condition, date) @property def is_doable(self) -> bool: @@ -134,19 +129,20 @@ class Todo(BaseModel): if self._is_done != value: self._is_done = value if value is True: - for condition in self.fulfills: + for condition in self.enables: condition.is_active = True - for condition in self.undoes: + for condition in self.disables: condition.is_active = False - def set_undoes(self, db_conn: DatabaseConnection, ids: list[int]) -> None: - """Set self.undoes to Conditions identified by ids.""" - self.set_conditions(db_conn, ids, 'undoes') - - def set_fulfills(self, db_conn: DatabaseConnection, + def set_disables(self, db_conn: DatabaseConnection, ids: list[int]) -> None: - """Set self.fulfills to Conditions identified by ids.""" - self.set_conditions(db_conn, ids, 'fulfills') + """Set self.disables to Conditions identified by ids.""" + self.set_conditions(db_conn, ids, 'disables') + + def set_enables(self, db_conn: DatabaseConnection, + ids: list[int]) -> None: + """Set self.enables to Conditions identified by ids.""" + self.set_conditions(db_conn, ids, 'enables') def set_conditions(self, db_conn: DatabaseConnection, ids: list[int], target: str = 'conditions') -> None: @@ -185,7 +181,7 @@ class Todo(BaseModel): [[c.id_] for c in self.children]) db_conn.rewrite_relations('todo_conditions', 'todo', self.id_, [[c.id_] for c in self.conditions]) - db_conn.rewrite_relations('todo_fulfills', 'todo', self.id_, - [[c.id_] for c in self.fulfills]) - db_conn.rewrite_relations('todo_undoes', 'todo', self.id_, - [[c.id_] for c in self.undoes]) + db_conn.rewrite_relations('todo_enables', 'todo', self.id_, + [[c.id_] for c in self.enables]) + db_conn.rewrite_relations('todo_disables', 'todo', self.id_, + [[c.id_] for c in self.disables])