bearcli 1.4.0__tar.gz → 1.5.0__tar.gz

{bearcli-1.4.0 → bearcli-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bearcli
-Version: 1.4.0
+Version: 1.5.0
 Summary: The missing CLI for Bear notes — read, search, export, and manage your notes from the terminal
 Keywords: bear,notes,cli,markdown,macos
 Author: Michel Tricot
@@ -88,11 +88,13 @@ bearcli stats                                # counts, words, top tags, notes pe
 ### Terminal UI
 
 `bearcli ui` is a full Bear client in the terminal: the note list with live
-filtering on the left, preview and inline markdown editor on the right.
-`/` search - `Enter` edit - `n`/`c` new note - `t`/`T` tag/untag (with
-autocompletion) - `o` open in Bear - `a` archive - `d` trash - `r` reload.
-Notes with detected secrets are marked 🚨; encrypted notes show 🔒 and keep
-their content in Bear.
+filtering on the left, markdown preview and inline editor on the right.
+`/` search - `enter`/`e` edit (`ctrl+s` saves, with an unsaved-changes
+guard) - `n`/`c` new note - `t`/`T` tag/untag - `o` open in Bear - `a`
+archive - `d` trash - `1`/`2`/`3` notes/archive/trash views - `j`/`k`
+navigation - `?` shows the full key map. Notes with detected secrets get a
+red title, a 🚨 badge, and the secret values highlighted in the preview and
+editor; encrypted notes show 🔒 and keep their content in Bear.
 
 ### Search
 

{bearcli-1.4.0 → bearcli-1.5.0}/README.md

@@ -64,11 +64,13 @@ bearcli stats                                # counts, words, top tags, notes pe
 ### Terminal UI
 
 `bearcli ui` is a full Bear client in the terminal: the note list with live
-filtering on the left, preview and inline markdown editor on the right.
-`/` search - `Enter` edit - `n`/`c` new note - `t`/`T` tag/untag (with
-autocompletion) - `o` open in Bear - `a` archive - `d` trash - `r` reload.
-Notes with detected secrets are marked 🚨; encrypted notes show 🔒 and keep
-their content in Bear.
+filtering on the left, markdown preview and inline editor on the right.
+`/` search - `enter`/`e` edit (`ctrl+s` saves, with an unsaved-changes
+guard) - `n`/`c` new note - `t`/`T` tag/untag - `o` open in Bear - `a`
+archive - `d` trash - `1`/`2`/`3` notes/archive/trash views - `j`/`k`
+navigation - `?` shows the full key map. Notes with detected secrets get a
+red title, a 🚨 badge, and the secret values highlighted in the preview and
+editor; encrypted notes show 🔒 and keep their content in Bear.
 
 ### Search
 

{bearcli-1.4.0 → bearcli-1.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bearcli"
-version = "1.4.0"
+version = "1.5.0"
 description = "The missing CLI for Bear notes — read, search, export, and manage your notes from the terminal"
 readme = "README.md"
 keywords = ["bear", "notes", "cli", "markdown", "macos"]

{bearcli-1.4.0 → bearcli-1.5.0}/src/bearcli/cli/misc.py

@@ -101,9 +101,5 @@ def ui(
     """Bear in the terminal: search, edit, create, tag, and organize notes."""
     from bearcli.tui import run_ui
 
-    db = _open_db(db_path)
-    try:
-        notes = db.list_notes(limit=None, tag=tag_filter, with_text=True)
-    finally:
-        db.close()
-    run_ui(notes, fuzzy=fuzzy, db_path=db_path, tag_filter=tag_filter)
+    _open_db(db_path).close()  # fail fast with a clear message if the db is missing
+    run_ui(fuzzy=fuzzy, db_path=db_path, tag_filter=tag_filter)

{bearcli-1.4.0 → bearcli-1.5.0}/src/bearcli/tui.py

@@ -20,7 +20,7 @@ from textual.app import App, ComposeResult
 from textual.binding import Binding
 from textual.containers import Horizontal, Vertical, VerticalScroll
 from textual.screen import ModalScreen
-from textual.widgets import Footer, Input, Label, OptionList, Static, TextArea
+from textual.widgets import Input, Label, LoadingIndicator, OptionList, Static, TextArea
 from textual.widgets.option_list import Option
 
 from bearcli import actions, ops
@@ -98,6 +98,19 @@ def _highlighted(value: str, query: str, base_style: str = "") -> Text:
 class SecretTextArea(TextArea):
     """TextArea that renders detected secret values on a light red background."""
 
+    async def _on_key(self, event: events.Key) -> None:
+        # With tab_behavior="indent", TextArea claims escape as its
+        # focus-escape key (in _on_key, not via bindings); route it to the
+        # app's editor-exit instead.
+        if event.key == "escape":
+            event.stop()
+            event.prevent_default()
+            app = self.app
+            assert isinstance(app, BearUI)
+            app.action_back_or_quit()
+            return
+        await super()._on_key(event)
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.secret_values: list[str] = []
@@ -124,6 +137,32 @@ class _TagSuggestions(OptionList):
         super().action_cursor_down()
 
 
+class ConfirmDiscard(ModalScreen[str | None]):
+    """Confirmation shown when leaving the editor with unsaved changes."""
+
+    BINDINGS = [
+        Binding("s", "answer('save')", "Save"),
+        Binding("y", "answer('discard')", "Discard"),
+        Binding("n,escape", "answer('keep')", "Keep editing"),
+    ]
+    CSS = """
+    ConfirmDiscard { align: center middle; }
+    #confirm-box {
+        width: 52; height: auto; padding: 1 2;
+        border: round $warning; background: $panel;
+    }
+    #confirm-keys { color: $text-muted; margin-top: 1; }
+    """
+
+    def compose(self) -> ComposeResult:
+        with Vertical(id="confirm-box"):
+            yield Label("You have unsaved changes.")
+            yield Label("[b]s[/b] save   [b]y[/b] discard   [b]n[/b]/[b]esc[/b] keep editing", id="confirm-keys")
+
+    def action_answer(self, answer: str) -> None:
+        self.dismiss(answer)
+
+
 class TagScreen(ModalScreen[str | None]):
     """Tag prompt with autocompletion over known tags."""
 
@@ -179,6 +218,97 @@ class TagScreen(ModalScreen[str | None]):
         self.dismiss(None)
 
 
+BROWSE_KEYS_BEAR = [
+    ("enter/e", "Edit"),
+    ("n/c", "New"),
+    ("t", "Tag"),
+    ("o", "Open in Bear"),
+    ("a", "Archive"),
+    ("d", "Trash"),
+]
+BROWSE_KEYS_TUI = [
+    ("/", "Search"),
+    ("1/2/3", "View"),
+    ("tab", "Pane"),
+    ("?", "Help"),
+    ("esc", "Quit"),
+]
+EDIT_KEYS_BEAR = [("ctrl+s", "Save to Bear")]
+EDIT_KEYS_TUI = [("tab", "Indent"), ("esc", "Discard")]
+
+
+def _keybar_markup(keys: list[tuple[str, str]]) -> str:
+    return "  ".join(f"[bold]{key}[/bold] [dim]{label}[/dim]" for key, label in keys)
+
+
+class KeyBar(Horizontal):
+    """Bottom key bar: Bear actions on the left, TUI controls on the right."""
+
+    DEFAULT_CSS = """
+    KeyBar { dock: bottom; height: 1; background: $panel; padding: 0 1; }
+    KeyBar > #kb-left { width: auto; }
+    KeyBar > #kb-right { width: 1fr; text-align: right; }
+    """
+
+    def compose(self) -> ComposeResult:
+        yield Static(id="kb-left")
+        yield Static(id="kb-right")
+
+    def show(self, bear: list[tuple[str, str]], tui: list[tuple[str, str]]) -> None:
+        self.query_one("#kb-left", Static).update(_keybar_markup(bear))
+        self.query_one("#kb-right", Static).update(_keybar_markup(tui))
+
+
+HELP_ROWS = [
+    ("Navigate", ""),
+    ("↑ or k", "previous note"),
+    ("↓ or j", "next note"),
+    ("/", "focus search"),
+    ("tab", "switch pane"),
+    ("1 / 2 / 3", "notes / archive / trash view"),
+    ("Act on the selected note", ""),
+    ("enter or e", "edit in the right panel"),
+    ("n or c", "new note"),
+    ("t / T", "add / remove a tag"),
+    ("o", "open in Bear"),
+    ("a", "archive"),
+    ("d", "move to trash"),
+    ("r", "reload from Bear"),
+    ("While editing", ""),
+    ("ctrl+s", "save to Bear"),
+    ("esc", "discard changes"),
+]
+
+
+class HelpScreen(ModalScreen[None]):
+    """Key map overlay."""
+
+    BINDINGS = [Binding("escape,question_mark", "close", "Close")]
+    CSS = """
+    HelpScreen { align: center middle; }
+    #help-box {
+        width: 62; height: auto; padding: 1 2;
+        border: round $accent; background: $panel;
+    }
+    """
+
+    def compose(self) -> ComposeResult:
+        table = RichTable.grid(padding=(0, 2))
+        table.add_column(style="bold", no_wrap=True)
+        table.add_column()
+        for key, description in HELP_ROWS:
+            if not description:
+                if table.row_count:
+                    table.add_row("", "")  # blank line between sections
+                table.add_row(Text(key, "dim italic"), "")
+            else:
+                table.add_row(key, description)
+        yield Static(table, id="help-box")
+
+    def action_close(self) -> None:
+        self.dismiss(None)
+
+
 class BearUI(App):
     """Browse, edit, and organize Bear notes from the terminal."""
 
@@ -188,17 +318,19 @@ class BearUI(App):
     CSS = """
     #query { dock: top; margin: 0 1; border: round $primary; }
     #query:focus { border: round $accent; }
-    #results { width: 34%; border: round $panel-lighten-2; }
-    #results:focus { border: round $accent; }
+    #list-pane { width: 34%; border: round $panel-lighten-2; }
+    #list-pane:focus-within { border: round $accent; }
+    #results { height: 1fr; border: none; background: transparent; }
+    #list-pane LoadingIndicator { height: 1fr; }
     #side { width: 66%; }
     #preview-pane { height: 1fr; border: round $panel-lighten-2; padding: 0 1; }
+    #preview-pane:focus { border: round $accent; }
     #editor { height: 1fr; border: round $accent; display: none; }
-    Horizontal { height: 1fr; margin: 0 1; }
+    #main { height: 1fr; margin: 0 1; }
     """
 
     BINDINGS = [
-        Binding("escape", "back_or_quit", "Quit"),
-        Binding("/", "focus_search", "Search"),
+        # Bear actions (left of the footer)
         Binding("e", "edit_selected", "Edit", key_display="enter/e"),
         Binding("enter", "edit_selected", "Edit", show=False),
         Binding("n", "new_note", "New", key_display="n/c"),
@@ -206,25 +338,38 @@ class BearUI(App):
         Binding("t", "add_tag", "Tag"),
         Binding("T", "remove_tag", "Untag", show=False),
         Binding("o", "open_in_bear", "Open in Bear"),
-        Binding("r", "refresh", "Refresh", show=False),
         Binding("a", "archive_note", "Archive"),
         Binding("d", "trash_note", "Trash"),
+        Binding("r", "refresh", "Refresh", show=False),
+        Binding("j", "cursor_down", "Next note", show=False),
+        Binding("k", "cursor_up", "Previous note", show=False),
         Binding("ctrl+s", "save_edit", "Save to Bear"),
-        Binding("tab", "focus_next", "Switch pane", show=False),
+        # TUI controls (right of the footer)
+        Binding("/", "focus_search", "Search"),
+        Binding("1", "switch_view('notes')", "View", key_display="1/2/3"),
+        Binding("2", "switch_view('archive')", "Archive view", show=False),
+        Binding("3", "switch_view('trash')", "Trash view", show=False),
+        Binding("tab", "focus_next", "Switch pane", priority=True),
+        Binding("question_mark", "help", "Help", key_display="?"),
+        Binding("escape", "back_or_quit", "Quit"),
     ]
 
     def __init__(
         self,
-        notes: list[Note],
+        notes: list[Note] | None = None,
         fuzzy: bool = False,
         db_path: Path = DEFAULT_DB_PATH,
         tag_filter: str | None = None,
     ):
         super().__init__()
-        self.notes = notes
+        self._preloaded = notes is not None
+        self._focus_list_after_load = False
+        self._editor_original = ""
+        self.notes = notes or []
         self.fuzzy = fuzzy
         self.db_path = db_path
         self.tag_filter = tag_filter
+        self.view = "notes"  # notes | archive | trash
         self.search_query = ""
         self.shown: list[Note] = []
         self.editing: Note | None = None
@@ -237,13 +382,14 @@ class BearUI(App):
 
     def compose(self) -> ComposeResult:
         yield Input(placeholder="Search notes…", id="query")
-        with Horizontal():
-            yield OptionList(id="results")
+        with Horizontal(id="main"):
+            with Vertical(id="list-pane"):
+                yield OptionList(id="results")
             with Vertical(id="side"):
                 with VerticalScroll(id="preview-pane"):
                     yield Static(id="preview-content")
-                yield SecretTextArea(language="markdown", id="editor")
-        yield Footer()
+                yield SecretTextArea(language="markdown", id="editor", tab_behavior="indent")
+        yield KeyBar()
 
     @property
     def edit_mode(self) -> bool:
@@ -260,6 +406,10 @@ class BearUI(App):
             "trash_note",
             "focus_search",
             "refresh",
+            "switch_view",
+            "focus_next",
+            "cursor_down",
+            "cursor_up",
         }
         if self.edit_mode and action in browse_only:
             return False
@@ -270,9 +420,27 @@ class BearUI(App):
     # ── searching / listing ──────────────────────────────────────────────
 
     def on_mount(self) -> None:
-        self._show_results("", [SearchResult(note=n, snippet="") for n in self.notes])
+        self.query_one(KeyBar).show(BROWSE_KEYS_BEAR, BROWSE_KEYS_TUI)
         self.query_one("#results", OptionList).focus()
-        self._scan_secrets()
+        if self._preloaded:
+            self._show_results("", [SearchResult(note=n, snippet="") for n in self.notes])
+            self._scan_secrets()
+        else:
+            self._set_list_loading(True)
+            self._rehydrate()
+
+    def _set_list_loading(self, on: bool) -> None:
+        results = self.query_one("#results", OptionList)
+        pane = self.query_one("#list-pane")
+        if on:
+            self._focus_list_after_load = not (isinstance(self.focused, Input) and self.focused.value)
+            results.display = False
+            if not pane.query("LoadingIndicator"):
+                pane.mount(LoadingIndicator())
+        else:
+            for indicator in pane.query(LoadingIndicator):
+                indicator.remove()
+            results.display = True
 
     @work(exclusive=True, thread=True, group="scan")
     def _scan_secrets(self) -> None:
@@ -280,6 +448,14 @@ class BearUI(App):
 
     def _apply_secret_values(self, values: dict[str, dict[str, str]]) -> None:
         self.secret_values = values
+        results = self.query_one("#results", OptionList)
+        self._set_list_loading(False)
+        if self._focus_list_after_load:
+            # The hidden list dropped focus into the search box during the
+            # load; take it back unless the user started typing.
+            self._focus_list_after_load = False
+            if not self.query_one("#query", Input).value:
+                results.focus()
         self._run_filter(self.search_query)
 
     @work(thread=True, group="refresh")
@@ -290,7 +466,7 @@ class BearUI(App):
             fresh = db.get_note(note_id)
         finally:
             db.close()
-        if fresh is None or fresh.trashed or fresh.archived:
+        if fresh is None or not self._in_current_view(fresh):
             self.notes = [n for n in self.notes if n.id != note_id]
             self.secret_values.pop(note_id, None)
         else:
@@ -307,10 +483,11 @@ class BearUI(App):
 
     @work(exclusive=True, thread=True, group="rehydrate")
     def _rehydrate(self) -> None:
-        """Reload every note from the database - manual refresh, also catches edits made in Bear."""
+        """Reload the current view from the database - also catches edits made in Bear."""
         db = BearDB(self.db_path)
         try:
-            notes = db.list_notes(limit=None, tag=self.tag_filter, with_text=True)
+            only = {"archive": "archived", "trash": "trashed"}.get(self.view)
+            notes = db.list_notes(limit=None, tag=self.tag_filter, with_text=True, only=only)
         finally:
             db.close()
         self.notes = notes
@@ -365,7 +542,8 @@ class BearUI(App):
         result_list = self.query_one("#results", OptionList)
         result_list.clear_options()
         result_list.add_options(options)
-        result_list.border_title = f"{len(self.shown)} / {len(self.notes)} notes"
+        prefix = {"notes": "", "archive": "Archive · ", "trash": "Trash · "}[self.view]
+        self.query_one("#list-pane").border_title = f"{prefix}{len(self.shown)} / {len(self.notes)} notes"
         select_id, self._select_id = self._select_id, None
         index = next((i for i, n in enumerate(self.shown) if n.id == select_id), None) if select_id else None
         if self.shown:
@@ -441,12 +619,14 @@ class BearUI(App):
         editor = self.query_one("#editor", SecretTextArea)
         editor.secret_values = list(secrets or [])
         editor.text = text
+        self._editor_original = text
         editor.border_title = title
         self.query_one("#preview-pane").styles.display = "none"
         editor.styles.display = "block"
         editor.focus()
         if cursor:
             editor.cursor_location = cursor
+        self.query_one(KeyBar).show(EDIT_KEYS_BEAR, EDIT_KEYS_TUI)
         self.refresh_bindings()
 
     def _exit_editor(self) -> None:
@@ -457,6 +637,7 @@ class BearUI(App):
         self.query_one("#results", OptionList).focus()
         if note := self._selected():
             self.query_one("#preview-content", Static).update(self._preview(note))
+        self.query_one(KeyBar).show(BROWSE_KEYS_BEAR, BROWSE_KEYS_TUI)
         self.refresh_bindings()
 
     def action_edit_selected(self) -> None:
@@ -490,7 +671,17 @@ class BearUI(App):
 
     def action_back_or_quit(self) -> None:
         if self.edit_mode:
-            self._exit_editor()
+            if self.query_one("#editor", SecretTextArea).text != self._editor_original:
+
+                def on_answer(answer: str | None) -> None:
+                    if answer == "discard":
+                        self._exit_editor()
+                    elif answer == "save":
+                        self.action_save_edit()
+
+                self.push_screen(ConfirmDiscard(), on_answer)
+            else:
+                self._exit_editor()
         elif isinstance(self.focused, Input):
             self.query_one("#results", OptionList).focus()
         else:
@@ -520,9 +711,29 @@ class BearUI(App):
 
             self.push_screen(TagScreen(f"Remove tag from “{note.title}”", note.tags), on_done)
 
+    def action_switch_view(self, view: str) -> None:
+        if view == self.view:
+            return
+        self.view = view
+        self._select_id = None
+        self.notify({"notes": "Notes", "archive": "Archive", "trash": "Trash"}[view] + " view")
+        self._set_list_loading(True)
+        self._rehydrate()
+
+    def action_help(self) -> None:
+        self.push_screen(HelpScreen())
+
+    def action_cursor_down(self) -> None:
+        if len(self.screen_stack) == 1:
+            self.query_one("#results", OptionList).action_cursor_down()
+
+    def action_cursor_up(self) -> None:
+        if len(self.screen_stack) == 1:
+            self.query_one("#results", OptionList).action_cursor_up()
+
     def action_refresh(self) -> None:
+        self._set_list_loading(True)
         self._rehydrate()
-        self.notify("Reloading from Bear…")
 
     def action_archive_note(self) -> None:
         self._file_away("archive")
@@ -575,7 +786,17 @@ class BearUI(App):
         message = f"Tagged with {tag!r}" if add else f"Removed tag {tag!r}"
         self._after_write(note.id, fresh, message, "Tag" if add else "Untag", edit_after=True)
 
+    def _in_current_view(self, note: Note) -> bool:
+        if self.view == "trash":
+            return note.trashed
+        if self.view == "archive":
+            return note.archived and not note.trashed
+        return not note.trashed and not note.archived
+
     def _file_away(self, operation: str) -> None:
+        if (operation == "trash" and self.view == "trash") or (operation == "archive" and self.view == "archive"):
+            self.notify(f"Already in the {self.view} view", severity="warning")
+            return
         if note := self._selected():
             self._file_away_worker(note, operation)
 
@@ -615,9 +836,8 @@ class BearUI(App):
 
 
 def run_ui(
-    notes: list[Note],
     fuzzy: bool = False,
     db_path: Path = DEFAULT_DB_PATH,
     tag_filter: str | None = None,
 ) -> None:
-    BearUI(notes, fuzzy=fuzzy, db_path=db_path, tag_filter=tag_filter).run()
+    BearUI(fuzzy=fuzzy, db_path=db_path, tag_filter=tag_filter).run()