src/tt/cli.py

@@ -6,7 +6,6 @@ from .controller.tasks import add_task
 from .import_csv import import_tasks_from_csv
 from .db import initialize_db
 from .tui import tasks
-from .tui import recurring
 
 app = typer.Typer()
 
@@ -49,12 +48,6 @@ def browse(
     tasks.run(view)
 
 
-@app.command()
-def generators():
-    initialize_db()
-    recurring.run()
-
-
 @app.command()
 def import_csv(filename: str):
     import_tasks_from_csv(filename)

src/tt/controller/generators.py

@@ -1,40 +0,0 @@
-from ..db import db, TaskGenerator, GeneratorType
-import json
-
-
-def get_generator(item_id: int) -> TaskGenerator:
-    return TaskGenerator.get_by_id(item_id)
-
-
-def get_generators() -> list[TaskGenerator]:
-    query = TaskGenerator.select().where(~TaskGenerator.deleted)
-    return query.order_by("type", "template")
-
-
-def add_generator(
-    template: str,
-    type: GeneratorType,
-    val: str,
-) -> TaskGenerator:
-    # JSON for future expansion
-    config = json.dumps({"val": val})
-    with db.atomic():
-        task = TaskGenerator.create(
-            template=template,
-            type=type,
-            config=config,
-        )
-    return task
-
-
-def update_generator(
-    item_id: int,
-    **kwargs,
-) -> TaskGenerator:
-    config = {"val": kwargs.pop("val")}
-    kwargs["config"] = json.dumps(config)
-    with db.atomic():
-        query = TaskGenerator.update(kwargs).where(TaskGenerator.id == item_id)
-        query.execute()
-        task = TaskGenerator.get_by_id(item_id)
-    return task

src/tt/db.py

@@ -28,11 +28,6 @@ class TaskStatus(Enum):
     DONE = "done"
 
 
-class GeneratorType(Enum):
-    DAYS_BETWEEN = "days-btwn"
-    MONTHLY = "monthly"
-
-
 class BaseModel(Model):
     class Meta:
         database = db
@@ -73,28 +68,33 @@ class SavedSearch(BaseModel):
         return self.name
 
 
-class TaskGenerator(BaseModel):
+class TaskGenerator(Model):
     template = CharField()
     type = CharField()
-    config = TextField()  # JSON
+    config = TextField()
     deleted = BooleanField(default=False)
     last_generated_at = DateTimeField(null=True)
     created_at = DateTimeField(default=datetime.now)
 
     def should_generate(self) -> bool:
+        """
+        generator types: config keys
+            recurring: days_between
+            monthly: day_of_month
+        """
         if self.deleted:
             return False
         if not self.last_generated_at:
             return True
 
         now = datetime.now()
-        if self.type == GeneratorType.DAYS_BETWEEN:
+        if self.type == "recurring":
-            days_between = self.config["val"]
+            days_between = self.config["days_between"]
             days_since = (now - self.last_generated_at).days
             return days_since >= days_between
 
-        elif self.type == GeneratorType.MONTHLY:
+        elif self.type == "monthly":
-            day_of_month = self.config["val"]
+            day_of_month = self.generator_config["day_of_month"]
 
             # check each day until now to see if target day occurred
             one_day = timedelta(days=1)
@@ -111,7 +111,14 @@ class TaskGenerator(BaseModel):
 
 def initialize_db():
     db.connect()
-    db.create_tables([Category, Task, SavedSearch, TaskGenerator])
+    db.create_tables(
+        [
+            Category,
+            Task,
+            SavedSearch,
+            # TaskGenerator
+        ]
+    )
     if not Category.select().exists():
         Category.create(name="default")
     db.close()

src/tt/tui/editor.py

@@ -15,26 +15,11 @@ from ..utils import (
 )
 from .keymodal import KeyModal
 
-ELLIPSIS = "…"
-
 
 class NotifyValidationError(Exception):
     """will notify and continue if raised"""
 
 
-def _enum_preprocessor(enumCls):
-    """generate a default preprocessor to enforce enums"""
-
-    def preprocessor(val):
-        try:
-            enumCls(val)
-            return val
-        except ValueError:
-            raise NotifyValidationError(
-                f"Invalid value. Use: {[s.value for s in enumCls]}"
-            )
-
-
 class TableColumnConfig:
     def __init__(
         self,
@@ -53,12 +38,7 @@ class TableColumnConfig:
         self.enable_editor = enable_editor
         self.enum = enum
         self.filterable = filterable
-        if preprocessor:
+        self.preprocessor = preprocessor or (lambda x: x)
-            self.preprocessor = preprocessor
-        elif self.enum:
-            self.preprocessor = _enum_preprocessor(self.enum)
-        else:
-            self.preprocessor = lambda x: x
 
 
 class TableEditor(App):
@@ -213,7 +193,7 @@ class TableEditor(App):
         if self.table.cursor_column == 0:
             cur_row = self.table.cursor_row
             item_id = int(self.table.get_cell_at((cur_row, 0)))
-            # deletable items need a delete
+            # TODO: deletable items need a delete
             self.update_item_callback(item_id, deleted=True)
             self._save_cursor()
             self.refresh_data()
@@ -233,7 +213,7 @@ class TableEditor(App):
 
         new_item = self.add_item_callback(**prepopulated)
         self.refresh_data(restore_cursor=False)
-        self.move_cursor_to_item(new_item.id)  # TODO: check success here
+        self.move_cursor_to_item(new_item.id)
         self.action_start_change()
 
     def _active_column_config(self):
@@ -256,8 +236,8 @@ class TableEditor(App):
             # trigger item_id to be saved on the next cursor move
             # this avoids filtered columns disappearing right away
             # and tons of DB writes
-            update = {cconf.field: next_val}
+            # TODO: status hard coded here
-            self._register_save_on_move(item_id, **update)
+            self._register_save_on_move(item_id, status=next_val)
 
     def _register_save_on_move(self, item_id, **kwargs):
         if self.save_on_move and self.save_on_move["item_id"] != item_id:
@@ -327,10 +307,6 @@ class TableEditor(App):
         current_value = self.table.get_cell_at(
             (self.table.cursor_row, self.table.cursor_column)
         )
-        if current_value.endswith(ELLIPSIS):
-            # TODO: flash message?
-            # need to edit with e
-            return
         current_value = remove_rich_tag(current_value)
         self._show_input("edit", current_value)
 
@@ -387,7 +363,7 @@ class TableEditor(App):
             self.update_item_callback(item_id, **update_data)
             self.refresh_data()
         except NotifyValidationError as e:
-            self.notify(str(e))
+            self.notify(e.message)
         except Exception as e:
             self.notify(f"Error updating item: {str(e)}")
         finally:

src/tt/tui/overview.py

@@ -1,139 +0,0 @@
-from textual.app import App, ComposeResult
-from textual.containers import ScrollableContainer, Horizontal
-from textual.widgets import DataTable, Static
-from textual.binding import Binding
-from datetime import datetime
-
-from ..controller.summaries import (
-    get_category_summary,
-    get_recently_active,
-    get_due_soon,
-)
-
-
-class CategoryTable(DataTable):
-    """Table showing category summaries"""
-
-    def on_mount(self):
-        self.add_columns(
-            "Category", "Zero", "WIP", "Blocked", "Done", "Overdue", "Due Soon"
-        )
-        self.refresh_data()
-
-    def refresh_data(self):
-        self.clear()
-        summaries = get_category_summary(10)  # Show top 10 categories
-        for summary in summaries:
-            self.add_row(
-                summary["category"],
-                str(summary["tasks"]["zero"]),
-                str(summary["tasks"]["wip"]),
-                str(summary["tasks"]["blocked"]),
-                str(summary["tasks"]["done"]),
-                str(summary["tasks"]["overdue"]),
-                str(summary["tasks"]["due_soon"]),
-            )
-
-
-class TaskList(DataTable):
-    """Base class for task list tables"""
-
-    def on_mount(self):
-        self.add_columns("Task", "Status", "Category", "Due Date")
-
-    def format_due_date(self, due_date: datetime | None) -> str:
-        if not due_date:
-            return "No due date"
-        return due_date.strftime("%Y-%m-%d")
-
-
-class DueTaskList(TaskList):
-    """Table showing upcoming and overdue tasks"""
-
-    def on_mount(self):
-        super().on_mount()
-        self.refresh_data()
-
-    def refresh_data(self):
-        self.clear()
-        tasks = get_due_soon(10, all_overdue=True)  # Show all overdue + next 10
-        for task in tasks:
-            self.add_row(
-                task["text"],
-                task["status"],
-                task["category"] or "No category",
-                self.format_due_date(task["due"]),
-                key=str(task["id"]),
-            )
-
-
-class RecentTaskList(TaskList):
-    """Table showing recently active tasks"""
-
-    def on_mount(self):
-        super().on_mount()
-        self.refresh_data()
-
-    def refresh_data(self):
-        self.clear()
-        tasks = get_recently_active(10)  # Show 10 most recent
-        for task in tasks:
-            self.add_row(
-                task["text"],
-                task["status"],
-                task["category"] or "No category",
-                self.format_due_date(task["due"]),
-                key=str(task["id"]),
-            )
-
-
-class Overview(App):
-    """Task overview application"""
-
-    TITLE = "Task Overview"
-    CSS = """
-    CategoryTable {
-        height: 40%;
-        margin: 1 1;
-    }
-    
-    #lists {
-        height: 60%;
-    }
-    
-    TaskList {
-        width: 50%;
-        margin: 1 1;
-    }
-    
-    Static {
-        content-align: center middle;
-        background: $panel;
-        padding: 1;
-    }
-    """
-
-    BINDINGS = [
-        Binding("q", "quit", "Quit"),
-        Binding("r", "refresh", "Refresh Data"),
-    ]
-
-    def compose(self) -> ComposeResult:
-        yield CategoryTable()
-        yield Static("Upcoming and Recent Tasks")
-        with Horizontal(id="lists"):
-            with ScrollableContainer():
-                yield DueTaskList()
-            with ScrollableContainer():
-                yield RecentTaskList()
-
-    def action_refresh(self):
-        """Refresh all data in the tables"""
-        self.query_one(CategoryTable).refresh_data()
-        self.query_one(DueTaskList).refresh_data()
-        self.query_one(RecentTaskList).refresh_data()
-
-
-if __name__ == "__main__":
-    app = Overview()
-    app.run()

src/tt/tui/recurring.py

@@ -1,58 +0,0 @@
-import json
-from datetime import datetime
-
-from ..controller.generators import (
-    get_generator,
-    get_generators,
-    add_generator,
-    update_generator,
-)
-from ..db import GeneratorType
-from .editor import (
-    TableEditor,
-    TableColumnConfig,
-    NotifyValidationError,
-)
-
-
-def due_preprocessor(val):
-    try:
-        return datetime.strptime(val, "%Y-%m-%d")
-    except ValueError:
-        raise NotifyValidationError("Invalid date format. Use YYYY-MM-DD")
-
-
-class TaskGenEditor(TableEditor):
-    TABLE_CONFIG = (
-        TableColumnConfig("id", "ID"),
-        TableColumnConfig("template", "Template", default="recur {val}"),
-        TableColumnConfig(
-            "type",
-            "Type",
-            default=GeneratorType.DAYS_BETWEEN.value,
-            enum=GeneratorType,
-        ),
-        TableColumnConfig("val", "Value", default=""),
-    )
-
-    def __init__(self):
-        super().__init__()
-        self.update_item_callback = update_generator
-        self.add_item_callback = add_generator
-        self.get_item_callback = get_generator
-
-    def refresh_items(self):
-        items = get_generators()
-        for item in items:
-            self.table.add_row(
-                str(item.id), item.template, item.type, json.loads(item.config)["val"]
-            )
-
-
-def run():
-    app = TaskGenEditor()
-    app.run()
-
-
-if __name__ == "__main__":
-    run()

src/tt/tui/tasks.py

@@ -20,7 +20,6 @@ from .editor import (
     TableEditor,
     TableColumnConfig,
     NotifyValidationError,
-    ELLIPSIS,
 )
 
 
@@ -31,6 +30,16 @@ def due_preprocessor(val):
         raise NotifyValidationError("Invalid date format. Use YYYY-MM-DD")
 
 
+def status_preprocessor(val):
+    try:
+        TaskStatus(val)
+        return val
+    except ValueError:
+        raise NotifyValidationError(
+            f"Invalid status. Use: {[s.value for s in TaskStatus]}"
+        )
+
+
 class TT(TableEditor):
     TABLE_CONFIG = (
         TableColumnConfig("id", "ID"),
@@ -40,6 +49,7 @@ class TT(TableEditor):
             "Status",
             default="zero",
             enum=TaskStatus,
+            preprocessor=status_preprocessor,
         ),
         TableColumnConfig("type", "Type", default=""),
         TableColumnConfig("due", "Due", default="", preprocessor=due_preprocessor),
@@ -102,14 +112,9 @@ class TT(TableEditor):
             status = get_colored_status(item.status)
             due = get_colored_date(item.due)
 
-            if "\n" in item.text:
-                text = item.text.split("\n")[0] + ELLIPSIS
-            else:
-                text = item.text
-
             self.table.add_row(
                 str(item.id),
-                text,
+                item.text.split("\n")[0],  # first line
                 status,
                 item.type,
                 due,