Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6fea1af544 | ||
|
|
b828f8ec79 | ||
|
|
df42aba1d3 |
10 changed files with 468 additions and 122 deletions
|
|
@ -14,8 +14,6 @@ jobs:
|
|||
set -euo pipefail
|
||||
git clone --mirror "https://git.breadway.dev/${GITHUB_REPOSITORY}.git" repo.git
|
||||
cd repo.git
|
||||
# Mirror only branches and tags (not refs/pull/*, which GitHub rejects);
|
||||
# --prune deletes GitHub refs that no longer exist on Forgejo.
|
||||
git push --prune \
|
||||
"https://x-access-token:${{ secrets.MIRROR_TOKEN }}@github.com/Breadway/breadpad.git" \
|
||||
'+refs/heads/*:refs/heads/*' '+refs/tags/*:refs/tags/*'
|
||||
|
|
|
|||
58
.forgejo/workflows/release.yml
Normal file
58
.forgejo/workflows/release.yml
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
name: release
|
||||
|
||||
on:
|
||||
push:
|
||||
tags: ["v*"]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: [self-hosted, hestia]
|
||||
steps:
|
||||
- name: checkout
|
||||
run: |
|
||||
set -euo pipefail
|
||||
rm -rf src && mkdir src
|
||||
git clone --branch "${GITHUB_REF_NAME}" --depth 1 \
|
||||
"https://git.breadway.dev/${GITHUB_REPOSITORY}.git" src
|
||||
|
||||
- name: build
|
||||
run: cd src && cargo build --release --locked
|
||||
|
||||
- name: prepare artifacts
|
||||
run: |
|
||||
set -euo pipefail
|
||||
VERSION="${GITHUB_REF_NAME#v}"
|
||||
PKG_DIR="/srv/breadway-dl/breadpad/${VERSION}"
|
||||
mkdir -p "${PKG_DIR}"
|
||||
for bin in breadpad breadman; do
|
||||
cp "src/target/release/${bin}" "${PKG_DIR}/${bin}-x86_64"
|
||||
strip "${PKG_DIR}/${bin}-x86_64"
|
||||
sha256sum "${PKG_DIR}/${bin}-x86_64" | awk '{print $1}' \
|
||||
> "${PKG_DIR}/${bin}-x86_64.sha256"
|
||||
done
|
||||
cp src/breadpad.example.toml "${PKG_DIR}/"
|
||||
cp src/bakery.toml "${PKG_DIR}/bakery.toml"
|
||||
ln -sfn "${VERSION}" "/srv/breadway-dl/breadpad/latest"
|
||||
|
||||
- name: regenerate index.json
|
||||
run: |
|
||||
set -euo pipefail
|
||||
rm -rf /tmp/bread-ecosystem-ci
|
||||
git clone https://git.breadway.dev/Breadway/bread-ecosystem.git /tmp/bread-ecosystem-ci
|
||||
bash /tmp/bread-ecosystem-ci/scripts/gen-index.sh
|
||||
|
||||
- name: upload to GitHub Release
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GH_RELEASE_TOKEN }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
VERSION="${GITHUB_REF_NAME#v}"
|
||||
PKG_DIR="/srv/breadway-dl/breadpad/${VERSION}"
|
||||
gh release create "${GITHUB_REF_NAME}" --repo Breadway/breadpad \
|
||||
--title "breadpad v${VERSION}" --generate-notes 2>/dev/null || true
|
||||
gh release upload "${GITHUB_REF_NAME}" --repo Breadway/breadpad \
|
||||
"${PKG_DIR}/breadpad-x86_64" \
|
||||
"${PKG_DIR}/breadman-x86_64" \
|
||||
"${PKG_DIR}/breadpad-x86_64.sha256" \
|
||||
"${PKG_DIR}/breadman-x86_64.sha256" \
|
||||
--clobber
|
||||
66
.github/workflows/release.yml
vendored
66
.github/workflows/release.yml
vendored
|
|
@ -1,66 +0,0 @@
|
|||
name: release
|
||||
|
||||
on:
|
||||
push:
|
||||
tags: ["v*"]
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
env:
|
||||
DL_DIR: /srv/breadway-dl
|
||||
ECOSYSTEM_DIR: /home/breadway/Projects/bread-ecosystem
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: [self-hosted, hestia]
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: install build deps
|
||||
run: sudo apt-get install -y libgtk-4-dev libdbus-1-dev pkg-config 2>/dev/null || true
|
||||
|
||||
- name: build
|
||||
run: cargo build --release --locked
|
||||
|
||||
- name: prepare artifacts
|
||||
run: |
|
||||
VERSION="${GITHUB_REF_NAME#v}"
|
||||
PKG_DIR="${DL_DIR}/breadpad/${VERSION}"
|
||||
mkdir -p "${PKG_DIR}"
|
||||
for bin in breadpad breadman; do
|
||||
cp "target/release/${bin}" "${PKG_DIR}/${bin}-x86_64"
|
||||
strip "${PKG_DIR}/${bin}-x86_64"
|
||||
sha256sum "${PKG_DIR}/${bin}-x86_64" | awk '{print $1}' \
|
||||
> "${PKG_DIR}/${bin}-x86_64.sha256"
|
||||
done
|
||||
cp breadpad.example.toml "${PKG_DIR}/"
|
||||
cp bakery.toml "${PKG_DIR}/bakery.toml"
|
||||
ln -sfn "${VERSION}" "${DL_DIR}/breadpad/latest"
|
||||
|
||||
- name: ensure bread-ecosystem
|
||||
run: |
|
||||
if [[ -d "${ECOSYSTEM_DIR}/.git" ]]; then
|
||||
git -C "${ECOSYSTEM_DIR}" pull --ff-only
|
||||
else
|
||||
mkdir -p "$(dirname "${ECOSYSTEM_DIR}")"
|
||||
git clone https://github.com/Breadway/bread-ecosystem.git "${ECOSYSTEM_DIR}"
|
||||
fi
|
||||
|
||||
- name: regenerate index.json
|
||||
run: bash "${ECOSYSTEM_DIR}/scripts/gen-index.sh"
|
||||
|
||||
- name: upload to GitHub Release
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
VERSION="${GITHUB_REF_NAME#v}"
|
||||
PKG_DIR="${DL_DIR}/breadpad/${VERSION}"
|
||||
gh release create "${GITHUB_REF_NAME}" \
|
||||
--title "breadpad v${VERSION}" --generate-notes 2>/dev/null || true
|
||||
gh release upload "${GITHUB_REF_NAME}" \
|
||||
"${PKG_DIR}/breadpad-x86_64" \
|
||||
"${PKG_DIR}/breadman-x86_64" \
|
||||
"${PKG_DIR}/breadpad-x86_64.sha256" \
|
||||
"${PKG_DIR}/breadman-x86_64.sha256" \
|
||||
--clobber
|
||||
8
Cargo.lock
generated
8
Cargo.lock
generated
|
|
@ -315,7 +315,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "breadman"
|
||||
version = "0.3.4"
|
||||
version = "0.4.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"breadpad-shared",
|
||||
|
|
@ -332,7 +332,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "breadpad"
|
||||
version = "0.3.4"
|
||||
version = "0.4.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"breadpad-shared",
|
||||
|
|
@ -351,7 +351,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "breadpad-shared"
|
||||
version = "0.3.4"
|
||||
version = "0.4.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bread-theme",
|
||||
|
|
@ -377,7 +377,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "breadpad-test"
|
||||
version = "0.3.4"
|
||||
version = "0.4.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"breadpad-shared",
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ members = [
|
|||
resolver = "2"
|
||||
|
||||
[workspace.package]
|
||||
version = "0.3.4"
|
||||
version = "0.4.0"
|
||||
edition = "2021"
|
||||
license = "MIT"
|
||||
authors = ["Breadway"]
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ User-defined tags can be added freely on top of the built-in types.
|
|||
|
||||
- **One-off reminders** — natural language time ("at 7pm", "in 30 minutes", "tomorrow morning") parsed at classification time; scheduled via a systemd user timer
|
||||
- **Recurring reminders** — "every Sunday at 9pm", "every weekday morning" — stored as an iCal-compatible RRULE and re-scheduled on each trigger
|
||||
- **Snooze** — notification popup includes snooze actions: 15 min / 1 hour / tomorrow morning / custom; snoozing reschedules the timer without touching the original note
|
||||
- **Snooze** — notification popup includes snooze actions drawn from `snooze_options` (default: 15 min / 1 hour / tomorrow morning); snoozing reschedules the timer without touching the original note
|
||||
- **Missed reminders** — if the system was off or suspended at the scheduled time, the reminder fires on next login
|
||||
|
||||
### Viewer (`breadman`)
|
||||
|
|
@ -139,7 +139,7 @@ breadpad model-info # shows active EP and model path
|
|||
- systemd user session (for timer-backed reminders)
|
||||
- Rust 1.80+
|
||||
- **Tier 2 (ONNX classifier):** An external `libonnxruntime.so`. Set `model.ort_dylib_path` in `breadpad.toml`, or set `ORT_DYLIB_PATH` in your environment. Without a library, Tier 2 is disabled; Tier 1 + 3 still work.
|
||||
- **Tier 3 only (optional):** [Ollama](https://ollama.com) running locally with your chosen model pulled (`ollama pull llama3.2:3b`). Tier 3 is silently skipped if Ollama is not running.
|
||||
- **Tier 3 only (optional):** [Ollama](https://ollama.com) running locally with your chosen model pulled (e.g. `ollama pull fastflowlm`). Tier 3 is silently skipped if Ollama is not running.
|
||||
|
||||
---
|
||||
|
||||
|
|
@ -183,7 +183,7 @@ ort_dylib_path = "" # optional: explicit path to libonnxruntime.so;
|
|||
|
||||
[model.ollama]
|
||||
endpoint = "http://localhost:11434"
|
||||
model = "llama3.2:3b" # any model you have pulled in Ollama
|
||||
model = "fastflowlm" # any model you have pulled in Ollama
|
||||
confidence_threshold = 0.6 # Tier 2 scores below this trigger Tier 3
|
||||
enabled = true # set false to never call Ollama
|
||||
|
||||
|
|
@ -243,6 +243,9 @@ breadpad --no-classify
|
|||
|
||||
# Show model and storage status
|
||||
breadpad --status
|
||||
|
||||
# Print expected model paths (does not download automatically)
|
||||
breadpad download-model
|
||||
```
|
||||
|
||||
Hyprland keybind:
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ use breadpad_shared::{
|
|||
store::Store,
|
||||
types::{Note, NoteType, RecurrenceRule},
|
||||
};
|
||||
use chrono::Local;
|
||||
use chrono::{DateTime, Local, Utc};
|
||||
use gtk4::{glib, prelude::*};
|
||||
use std::cell::RefCell;
|
||||
use std::rc::Rc;
|
||||
|
|
@ -69,10 +69,21 @@ struct AppState {
|
|||
errors: Rc<RefCell<Vec<(chrono::DateTime<Local>, String)>>>,
|
||||
active_view: Rc<RefCell<String>>,
|
||||
stack: gtk4::Stack,
|
||||
/// Sidebar row id ("all", "upcoming", "archive", or a note type name) ->
|
||||
/// its count `Label`, so counts can be refreshed in place after every
|
||||
/// `rebuild_stack` without rebuilding the sidebar itself.
|
||||
sidebar_counts: Rc<RefCell<Vec<(String, gtk4::Label)>>>,
|
||||
status_label: gtk4::Label,
|
||||
}
|
||||
|
||||
impl AppState {
|
||||
fn new(store: Arc<Store>, notes: Vec<Note>, cfg: Config, stack: gtk4::Stack) -> Self {
|
||||
fn new(
|
||||
store: Arc<Store>,
|
||||
notes: Vec<Note>,
|
||||
cfg: Config,
|
||||
stack: gtk4::Stack,
|
||||
status_label: gtk4::Label,
|
||||
) -> Self {
|
||||
AppState {
|
||||
store,
|
||||
notes: Rc::new(RefCell::new(notes)),
|
||||
|
|
@ -80,6 +91,8 @@ impl AppState {
|
|||
errors: Rc::new(RefCell::new(Vec::new())),
|
||||
active_view: Rc::new(RefCell::new("all".to_string())),
|
||||
stack,
|
||||
sidebar_counts: Rc::new(RefCell::new(Vec::new())),
|
||||
status_label,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -192,6 +205,40 @@ fn rebuild_stack(state: &AppState) {
|
|||
// Errors
|
||||
let errors_view = views::errors::build(&errors);
|
||||
state.stack.add_named(&errors_view, Some("errors"));
|
||||
|
||||
update_counts_and_status(state);
|
||||
}
|
||||
|
||||
/// Refreshes the sidebar's per-row counts and the content pane's footer
|
||||
/// note count from the current `state.notes`. Cheap enough to call on every
|
||||
/// rebuild — five type counts plus all/upcoming/archive over a note list
|
||||
/// that in practice stays small.
|
||||
fn update_counts_and_status(state: &AppState) {
|
||||
let notes = state.notes.borrow();
|
||||
let total = notes.iter().filter(|n| !n.done).count();
|
||||
state
|
||||
.status_label
|
||||
.set_label(&format!("{total} note{}", if total == 1 { "" } else { "s" }));
|
||||
|
||||
for (key, label) in state.sidebar_counts.borrow().iter() {
|
||||
let n = match key.as_str() {
|
||||
"all" => total,
|
||||
"upcoming" => notes
|
||||
.iter()
|
||||
.filter(|n| {
|
||||
!n.done
|
||||
&& matches!(n.note_type, NoteType::Reminder | NoteType::Todo)
|
||||
&& n.effective_time().is_some()
|
||||
})
|
||||
.count(),
|
||||
"archive" => notes.iter().filter(|n| n.done).count(),
|
||||
other => {
|
||||
let nt = NoteType::from_str(other);
|
||||
notes.iter().filter(|n| !n.done && n.note_type == nt).count()
|
||||
}
|
||||
};
|
||||
label.set_label(&n.to_string());
|
||||
}
|
||||
}
|
||||
|
||||
// ── main ─────────────────────────────────────────────────────────────────────
|
||||
|
|
@ -331,7 +378,12 @@ fn build_app_window(
|
|||
));
|
||||
row
|
||||
};
|
||||
let make_item = |id: &str, icon: &str, label: &str| {
|
||||
// Returns the row plus its count `Label` when `counted` is set — callers
|
||||
// collect these so counts can be kept live from `AppState.sidebar_counts`
|
||||
// (monochrome geometric icons + a colored dot per type instead of the
|
||||
// old full-color emoji, which always render in fixed colors no matter
|
||||
// what the pywal palette says).
|
||||
let make_item = |id: &str, icon: &str, icon_class: Option<&str>, label: &str, counted: bool| {
|
||||
let row = gtk4::ListBoxRow::builder()
|
||||
.css_classes(["sidebar-row"])
|
||||
.build();
|
||||
|
|
@ -340,13 +392,15 @@ fn build_app_window(
|
|||
.orientation(gtk4::Orientation::Horizontal)
|
||||
.spacing(10)
|
||||
.build();
|
||||
hbox.append(
|
||||
>k4::Label::builder()
|
||||
let icon_label = gtk4::Label::builder()
|
||||
.label(icon)
|
||||
.width_chars(2)
|
||||
.xalign(0.5)
|
||||
.build(),
|
||||
);
|
||||
.build();
|
||||
if let Some(class) = icon_class {
|
||||
icon_label.add_css_class(class);
|
||||
}
|
||||
hbox.append(&icon_label);
|
||||
hbox.append(
|
||||
>k4::Label::builder()
|
||||
.label(label)
|
||||
|
|
@ -354,23 +408,62 @@ fn build_app_window(
|
|||
.hexpand(true)
|
||||
.build(),
|
||||
);
|
||||
let count_label = if counted {
|
||||
let l = gtk4::Label::builder()
|
||||
.label("")
|
||||
.css_classes(["sidebar-count"])
|
||||
.build();
|
||||
hbox.append(&l);
|
||||
Some(l)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
row.set_child(Some(&hbox));
|
||||
row
|
||||
(row, count_label)
|
||||
};
|
||||
|
||||
let mut sidebar_counts: Vec<(String, gtk4::Label)> = Vec::new();
|
||||
|
||||
sidebar_list.append(&make_section("VIEWS"));
|
||||
sidebar_list.append(&make_item("all", "📋", "All"));
|
||||
sidebar_list.append(&make_item("upcoming", "📅", "Upcoming"));
|
||||
{
|
||||
let (row, count) = make_item("all", "▦", None, "All", true);
|
||||
sidebar_counts.push(("all".into(), count.unwrap()));
|
||||
sidebar_list.append(&row);
|
||||
}
|
||||
{
|
||||
let (row, count) = make_item("upcoming", "◷", None, "Upcoming", true);
|
||||
sidebar_counts.push(("upcoming".into(), count.unwrap()));
|
||||
sidebar_list.append(&row);
|
||||
}
|
||||
sidebar_list.append(&make_section("TYPES"));
|
||||
sidebar_list.append(&make_item("todo", "✅", "Todo"));
|
||||
sidebar_list.append(&make_item("reminder", "🔔", "Reminder"));
|
||||
sidebar_list.append(&make_item("idea", "💡", "Idea"));
|
||||
sidebar_list.append(&make_item("note", "📝", "Note"));
|
||||
sidebar_list.append(&make_item("question", "❓", "Question"));
|
||||
for (id, icon_class, label) in [
|
||||
("todo", "icon-todo", "Todo"),
|
||||
("reminder", "icon-reminder", "Reminder"),
|
||||
("idea", "icon-idea", "Idea"),
|
||||
("note", "icon-note", "Note"),
|
||||
("question", "icon-question", "Question"),
|
||||
] {
|
||||
let (row, count) = make_item(id, "●", Some(icon_class), label, true);
|
||||
sidebar_counts.push((id.to_string(), count.unwrap()));
|
||||
sidebar_list.append(&row);
|
||||
}
|
||||
sidebar_list.append(&make_section("MORE"));
|
||||
sidebar_list.append(&make_item("archive", "📦", "Archive"));
|
||||
sidebar_list.append(&make_item("settings", "⚙", "Settings"));
|
||||
sidebar_list.append(&make_item("errors", "⚠", "Errors"));
|
||||
{
|
||||
let (row, count) = make_item("archive", "▢", None, "Archive", true);
|
||||
sidebar_counts.push(("archive".into(), count.unwrap()));
|
||||
sidebar_list.append(&row);
|
||||
}
|
||||
{
|
||||
let (row, _) = make_item("settings", "⚙", None, "Settings", false);
|
||||
sidebar_list.append(&row);
|
||||
}
|
||||
{
|
||||
// De-emphasized: session-only debug info, not part of the daily
|
||||
// triage flow the rest of the sidebar serves.
|
||||
let (row, _) = make_item("errors", "⚠", None, "Errors", false);
|
||||
row.add_css_class("sidebar-row-minor");
|
||||
sidebar_list.append(&row);
|
||||
}
|
||||
sidebar_vbox.append(&sidebar_list);
|
||||
|
||||
// ── Content area ──────────────────────────────────────────────
|
||||
|
|
@ -390,8 +483,19 @@ fn build_app_window(
|
|||
|
||||
let stack = gtk4::Stack::builder().hexpand(true).vexpand(true).build();
|
||||
|
||||
let status_label = gtk4::Label::builder()
|
||||
.label("0 notes")
|
||||
.css_classes(["dim-label"])
|
||||
.xalign(0.0)
|
||||
.margin_start(12)
|
||||
.margin_end(12)
|
||||
.margin_top(6)
|
||||
.margin_bottom(8)
|
||||
.build();
|
||||
|
||||
content_vbox.append(&search_entry);
|
||||
content_vbox.append(&stack);
|
||||
content_vbox.append(&status_label);
|
||||
|
||||
hbox.append(&sidebar_vbox);
|
||||
hbox.append(>k4::Separator::builder()
|
||||
|
|
@ -401,7 +505,8 @@ fn build_app_window(
|
|||
window.set_child(Some(&hbox));
|
||||
|
||||
// ── AppState ──────────────────────────────────────────────────
|
||||
let state = AppState::new(store, notes, cfg, stack.clone());
|
||||
let state = AppState::new(store, notes, cfg, stack.clone(), status_label.clone());
|
||||
state.sidebar_counts.replace(sidebar_counts);
|
||||
|
||||
// Initial build
|
||||
rebuild_stack(&state);
|
||||
|
|
@ -478,6 +583,9 @@ fn build_note_list(notes: &[Note], state: AppState) -> gtk4::ScrolledWindow {
|
|||
.vexpand(true)
|
||||
.build();
|
||||
|
||||
// Capped and centered so cards don't stretch edge-to-edge on a wide
|
||||
// window — full-width rows left the type chip and action buttons
|
||||
// hundreds of pixels from the title they belong to.
|
||||
let list = gtk4::Box::builder()
|
||||
.orientation(gtk4::Orientation::Vertical)
|
||||
.spacing(8)
|
||||
|
|
@ -485,18 +593,33 @@ fn build_note_list(notes: &[Note], state: AppState) -> gtk4::ScrolledWindow {
|
|||
.margin_bottom(12)
|
||||
.margin_start(12)
|
||||
.margin_end(12)
|
||||
.width_request(700)
|
||||
.halign(gtk4::Align::Center)
|
||||
.build();
|
||||
|
||||
let mut sorted: Vec<Note> = notes.iter().filter(|n| !n.done).cloned().collect();
|
||||
sorted.sort_by(|a, b| b.created.cmp(&a.created));
|
||||
|
||||
if sorted.is_empty() {
|
||||
list.append(
|
||||
let empty = gtk4::Box::builder()
|
||||
.orientation(gtk4::Orientation::Vertical)
|
||||
.spacing(6)
|
||||
.halign(gtk4::Align::Center)
|
||||
.margin_top(64)
|
||||
.build();
|
||||
empty.append(
|
||||
>k4::Label::builder()
|
||||
.label("No notes here yet.")
|
||||
.margin_top(32)
|
||||
.label("No notes here yet")
|
||||
.css_classes(["note-title"])
|
||||
.build(),
|
||||
);
|
||||
empty.append(
|
||||
>k4::Label::builder()
|
||||
.label("Capture something with breadpad and it'll show up here.")
|
||||
.css_classes(["dim-label"])
|
||||
.build(),
|
||||
);
|
||||
list.append(&empty);
|
||||
} else {
|
||||
for note in &sorted {
|
||||
list.append(&build_note_card(note, state.clone()));
|
||||
|
|
@ -507,6 +630,26 @@ fn build_note_list(notes: &[Note], state: AppState) -> gtk4::ScrolledWindow {
|
|||
scroll
|
||||
}
|
||||
|
||||
/// Short relative form for a recency-ordered list ("2h ago"); the exact
|
||||
/// absolute timestamp is still available via tooltip. Falls back to a plain
|
||||
/// date once a note is more than a week old, where "Nd ago" stops being
|
||||
/// useful at a glance.
|
||||
fn humanize_relative(dt: DateTime<Utc>) -> String {
|
||||
let secs = Utc::now().signed_duration_since(dt).num_seconds().max(0);
|
||||
if secs < 60 {
|
||||
"just now".to_string()
|
||||
} else if secs < 3600 {
|
||||
format!("{}m ago", secs / 60)
|
||||
} else if secs < 86_400 {
|
||||
format!("{}h ago", secs / 3600)
|
||||
} else if secs < 86_400 * 7 {
|
||||
format!("{}d ago", secs / 86_400)
|
||||
} else {
|
||||
let local: DateTime<Local> = dt.into();
|
||||
local.format("%b %d").to_string()
|
||||
}
|
||||
}
|
||||
|
||||
fn build_note_card(note: &Note, state: AppState) -> gtk4::Box {
|
||||
let card = gtk4::Box::builder()
|
||||
.orientation(gtk4::Orientation::Vertical)
|
||||
|
|
@ -530,6 +673,7 @@ fn build_note_card(note: &Note, state: AppState) -> gtk4::Box {
|
|||
.hexpand(true)
|
||||
.xalign(0.0)
|
||||
.wrap(true)
|
||||
.css_classes(["note-title"])
|
||||
.build();
|
||||
|
||||
let type_chip = gtk4::Label::builder()
|
||||
|
|
@ -546,14 +690,15 @@ fn build_note_card(note: &Note, state: AppState) -> gtk4::Box {
|
|||
.spacing(8)
|
||||
.build();
|
||||
|
||||
let created_str = {
|
||||
let created_abs = {
|
||||
let local: chrono::DateTime<Local> = note.created.into();
|
||||
local.format("%b %d %H:%M").to_string()
|
||||
};
|
||||
let meta_label = gtk4::Label::builder()
|
||||
.label(&created_str)
|
||||
.label(&humanize_relative(note.created))
|
||||
.css_classes(["dim-label"])
|
||||
.xalign(0.0)
|
||||
.tooltip_text(&created_abs)
|
||||
.build();
|
||||
|
||||
// Date first, then chips
|
||||
|
|
@ -561,8 +706,9 @@ fn build_note_card(note: &Note, state: AppState) -> gtk4::Box {
|
|||
if let Some(ws) = ¬e.workspace {
|
||||
bottom_row.append(
|
||||
>k4::Label::builder()
|
||||
.label(&format!("ws:{}", ws))
|
||||
.label(&format!("ws {}", ws))
|
||||
.css_classes(["type-chip"])
|
||||
.tooltip_text(&format!("Workspace {}", ws))
|
||||
.build(),
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,6 +85,43 @@ fn rrule_weekday(wd: Weekday) -> &'static str {
|
|||
}
|
||||
}
|
||||
|
||||
/// Explicit type prefixes, checked before any lexical heuristics. Short forms
|
||||
/// exist so the capture popup can be driven without reaching for the mouse —
|
||||
/// see `breadpad_shared::parser::detect_prefix_type`, which the popup's entry
|
||||
/// uses to live-highlight the matching chip as the user types.
|
||||
const TYPE_PREFIXES: &[(&str, NoteType)] = &[
|
||||
("td:", NoteType::Todo),
|
||||
("rem:", NoteType::Reminder),
|
||||
("idea:", NoteType::Idea),
|
||||
("note:", NoteType::Note),
|
||||
("q:", NoteType::Question),
|
||||
];
|
||||
|
||||
/// If `text` starts with one of [`TYPE_PREFIXES`] (case-insensitive), returns
|
||||
/// the type it forces. Used both to classify at save time and to live-drive
|
||||
/// the popup's chip highlighting as the user types.
|
||||
pub fn detect_prefix_type(text: &str) -> Option<NoteType> {
|
||||
let lower = text.trim_start().to_lowercase();
|
||||
TYPE_PREFIXES
|
||||
.iter()
|
||||
.find(|(prefix, _)| lower.starts_with(prefix))
|
||||
.map(|(_, nt)| nt.clone())
|
||||
}
|
||||
|
||||
/// Strips a leading explicit type prefix (if any), returning the forced type
|
||||
/// and the remaining text with the prefix and any following whitespace removed.
|
||||
fn strip_explicit_prefix(text: &str) -> (Option<NoteType>, String) {
|
||||
let trimmed = text.trim_start();
|
||||
let lower = trimmed.to_lowercase();
|
||||
for (prefix, nt) in TYPE_PREFIXES {
|
||||
if lower.starts_with(prefix) {
|
||||
let rest = trimmed[prefix.len()..].trim_start().to_string();
|
||||
return (Some(nt.clone()), rest);
|
||||
}
|
||||
}
|
||||
(None, text.to_string())
|
||||
}
|
||||
|
||||
fn next_occurrence_of_weekday(wd: Weekday, time: NaiveTime) -> DateTime<Utc> {
|
||||
let local = Local::now();
|
||||
let days_ahead = (wd.num_days_from_monday() as i64
|
||||
|
|
@ -105,6 +142,8 @@ fn next_occurrence_of_weekday(wd: Weekday, time: NaiveTime) -> DateTime<Utc> {
|
|||
}
|
||||
|
||||
pub fn parse_rule_based(text: &str, default_morning: &str) -> ClassificationResult {
|
||||
let (forced_type, text_owned) = strip_explicit_prefix(text);
|
||||
let text: &str = &text_owned;
|
||||
let p = patterns();
|
||||
let morning_time: NaiveTime = default_morning
|
||||
.split(':')
|
||||
|
|
@ -290,8 +329,9 @@ pub fn parse_rule_based(text: &str, default_morning: &str) -> ClassificationResu
|
|||
.to_string();
|
||||
}
|
||||
|
||||
// Infer note type
|
||||
let note_type = infer_type(text, extracted_time.is_some(), rrule.is_some());
|
||||
// Infer note type — an explicit prefix (`td:`, `rem:`, …) always wins.
|
||||
let note_type =
|
||||
forced_type.clone().unwrap_or_else(|| infer_type(text, extracted_time.is_some(), rrule.is_some()));
|
||||
|
||||
// Trim artifacts
|
||||
cleaned = cleaned
|
||||
|
|
@ -303,7 +343,9 @@ pub fn parse_rule_based(text: &str, default_morning: &str) -> ClassificationResu
|
|||
|
||||
// Calibrated confidence: high when structural signals drove the decision,
|
||||
// low when we fell back to "note" with no positive evidence.
|
||||
let confidence = if rrule.is_some() || extracted_time.is_some() {
|
||||
let confidence = if forced_type.is_some() {
|
||||
0.99 // explicit prefix — unambiguous
|
||||
} else if rrule.is_some() || extracted_time.is_some() {
|
||||
0.95 // time/recurrence extraction is deterministic
|
||||
} else {
|
||||
match ¬e_type {
|
||||
|
|
@ -410,6 +452,70 @@ mod tests {
|
|||
assert_eq!(p("idea: reactive state module in Lua").note_type, NoteType::Idea);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn idea_prefix_stripped_from_body() {
|
||||
let r = p("idea: reactive state module in Lua");
|
||||
assert_eq!(r.body, "reactive state module in Lua");
|
||||
}
|
||||
|
||||
// ---- Explicit short prefixes (td:, rem:, note:, q:) ----
|
||||
|
||||
#[test]
|
||||
fn td_prefix_is_todo() {
|
||||
let r = p("td: buy milk");
|
||||
assert_eq!(r.note_type, NoteType::Todo);
|
||||
assert_eq!(r.body, "buy milk");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rem_prefix_is_reminder() {
|
||||
let r = p("rem: water the plants");
|
||||
assert_eq!(r.note_type, NoteType::Reminder);
|
||||
assert_eq!(r.body, "water the plants");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn note_prefix_is_note() {
|
||||
// Without the prefix this would classify as Todo ("check ...").
|
||||
let r = p("note: check engine light has been on for a week");
|
||||
assert_eq!(r.note_type, NoteType::Note);
|
||||
assert_eq!(r.body, "check engine light has been on for a week");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn q_prefix_is_question() {
|
||||
// Without the prefix this has no strong signal and would fall to Note.
|
||||
let r = p("q: ONNX rocm vs cpu perf");
|
||||
assert_eq!(r.note_type, NoteType::Question);
|
||||
assert_eq!(r.body, "ONNX rocm vs cpu perf");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn explicit_prefix_confidence_is_high() {
|
||||
assert_eq!(p("td: buy milk").confidence, 0.99);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn explicit_prefix_is_case_insensitive() {
|
||||
assert_eq!(p("TD: buy milk").note_type, NoteType::Todo);
|
||||
assert_eq!(p("Rem: standup").note_type, NoteType::Reminder);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn explicit_prefix_overrides_time_extraction_type() {
|
||||
// "at 7pm" alone would infer Reminder; an explicit td: prefix wins.
|
||||
let r = p("td: pack bag at 7pm");
|
||||
assert_eq!(r.note_type, NoteType::Todo);
|
||||
assert!(r.time.is_some(), "time should still be extracted");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn detect_prefix_type_matches_parse() {
|
||||
assert_eq!(detect_prefix_type("td: buy milk"), Some(NoteType::Todo));
|
||||
assert_eq!(detect_prefix_type("rem: call mum"), Some(NoteType::Reminder));
|
||||
assert_eq!(detect_prefix_type("no prefix here"), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn idea_maybe() {
|
||||
assert_eq!(p("maybe we could cache the ONNX model").note_type, NoteType::Idea);
|
||||
|
|
@ -884,7 +990,6 @@ fn infer_type(text: &str, has_time: bool, has_rrule: bool) -> NoteType {
|
|||
return NoteType::Todo;
|
||||
}
|
||||
if lower.starts_with("what if ")
|
||||
|| lower.starts_with("idea:")
|
||||
|| lower.contains("could ")
|
||||
|| lower.contains("maybe ")
|
||||
|| lower.starts_with("should we ")
|
||||
|
|
|
|||
|
|
@ -43,9 +43,14 @@ window { border-radius: 8px; }
|
|||
border-color: @teal;
|
||||
}
|
||||
|
||||
/* Shared "selected/active" language: a ghost/ outline default state that
|
||||
stays quiet, and a solid, high-contrast accent fill for whatever is
|
||||
currently selected — used identically by .type-chip.active and
|
||||
.sidebar-row:selected so the two windows read as one system. */
|
||||
.type-chip {
|
||||
background: @overlay;
|
||||
color: @on-overlay;
|
||||
background: transparent;
|
||||
color: alpha(@fg, 0.6);
|
||||
border: 1px solid alpha(@fg, 0.18);
|
||||
border-radius: 999px;
|
||||
padding: 4px 12px;
|
||||
font-size: 12px;
|
||||
|
|
@ -55,27 +60,69 @@ window { border-radius: 8px; }
|
|||
.type-chip.active {
|
||||
background: @blue;
|
||||
color: @on-accent;
|
||||
border-color: @blue;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
/* Per-type tint so info badges (note cards, workspace/recur tags) stay
|
||||
scannable at a glance without the old full-color emoji. */
|
||||
.note-card-todo .type-chip { color: @green; border-color: alpha(@green, 0.4); }
|
||||
.note-card-reminder .type-chip { color: @yellow; border-color: alpha(@yellow, 0.4); }
|
||||
.note-card-idea .type-chip { color: @pink; border-color: alpha(@pink, 0.4); }
|
||||
.note-card-question .type-chip { color: @teal; border-color: alpha(@teal, 0.4); }
|
||||
.note-card-note .type-chip { color: @blue; border-color: alpha(@blue, 0.4); }
|
||||
|
||||
.confirm-button {
|
||||
background: @blue;
|
||||
color: @on-accent;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
padding: 8px 16px;
|
||||
padding: 10px 22px;
|
||||
min-height: 20px;
|
||||
font-size: 15px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.confirm-button:hover { background: shade(@blue, 1.1); }
|
||||
|
||||
/* Separates the primary action from the chip row it sits beside so it
|
||||
doesn't read as just another pill. */
|
||||
.confirm-wrap {
|
||||
border-left: 1px solid alpha(@fg, 0.12);
|
||||
padding-left: 12px;
|
||||
margin-left: 4px;
|
||||
}
|
||||
|
||||
.prefix-hint {
|
||||
color: alpha(@fg, 0.4);
|
||||
font-size: 10px;
|
||||
letter-spacing: 0.3px;
|
||||
}
|
||||
|
||||
.note-card {
|
||||
background: shade(@bg, 1.1);
|
||||
border-radius: 8px;
|
||||
background: shade(@bg, 1.12);
|
||||
border: 1px solid alpha(@fg, 0.07);
|
||||
border-radius: 10px;
|
||||
padding: 12px;
|
||||
margin: 8px;
|
||||
margin: 6px 0;
|
||||
border-left: 3px solid @blue;
|
||||
}
|
||||
|
||||
.note-card:hover {
|
||||
background: shade(@bg, 1.2);
|
||||
background: shade(@bg, 1.22);
|
||||
border-color: alpha(@fg, 0.12);
|
||||
}
|
||||
|
||||
.note-title {
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.note-card .action-btn {
|
||||
opacity: 0.45;
|
||||
}
|
||||
|
||||
.note-card:hover .action-btn {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.search-entry {
|
||||
|
|
@ -83,7 +130,8 @@ window { border-radius: 8px; }
|
|||
color: @fg;
|
||||
border: 1px solid @overlay;
|
||||
border-radius: 6px;
|
||||
padding: 8px 12px;
|
||||
padding: 5px 10px;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.search-entry:focus {
|
||||
|
|
@ -104,7 +152,27 @@ window { border-radius: 8px; }
|
|||
.sidebar-row:selected {
|
||||
background: @blue;
|
||||
color: @on-accent;
|
||||
font-weight: 500;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.sidebar-row-minor {
|
||||
opacity: 0.5;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.sidebar-count {
|
||||
color: alpha(@fg, 0.45);
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.icon-todo { color: @green; }
|
||||
.icon-reminder { color: @yellow; }
|
||||
.icon-idea { color: @pink; }
|
||||
.icon-note { color: @blue; }
|
||||
.icon-question { color: @teal; }
|
||||
|
||||
.sidebar-row:selected .sidebar-count {
|
||||
color: alpha(@on-accent, 0.75);
|
||||
}
|
||||
|
||||
.sidebar-section-label {
|
||||
|
|
@ -119,14 +187,15 @@ window { border-radius: 8px; }
|
|||
background: transparent;
|
||||
border: none;
|
||||
border-radius: 6px;
|
||||
padding: 2px 7px;
|
||||
min-width: 28px;
|
||||
min-height: 28px;
|
||||
font-size: 14px;
|
||||
padding: 3px 8px;
|
||||
min-width: 32px;
|
||||
min-height: 32px;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.action-btn:hover {
|
||||
background: shade(@bg, 1.3);
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.done-btn { color: @green; }
|
||||
|
|
|
|||
|
|
@ -636,11 +636,43 @@ fn build_window(
|
|||
}
|
||||
}
|
||||
|
||||
// Live prefix grammar: typing "td: ", "rem: ", "idea: ", "note: ", or
|
||||
// "q: " at the start of the entry drives the chip selection without
|
||||
// ever touching the mouse — the chips become feedback for what you
|
||||
// typed rather than the only way to pick a type.
|
||||
{
|
||||
let selected_type_clone = selected_type.clone();
|
||||
let chips_clone: Vec<(gtk4::Button, NoteType)> = chips.clone();
|
||||
entry.connect_changed(move |e| {
|
||||
let Some(nt) = breadpad_shared::parser::detect_prefix_type(&e.text()) else {
|
||||
return;
|
||||
};
|
||||
*selected_type_clone.borrow_mut() = nt.clone();
|
||||
for (btn, chip_nt) in &chips_clone {
|
||||
if *chip_nt == nt {
|
||||
btn.add_css_class("active");
|
||||
} else {
|
||||
btn.remove_css_class("active");
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
let hint = gtk4::Label::builder()
|
||||
.label("td: · rem: · idea: · note: · q:")
|
||||
.css_classes(["prefix-hint"])
|
||||
.xalign(0.0)
|
||||
.build();
|
||||
|
||||
// Confirm button
|
||||
let confirm_btn = gtk4::Button::builder()
|
||||
.label("✓")
|
||||
.css_classes(["confirm-button"])
|
||||
.build();
|
||||
let confirm_wrap = gtk4::Box::builder()
|
||||
.css_classes(["confirm-wrap"])
|
||||
.build();
|
||||
confirm_wrap.append(&confirm_btn);
|
||||
|
||||
let bottom_row = gtk4::Box::builder()
|
||||
.orientation(gtk4::Orientation::Horizontal)
|
||||
|
|
@ -650,9 +682,10 @@ fn build_window(
|
|||
|
||||
let spacer = gtk4::Box::builder().hexpand(true).build();
|
||||
bottom_row.append(&spacer);
|
||||
bottom_row.append(&confirm_btn);
|
||||
bottom_row.append(&confirm_wrap);
|
||||
|
||||
vbox.append(&entry);
|
||||
vbox.append(&hint);
|
||||
vbox.append(&bottom_row);
|
||||
window.set_child(Some(&vbox));
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue