voidcli 1.0.0__tar.gz → 1.2.0__tar.gz

{voidcli-1.0.0 → voidcli-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: voidcli
-Version: 1.0.0
+Version: 1.2.0
 Project-URL: Repository, https://github.com/NelsonUrrutia/void
 Author-email: Nelson Urrutia <nelurrutia15@gmail.com>
 License: MIT License
@@ -44,7 +44,7 @@ Description-Content-Type: text/markdown
 # **V**ital **O**ffline **I**nformation **D**iary
 
 ---
-![VOID: wellcome screen, void activities, void collection, void day](https://github.com/NelsonUrrutia/void/blob/main/assets/void-banner.png)
+![VOID: welcome screen, void activities, void collection, void day](https://raw.githubusercontent.com/NelsonUrrutia/void/main/assets/void-banner.png)
 
 > **VOID** is an offline diary to be used in the terminal.
 

{voidcli-1.0.0 → voidcli-1.2.0}/README.md

@@ -12,7 +12,7 @@
 # **V**ital **O**ffline **I**nformation **D**iary
 
 ---
-![VOID: wellcome screen, void activities, void collection, void day](https://github.com/NelsonUrrutia/void/blob/main/assets/void-banner.png)
+![VOID: welcome screen, void activities, void collection, void day](https://raw.githubusercontent.com/NelsonUrrutia/void/main/assets/void-banner.png)
 
 > **VOID** is an offline diary to be used in the terminal.
 

{voidcli-1.0.0 → voidcli-1.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "voidcli"
-version = "1.0.0"
+version = "1.2.0"
 description = ""
 readme = "README.md"
 license = { file = "LICENSE" }

{voidcli-1.0.0 → voidcli-1.2.0}/void/controllers/activity.py

@@ -42,3 +42,20 @@ class ActivityController:
     def suspend_activity(self, activity_id):
         with Activity() as ac:
             ac.suspend_activity(activity_id)
+
+    def get_suspended_activities(self) -> list[tuple]:
+        with Activity() as ac:
+            raw_activities = ac.get_suspended_activities()
+            activities = []
+            for item in raw_activities:
+                activities.append((item['id'], item['activity'], item['category']))
+            return activities
+
+    def restore_activity(self, activity_id) -> bool:
+        """Return False when an active activity already uses that name in its category."""
+        with Activity() as ac:
+            try:
+                ac.restore_activity(activity_id)
+            except sqlite3.IntegrityError:
+                return False
+        return True

{voidcli-1.0.0 → voidcli-1.2.0}/void/main.py

@@ -8,6 +8,7 @@ from void.views.collection import CollectionView
 from void.views.day_note import DayNote
 from void.views.note import NoteView
 from void.views.note_form import NoteForm
+from void.views.suspended import SuspendedView
 from void.views.welcome import WelcomeScreen
 
 
@@ -159,6 +160,8 @@ class VoidApp(App):
             with TabPane("VOID ACTIVITIES", id="void_activities"):
                 yield ActivitiesView()
 
+            with TabPane("VOID SUSPENDED", id="void_suspended"):
+                yield SuspendedView()
 
         yield Footer()
 
@@ -171,6 +174,14 @@ class VoidApp(App):
     @on(ActivitiesView.Changed)
     async def on_activities_changed(self) -> None:
         await self.query_one(NoteView).recompose()
+        await self.query_one(DayNote).recompose()
+        self.query_one(SuspendedView).update_suspended()
+
+    @on(SuspendedView.Restored)
+    async def on_activity_restored(self) -> None:
+        await self.query_one(NoteView).recompose()
+        await self.query_one(DayNote).recompose()
+        self.query_one(ActivitiesView).update_activities()
 
     def on_mount(self) -> None:
         self.title = "VOID"

{voidcli-1.0.0 → voidcli-1.2.0}/void/models/activity.py

@@ -66,3 +66,28 @@ class Activity:
                     WHERE id = ?
                 """
                 db.execute(sql, data)
+
+    def get_suspended_activities(self):
+        with Connection() as db:
+            sql = """
+                SELECT
+                    activities.id as "id",
+                    activities.name as "activity",
+                    categories.name as "category"
+                FROM activities
+                INNER JOIN
+                    categories on categories.id = activities.category_id
+                WHERE activities.is_active = 0
+                ORDER BY categories.name, activities.name"""
+            result = db.querying(sql)
+            return result
+
+    def restore_activity(self, activity_id):
+        with Connection() as db:
+            data = (activity_id,)
+            sql = """
+                UPDATE activities
+                SET is_active = 1
+                WHERE id = ?
+            """
+            db.execute(sql, data)

{voidcli-1.0.0 → voidcli-1.2.0}/void/views/collection.py

@@ -2,11 +2,13 @@ from datetime import date
 from itertools import groupby
 from typing import override
 
+from textual import on
 from textual.app import ComposeResult
-from textual.containers import Grid, Vertical, VerticalScroll
-from textual.widgets import Label, Static
+from textual.containers import Grid, Right, Vertical, VerticalScroll
+from textual.widgets import Button, Label, Static
 
 from void.controllers.note import NoteController
+from void.views.note_modal import NoteModal
 
 
 class CollectionView(Static):
@@ -16,16 +18,24 @@ class CollectionView(Static):
             grid-size: 3;
             grid-gutter: 1;
         }
+        .note_card_actions{
+            height: auto;
+            margin: 0 0 1 0;
+        }
     """
 
     @override
     def __init__(self) -> None:
         super().__init__()
         self.ctrl = NoteController()
+        self.notes_by_date: dict[str, list] = {}
 
     @override
     def compose(self) -> ComposeResult:
         notes = self.ctrl.get_notes()
+        self.notes_by_date = {
+            note_date: list(rows) for note_date, rows in groupby(notes, key=lambda row: row["note_date"])
+        }
         with Vertical(classes="header"):
             yield Label("VOID COLLECTION", classes="module_title")
         with VerticalScroll(classes="main_container"):
@@ -33,7 +43,7 @@ class CollectionView(Static):
                 yield Label("No VOID NOTE saved yet.")
                 return
             with Grid(classes="card_grid note_grid"):
-                for note_date, rows in groupby(notes, key=lambda row: row["note_date"]):
+                for note_date, rows in self.notes_by_date.items():
                     with Vertical(classes="note_card") as card:
                         card.border_title = self.format_date(note_date)
                         for row in rows:
@@ -43,6 +53,14 @@ class CollectionView(Static):
                                     yield Label(row["notes"], classes="entry_note")
                                 else:
                                     yield Label("No notes written.", classes="entry_empty")
+                        with Right(classes="note_card_actions"):
+                            yield Button("EXPAND", name=note_date, classes="open_note", flat=True)
 
     def format_date(self, date_str):
         return date.fromisoformat(date_str).strftime("%B %d, %Y").upper()
+
+    @on(Button.Pressed, ".open_note")
+    def on_open_note(self, event: Button.Pressed) -> None:
+        note_date = event.button.name
+        if note_date in self.notes_by_date:
+            self.app.push_screen(NoteModal(self.format_date(note_date), self.notes_by_date[note_date]))

voidcli-1.2.0/void/views/note_modal.py

@@ -0,0 +1,73 @@
+from itertools import groupby
+from typing import override
+
+from textual import on
+from textual.app import ComposeResult
+from textual.binding import Binding
+from textual.containers import Center, Vertical, VerticalScroll
+from textual.screen import ModalScreen
+from textual.widgets import Button, Label
+
+
+class NoteModal(ModalScreen[None]):
+
+    BINDINGS = [Binding("escape", "close", "Close")]
+
+    DEFAULT_CSS = """
+        NoteModal{
+            align: center middle;
+        }
+        .modal_card{
+            width: 90%;
+            height: 90%;
+            padding: 1 4;
+            border: round $primary;
+            border-title-color: $accent;
+            border-title-style: bold;
+            background: $background;
+        }
+        .modal_card .section_title{
+            padding: 1 0 1 0;
+        }
+        .modal_card .entry_card{
+            padding: 1 0 1 2;
+        }
+        .modal_body{
+            height: 1fr;
+        }
+        .modal_footer{
+            height: auto;
+            padding: 1 0 0 0;
+        }
+    """
+
+    @override
+    def __init__(self, title: str, rows: list) -> None:
+        super().__init__()
+        self.note_title = title
+        self.rows = sorted(rows, key=lambda row: (row["category"], row["activity"]))
+
+    @override
+    def compose(self) -> ComposeResult:
+        with Vertical(classes="modal_card") as card:
+            card.border_title = self.note_title
+            with VerticalScroll(classes="modal_body"):
+                for category, group in groupby(self.rows, key=lambda row: row["category"]):
+                    entries = list(group)
+                    yield Label(f"── {category.upper()} · {len(entries)} ", classes="section_title")
+                    for row in entries:
+                        with Vertical(classes="entry_card"):
+                            yield Label(row["activity"], classes="entry_title")
+                            if row["notes"]:
+                                yield Label(row["notes"], classes="entry_note")
+                            else:
+                                yield Label("No notes written.", classes="entry_empty")
+            with Center(classes="modal_footer"):
+                yield Button("CLOSE", id="close_note_modal", variant="primary", flat=True)
+
+    @on(Button.Pressed, "#close_note_modal")
+    def on_close_pressed(self) -> None:
+        self.action_close()
+
+    def action_close(self) -> None:
+        self.dismiss()

voidcli-1.2.0/void/views/suspended.py

@@ -0,0 +1,109 @@
+from typing import override
+
+from textual import on
+from textual.app import ComposeResult
+from textual.containers import Horizontal, Vertical
+from textual.message import Message
+from textual.widgets import Button, DataTable, Label, Static
+
+from void.controllers.activity import ActivityController
+
+
+class SuspendedView(Static):
+
+    class Restored(Message):
+        """Posted when an activity is restored, so the other views can re-render."""
+
+    DEFAULT_CSS = """
+        #suspended_module{
+            height: 1fr;
+        }
+
+        #selected_activity{
+            color: $text-muted;
+            margin: 1 0 0 0;
+        }
+
+        #suspended_cta_container{
+            height: auto;
+            margin: 1 0;
+        }
+
+        #suspended_cta_container Button{
+            margin: 0 1 0 0;
+        }
+
+        #suspended_table{
+            height: 1fr;
+        }
+    """
+
+    @override
+    def __init__(self) -> None:
+        super().__init__()
+        self.ctrl = ActivityController()
+        self.selected_id: int | None = None
+
+    @override
+    def compose(self) -> ComposeResult:
+        with Vertical(classes="header"):
+            yield Label("VOID SUSPENDED", classes="module_title")
+            yield Label(self.counter_text(), id="counter")
+        with Vertical(classes="main_container", id="suspended_module"):
+            yield Label("SUSPENDED ACTIVITIES", classes="module_title")
+            yield Label(self.selected_text(), id="selected_activity")
+            with Horizontal(id="suspended_cta_container"):
+                yield Button(label="RESTORE", flat=True, id="restore_activity", variant="success", disabled=True)
+                yield Button(label="CLEAR", flat=True, id="clear_selection", variant="default")
+            yield DataTable(id="suspended_table", cursor_type="row")
+
+    def on_mount(self) -> None:
+        self.restore_btn = self.query_one("#restore_activity", Button)
+        self.suspended_table = self.query_one("#suspended_table", DataTable)
+        self.suspended_table.add_columns("ID", "ACTIVITY", "CATEGORY")
+        self.suspended_table.add_rows(self.ctrl.get_suspended_activities())
+
+    def counter_text(self) -> str:
+        total = len(self.ctrl.get_suspended_activities())
+        activities = "activity" if total == 1 else "activities"
+        return f"{total} suspended {activities}"
+
+    def selected_text(self, name: str | None = None) -> str:
+        if name is None:
+            return "Select an activity to restore it."
+        return f"Selected: {name}"
+
+    def update_suspended(self) -> None:
+        self.suspended_table.clear()
+        self.suspended_table.add_rows(self.ctrl.get_suspended_activities())
+        self.query_one("#counter", Label).update(self.counter_text())
+        self.clear_selection()
+
+    @on(DataTable.RowSelected, "#suspended_table")
+    def on_suspended_row_selected(self, event: DataTable.RowSelected) -> None:
+        row = event.data_table.get_row(event.row_key)
+        self.selected_id = row[0]
+        self.query_one("#selected_activity", Label).update(self.selected_text(f"{row[1]} ({row[2]})"))
+        self.restore_btn.disabled = False
+
+    @on(Button.Pressed, "#clear_selection")
+    def on_clear_selection(self) -> None:
+        self.clear_selection()
+
+    @on(Button.Pressed, "#restore_activity")
+    def on_restore_activity(self) -> None:
+        if self.selected_id is None:
+            return
+
+        if not self.ctrl.restore_activity(self.selected_id):
+            self.notify("An active activity with that name already exists in its category", severity="error")
+            return
+
+        self.notify("Activity restored", severity="information")
+        self.update_suspended()
+        self.post_message(self.Restored())
+
+    def clear_selection(self) -> None:
+        self.selected_id = None
+        self.query_one("#selected_activity", Label).update(self.selected_text())
+        self.restore_btn.disabled = True