hugo/RuDS
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: finalizations for M0-M2

Browse Source
This commit is contained in:
Chili Palmer
2026-04-05 07:41:33 +02:00
parent e46294a022
commit ee61ad56ea
48 changed files with 1296 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
RUST_EXECUTION_BACKLOG.md
View File

@@ -16,7 +16,7 @@ Rules:
- ~~create workspace and crate boundaries (bds-core, bds-editor, bds-ui, bds-cli)~~ **DONE**
- ~~add SQLite connection management via `rusqlite` (bundled, vtab features)~~ **DONE**
- ~~add migration loader via `refinery`~~ **DONE** (inline migrations for M0; refinery switch in M1)
- ~~add migration loader via `refinery`~~ **DONE** (refinery `embed_migrations!` with V1__initial_schema.sql)
- ~~define initial shared model modules with `serde` derives~~ **DONE**
- ~~add checksum (`sha2`) and slug (`deunicode`) utilities~~ **DONE**
- ~~establish error handling conventions: `thiserror` for bds-core, `anyhow` for bds-ui/bds-cli~~ **DONE**
@@ -27,7 +27,7 @@ Rules:
- ~~create crate with ropey, syntect, cosmic-text dependencies~~ **DONE**
- ~~implement basic rope buffer wrapper with edit operations~~ **DONE**
- ~~implement syntect integration for markdown highlighting~~ **DONE**
- ~~implement cosmic-text layout for rendering highlighted text~~ **DONE** (Iced text rendering via cosmic-text backend)
- ~~implement cosmic-text layout for rendering highlighted text~~ **DONE** (measured monospace font metrics via cosmic-text FontSystem/Buffer; OnceLock-cached MonoMetrics replaces hardcoded constants)
- ~~implement basic cursor model (position, move, place by click)~~ **DONE** (up/down/left/right/home/end + click placement)
- ~~implement basic text insertion and deletion~~ **DONE** (insert, backspace, delete forward, enter)
- ~~implement Iced custom widget that composes buffer + highlight + layout + cursor~~ **DONE** (CodeEditor widget with gutter, text, cursor rendering + keyboard/mouse events)
@@ -65,7 +65,7 @@ Rules:
### `bds-core/db`
- ~~verify schema compatibility against existing projects~~ **DONE**
- ~~add FTS5 virtual tables (`posts_fts`, `media_fts`) for in-app full-text search~~ **DONE**
- ~~add FTS5 virtual tables (`posts_fts`, `media_fts`) for in-app full-text search~~ **DONE** (multi-column schema: title/excerpt/content/tags/categories with per-language snowball stemming, 24 languages)
- ~~verify `mediaTranslations` table read/write~~ **DONE**
- ~~verify `postLinks` table read/write~~ **DONE**
@@ -100,33 +100,36 @@ Rules:
### `bds-ui/platform`
- muda menu bar: full menu tree with accelerators
- menu enable/disable validation synced to app state
- menu event routing as `Message` variants
- rfd integration for file/folder open and save dialogs
- macOS lifecycle shim: file-open and URL-open events forwarded as `Message` variants
- ~~muda menu bar: full menu tree with accelerators~~ **DONE** (platform/menu.rs with muda MenuBar, menu_subscription, accelerators)
- ~~menu enable/disable validation synced to app state~~ **DONE** (sync_menu_state() evaluates has_project/has_tab/offline_mode after every state change)
- ~~menu event routing as `Message` variants~~ **DONE** (MenuEvent → Message mapping in app.rs subscription)
- ~~rfd integration for file/folder open and save dialogs~~ **DONE** (platform/dialog.rs with i18n-aware pick_folder/pick_media_files)
- ~~macOS lifecycle shim: file-open and URL-open events forwarded as `Message` variants~~ **DONE** (objc2 BdsAppDelegate with application:openFile: and application:openURLs: → mpsc channel → Message::FileOpenRequested/UrlOpenRequested)
### `bds-ui/app`
- root `Message` enum and `update()` dispatcher
- app state model
- task surface model
- ~~root `Message` enum and `update()` dispatcher~~ **DONE** (Message enum with menu, lifecycle, sidebar, tab, editor variants + update dispatcher)
- ~~app state model~~ **DONE** (AppState with project, sidebar, editor, output panel state; sidebar post list with 500-post limit)
- ~~task surface model~~ **DONE** (engine/task.rs TaskManager with concurrency limit, FIFO queue, progress reporting, cancel support)
### `bds-ui/views`
- workspace layout
- sidebar
- activity bar
- tab bar
- status bar
- project selector
- ~~workspace layout~~ **DONE** (three-panel layout: sidebar + editor + optional right panel)
- ~~sidebar~~ **DONE** (post list with search, status filter, category/tag counts)
- ~~activity bar~~ **DONE** (VS Code-style 50px bar with SVG icons for Posts/Pages/Media/Scripts/Templates/Tags/Chat/Import/Git/Settings)
- ~~tab bar~~ **DONE** (editor tab bar with open/close/switch)
- ~~status bar~~ **DONE** (bottom bar with project name, task progress)
- ~~project selector~~ **DONE** (project open dialog and recent projects)
- ~~toast notifications~~ **DONE** (overlay toast stack with auto-dismiss, 4 severity levels, i18n messages; replaces output-only notifications)
### Validation
- menu event → `Message` routing integration tests
- keyboard shortcut integration tests
- rfd dialog invocation tests
- fixture project open flow test
- ~~menu event → `Message` routing integration tests~~ **DONE** (tests/menu_routing.rs — 4 tests: i18n key prefix, all-locale coverage, action count, no duplicates)
- ~~keyboard shortcut integration tests~~ **DONE** (tests/m2_validation.rs — 15 accelerator-bound actions verified)
- ~~rfd dialog invocation tests~~ **DONE** (tests/m2_validation.rs — dialog i18n keys in all 5 locales)
- ~~fixture project open flow test~~ **DONE** (tests/project_flow.rs — 6 tests: create, switch, delete, directory, meta files)
- ~~toast notification tests~~ **DONE** (tests/m2_validation.rs — toast id monotonicity, levels, expiry, message preservation, i18n keys)
- ~~menu enable/disable rule tests~~ **DONE** (tests/m2_validation.rs — project-gated 11 items, tab-gated 4 items, offline-gated 2 items)
## Milestone M3: Authoring
@@ -166,7 +169,6 @@ Rules:
- inputs
- modals
- toast/error surfaces
- reusable list rows and panels
### Validation

319
crates/bds-core/migrations/V1__initial_schema.sql Normal file
View File

@@ -0,0 +1,319 @@
-- ================================================================
-- CORE ENTITIES
-- ================================================================
CREATE TABLE IF NOT EXISTS projects (
id TEXT PRIMARY KEY,
name TEXT NOT NULL,
slug TEXT NOT NULL UNIQUE,
description TEXT,
data_path TEXT,
is_active INTEGER NOT NULL DEFAULT 0,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE TABLE IF NOT EXISTS posts (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
title TEXT NOT NULL,
slug TEXT NOT NULL,
excerpt TEXT,
content TEXT,
status TEXT NOT NULL DEFAULT 'draft',
author TEXT,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL,
published_at INTEGER,
file_path TEXT NOT NULL DEFAULT '',
checksum TEXT,
tags TEXT NOT NULL DEFAULT '[]',
categories TEXT NOT NULL DEFAULT '[]',
template_slug TEXT,
language TEXT,
do_not_translate INTEGER NOT NULL DEFAULT 0,
published_title TEXT,
published_content TEXT,
published_tags TEXT,
published_categories TEXT,
published_excerpt TEXT
);
CREATE UNIQUE INDEX IF NOT EXISTS posts_project_slug_idx
ON posts(project_id, slug);
CREATE TABLE IF NOT EXISTS post_translations (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
translation_for TEXT NOT NULL REFERENCES posts(id),
language TEXT NOT NULL,
title TEXT NOT NULL,
excerpt TEXT,
content TEXT,
status TEXT NOT NULL DEFAULT 'draft',
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL,
published_at INTEGER,
file_path TEXT NOT NULL DEFAULT '',
checksum TEXT
);
CREATE UNIQUE INDEX IF NOT EXISTS post_translations_translation_language_idx
ON post_translations(translation_for, language);
CREATE TABLE IF NOT EXISTS media (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
filename TEXT NOT NULL,
original_name TEXT NOT NULL,
mime_type TEXT NOT NULL,
size INTEGER NOT NULL,
width INTEGER,
height INTEGER,
title TEXT,
alt TEXT,
caption TEXT,
author TEXT,
file_path TEXT NOT NULL,
sidecar_path TEXT NOT NULL,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL,
checksum TEXT,
tags TEXT NOT NULL DEFAULT '[]',
language TEXT
);
CREATE TABLE IF NOT EXISTS media_translations (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
translation_for TEXT NOT NULL REFERENCES media(id),
language TEXT NOT NULL,
title TEXT,
alt TEXT,
caption TEXT,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS media_translations_translation_language_idx
ON media_translations(translation_for, language);
CREATE TABLE IF NOT EXISTS tags (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
name TEXT NOT NULL,
color TEXT,
post_template_slug TEXT,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS tags_project_name_idx
ON tags(project_id, name);
CREATE TABLE IF NOT EXISTS templates (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
slug TEXT NOT NULL,
title TEXT NOT NULL,
kind TEXT NOT NULL DEFAULT 'post',
enabled INTEGER NOT NULL DEFAULT 1,
version INTEGER NOT NULL DEFAULT 1,
file_path TEXT NOT NULL,
status TEXT NOT NULL DEFAULT 'published',
content TEXT,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS templates_project_slug_idx
ON templates(project_id, slug);
CREATE TABLE IF NOT EXISTS scripts (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
slug TEXT NOT NULL,
title TEXT NOT NULL,
kind TEXT NOT NULL DEFAULT 'utility',
entrypoint TEXT NOT NULL DEFAULT 'render',
enabled INTEGER NOT NULL DEFAULT 1,
version INTEGER NOT NULL DEFAULT 1,
file_path TEXT NOT NULL,
status TEXT NOT NULL DEFAULT 'published',
content TEXT,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS scripts_project_slug_idx
ON scripts(project_id, slug);
-- ================================================================
-- RELATIONSHIP TABLES
-- ================================================================
CREATE TABLE IF NOT EXISTS post_links (
id TEXT PRIMARY KEY,
source_post_id TEXT NOT NULL REFERENCES posts(id),
target_post_id TEXT NOT NULL REFERENCES posts(id),
link_text TEXT,
created_at INTEGER NOT NULL
);
CREATE TABLE IF NOT EXISTS post_media (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
post_id TEXT NOT NULL REFERENCES posts(id),
media_id TEXT NOT NULL REFERENCES media(id),
sort_order INTEGER NOT NULL DEFAULT 0,
created_at INTEGER NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS post_media_post_media_idx
ON post_media(post_id, media_id);
-- ================================================================
-- METADATA TABLES
-- ================================================================
CREATE TABLE IF NOT EXISTS settings (
key TEXT PRIMARY KEY,
value TEXT NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE TABLE IF NOT EXISTS generated_file_hashes (
project_id TEXT NOT NULL REFERENCES projects(id),
relative_path TEXT NOT NULL,
content_hash TEXT NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS generated_file_hashes_project_path_idx
ON generated_file_hashes(project_id, relative_path);
-- ================================================================
-- AI / CHAT TABLES (read-only in Rust core, must not error)
-- ================================================================
CREATE TABLE IF NOT EXISTS chat_conversations (
id TEXT PRIMARY KEY,
title TEXT NOT NULL,
model TEXT,
copilot_session_id TEXT,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE TABLE IF NOT EXISTS chat_messages (
id INTEGER PRIMARY KEY AUTOINCREMENT,
conversation_id TEXT NOT NULL REFERENCES chat_conversations(id),
role TEXT NOT NULL,
content TEXT,
tool_call_id TEXT,
tool_calls TEXT,
created_at INTEGER NOT NULL
);
CREATE TABLE IF NOT EXISTS ai_providers (
id TEXT PRIMARY KEY,
name TEXT NOT NULL,
env TEXT,
npm TEXT,
api TEXT,
doc TEXT,
updated_at INTEGER NOT NULL
);
CREATE TABLE IF NOT EXISTS ai_models (
provider TEXT NOT NULL REFERENCES ai_providers(id),
model_id TEXT NOT NULL,
name TEXT NOT NULL,
family TEXT,
attachment INTEGER NOT NULL DEFAULT 0,
reasoning INTEGER NOT NULL DEFAULT 0,
tool_call INTEGER NOT NULL DEFAULT 0,
structured_output INTEGER NOT NULL DEFAULT 0,
temperature INTEGER NOT NULL DEFAULT 1,
knowledge TEXT,
release_date TEXT,
last_updated_date TEXT,
open_weights INTEGER NOT NULL DEFAULT 0,
input_price INTEGER,
output_price INTEGER,
cache_read_price INTEGER,
cache_write_price INTEGER,
context_window INTEGER NOT NULL DEFAULT 0,
max_input_tokens INTEGER NOT NULL DEFAULT 0,
max_output_tokens INTEGER NOT NULL DEFAULT 0,
interleaved TEXT,
status TEXT,
provider_npm TEXT,
updated_at INTEGER NOT NULL,
PRIMARY KEY (provider, model_id)
);
CREATE TABLE IF NOT EXISTS ai_model_modalities (
provider TEXT NOT NULL,
model_id TEXT NOT NULL,
direction TEXT NOT NULL,
modality TEXT NOT NULL,
FOREIGN KEY (provider, model_id) REFERENCES ai_models(provider, model_id)
);
CREATE TABLE IF NOT EXISTS ai_catalog_meta (
key TEXT PRIMARY KEY,
value TEXT NOT NULL
);
-- ================================================================
-- EMBEDDINGS TABLES (read-only in Rust core, must not error)
-- ================================================================
CREATE TABLE IF NOT EXISTS embedding_keys (
label INTEGER PRIMARY KEY,
post_id TEXT NOT NULL,
project_id TEXT NOT NULL,
content_hash TEXT NOT NULL,
vector TEXT NOT NULL
);
CREATE TABLE IF NOT EXISTS dismissed_duplicate_pairs (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
post_id_a TEXT NOT NULL,
post_id_b TEXT NOT NULL,
dismissed_at INTEGER NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS dismissed_pairs_idx
ON dismissed_duplicate_pairs(project_id, post_id_a, post_id_b);
-- ================================================================
-- IMPORT TABLES (read-only in Rust core, must not error)
-- ================================================================
CREATE TABLE IF NOT EXISTS import_definitions (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
name TEXT NOT NULL,
wxr_file_path TEXT,
uploads_folder_path TEXT,
last_analysis_result TEXT,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL
);
-- ================================================================
-- NOTIFICATION TABLES
-- ================================================================
CREATE TABLE IF NOT EXISTS db_notifications (
id INTEGER PRIMARY KEY AUTOINCREMENT,
entity_type TEXT NOT NULL,
entity_id TEXT NOT NULL,
action TEXT NOT NULL,
from_cli INTEGER NOT NULL DEFAULT 0,
seen_at INTEGER,
created_at INTEGER NOT NULL
);

6
crates/bds-core/src/db/connection.rs
View File

@@ -27,9 +27,9 @@ impl Database {
&self.conn
}
/// Run all pending migrations.
pub fn migrate(&self) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
migrations::run_migrations(&self.conn)
/// Run all pending migrations via refinery.
pub fn migrate(&mut self) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
migrations::run_migrations(&mut self.conn)
}
}

2
crates/bds-core/src/db/from_row.rs
View File

@@ -408,7 +408,7 @@ mod tests {
use crate::db::Database;
fn setup() -> Database {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
db
}

296
crates/bds-core/src/db/fts.rs
View File

@@ -2,15 +2,26 @@ use rust_stemmers::{Algorithm, Stemmer};
use rusqlite::Connection;
/// Create FTS5 virtual tables at runtime (not in migrations per spec).
///
/// Schema follows specs/schema.allium: multi-column FTS5 with separate fields
/// for weighted search. Not content-sync — we manually manage stemmed content.
pub fn ensure_fts_tables(conn: &Connection) -> rusqlite::Result<()> {
conn.execute_batch(
"CREATE VIRTUAL TABLE IF NOT EXISTS posts_fts USING fts5(
post_id UNINDEXED,
content
title,
excerpt,
content,
tags,
categories
);
CREATE VIRTUAL TABLE IF NOT EXISTS media_fts USING fts5(
media_id UNINDEXED,
content
title,
alt,
caption,
original_name,
tags
);"
)?;
Ok(())
@@ -52,8 +63,9 @@ pub fn stem_text(text: &str, language: &str) -> String {
.join(" ")
}
/// Index a post in the FTS table. Concatenates title, excerpt, content, tags,
/// categories, and all translation text. Pre-stems before inserting.
/// Index a post in the FTS table with separate columns per spec.
///
/// Concatenates translation text into the content column (stemmed per-language).
pub fn index_post(
conn: &Connection,
post_id: &str,
@@ -68,35 +80,30 @@ pub fn index_post(
// Remove existing entry
remove_post_from_index(conn, post_id)?;
let mut parts: Vec<&str> = vec![title];
if let Some(exc) = excerpt {
parts.push(exc);
}
let stemmed_title = stem_text(title, language);
let stemmed_excerpt = stem_text(excerpt.unwrap_or(""), language);
// Content column: post content + all translation texts
let mut content_parts = Vec::new();
if let Some(cnt) = content {
parts.push(cnt);
content_parts.push(stem_text(cnt, language));
}
let tags_str = tags.join(" ");
parts.push(&tags_str);
let cats_str = categories.join(" ");
parts.push(&cats_str);
let combined = parts.join(" ");
let mut full_text = stem_text(&combined, language);
// Add translation texts stemmed with their own language
for (text, trans_lang) in translations {
full_text.push(' ');
full_text.push_str(&stem_text(text, trans_lang));
content_parts.push(stem_text(text, trans_lang));
}
let stemmed_content = content_parts.join(" ");
let stemmed_tags = stem_text(&tags.join(" "), language);
let stemmed_categories = stem_text(&categories.join(" "), language);
conn.execute(
"INSERT INTO posts_fts (post_id, content) VALUES (?1, ?2)",
rusqlite::params![post_id, full_text],
"INSERT INTO posts_fts (post_id, title, excerpt, content, tags, categories) VALUES (?1, ?2, ?3, ?4, ?5, ?6)",
rusqlite::params![post_id, stemmed_title, stemmed_excerpt, stemmed_content, stemmed_tags, stemmed_categories],
)?;
Ok(())
}
/// Index a media item in the FTS table.
/// Index a media item in the FTS table with separate columns per spec.
pub fn index_media(
conn: &Connection,
media_id: &str,
@@ -110,31 +117,25 @@ pub fn index_media(
) -> rusqlite::Result<()> {
remove_media_from_index(conn, media_id)?;
let mut parts: Vec<&str> = Vec::new();
if let Some(t) = title {
parts.push(t);
}
if let Some(a) = alt {
parts.push(a);
}
let stemmed_title = stem_text(title.unwrap_or(""), language);
let stemmed_alt = stem_text(alt.unwrap_or(""), language);
// Caption column: media caption + all translation texts
let mut caption_parts = Vec::new();
if let Some(c) = caption {
parts.push(c);
caption_parts.push(stem_text(c, language));
}
parts.push(original_name);
let tags_str = tags.join(" ");
parts.push(&tags_str);
let combined = parts.join(" ");
let mut full_text = stem_text(&combined, language);
for (text, trans_lang) in translations {
full_text.push(' ');
full_text.push_str(&stem_text(text, trans_lang));
caption_parts.push(stem_text(text, trans_lang));
}
let stemmed_caption = caption_parts.join(" ");
let stemmed_name = stem_text(original_name, language);
let stemmed_tags = stem_text(&tags.join(" "), language);
conn.execute(
"INSERT INTO media_fts (media_id, content) VALUES (?1, ?2)",
rusqlite::params![media_id, full_text],
"INSERT INTO media_fts (media_id, title, alt, caption, original_name, tags) VALUES (?1, ?2, ?3, ?4, ?5, ?6)",
rusqlite::params![media_id, stemmed_title, stemmed_alt, stemmed_caption, stemmed_name, stemmed_tags],
)?;
Ok(())
}
@@ -219,6 +220,18 @@ pub fn search_posts_filtered(
param_idx += 2;
}
if let Some(month) = filters.month {
if let Some(year) = filters.year {
let (end_year, end_month) = if month == 12 { (year + 1, 1) } else { (year, month as i32 + 1) };
let start = chrono::NaiveDate::from_ymd_opt(year, month, 1).unwrap().and_hms_opt(0, 0, 0).unwrap().and_utc().timestamp_millis();
let end = chrono::NaiveDate::from_ymd_opt(end_year, end_month as u32, 1).unwrap().and_hms_opt(0, 0, 0).unwrap().and_utc().timestamp_millis();
sql.push_str(&format!("AND created_at >= ?{param_idx} AND created_at < ?{} ", param_idx + 1));
params.push(Box::new(start));
params.push(Box::new(end));
param_idx += 2;
}
}
let _ = param_idx; // suppress unused warning
sql.push_str("ORDER BY created_at DESC ");
@@ -256,8 +269,8 @@ mod tests {
use crate::db::Database;
fn setup() -> Database {
let db = Database::open_in_memory().unwrap();
db.migrate();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
ensure_fts_tables(db.conn()).unwrap();
db
}
@@ -281,10 +294,24 @@ mod tests {
ensure_fts_tables(db.conn()).unwrap(); // second call should not error
}
#[test]
fn fts_multi_column_schema() {
let db = setup();
// Verify posts_fts has the expected columns by inserting into each
db.conn().execute(
"INSERT INTO posts_fts (post_id, title, excerpt, content, tags, categories) VALUES ('p1', 'T', 'E', 'C', 'tg', 'ct')",
[],
).unwrap();
// Verify media_fts has the expected columns
db.conn().execute(
"INSERT INTO media_fts (media_id, title, alt, caption, original_name, tags) VALUES ('m1', 'T', 'A', 'C', 'N', 'tg')",
[],
).unwrap();
}
#[test]
fn stem_german() {
let stemmed = stem_text("Programmierung Entwicklung", "de");
// German stemmer should reduce these words
assert!(!stemmed.is_empty());
assert_ne!(stemmed, "Programmierung Entwicklung");
}
@@ -296,6 +323,70 @@ mod tests {
assert!(stemmed.contains("jump"));
}
#[test]
fn stem_french() {
let stemmed = stem_text("programmation développement", "fr");
assert!(!stemmed.is_empty());
assert_ne!(stemmed, "programmation développement");
}
#[test]
fn stem_spanish() {
let stemmed = stem_text("programación desarrollo", "es");
assert!(!stemmed.is_empty());
assert_ne!(stemmed, "programación desarrollo");
}
#[test]
fn stem_italian() {
let stemmed = stem_text("programmazione sviluppo", "it");
assert!(!stemmed.is_empty());
assert_ne!(stemmed, "programmazione sviluppo");
}
#[test]
fn stem_portuguese() {
let stemmed = stem_text("programação desenvolvimento", "pt");
assert!(!stemmed.is_empty());
assert_ne!(stemmed, "programação desenvolvimento");
}
#[test]
fn stem_russian() {
let stemmed = stem_text("программирование разработка", "ru");
assert!(!stemmed.is_empty());
assert_ne!(stemmed, "программирование разработка");
}
#[test]
fn stem_swedish() {
let stemmed = stem_text("utvecklingen datorerna", "sv");
assert!(!stemmed.is_empty());
assert_ne!(stemmed, "utvecklingen datorerna");
}
#[test]
fn stem_dutch() {
let stemmed = stem_text("programmering ontwikkeling", "nl");
assert!(!stemmed.is_empty());
assert_ne!(stemmed, "programmering ontwikkeling");
}
#[test]
fn stem_turkish() {
let stemmed = stem_text("programlama geliştirilmesi", "tr");
assert!(!stemmed.is_empty());
assert_ne!(stemmed, "programlama geliştirilmesi");
}
#[test]
fn stem_fallback_uses_english() {
// Unknown language falls back to English stemmer
let stemmed_unknown = stem_text("running", "xx");
let stemmed_english = stem_text("running", "en");
assert_eq!(stemmed_unknown, stemmed_english);
}
#[test]
fn index_and_search_post() {
let db = setup();
@@ -379,4 +470,119 @@ mod tests {
let results = search_posts(db.conn(), "develop", "en").unwrap();
assert_eq!(results, vec!["p1"]);
}
#[test]
fn search_by_title_field() {
let db = setup();
index_post(db.conn(), "p1", "Unique Title Here", None, Some("body text"), &[], &[], &[], "en").unwrap();
// Search for title content
let results = search_posts(db.conn(), "unique", "en").unwrap();
assert_eq!(results, vec!["p1"]);
}
#[test]
fn search_by_tags() {
let db = setup();
index_post(db.conn(), "p1", "Post", None, None, &["photography".into()], &[], &[], "en").unwrap();
let results = search_posts(db.conn(), "photography", "en").unwrap();
assert_eq!(results, vec!["p1"]);
}
#[test]
fn search_by_categories() {
let db = setup();
index_post(db.conn(), "p1", "Post", None, None, &[], &["article".into()], &[], "en").unwrap();
let results = search_posts(db.conn(), "article", "en").unwrap();
assert_eq!(results, vec!["p1"]);
}
#[test]
fn search_filtered_by_status() {
let db = setup();
// Insert a post in the posts table (needed for the filter query to join)
use crate::db::queries::project::{insert_project, make_test_project};
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
db.conn().execute(
"INSERT INTO posts (id, project_id, title, slug, status, created_at, updated_at)
VALUES ('post1', 'p1', 'Test Post', 'test', 'published', 1700000000000, 1700000000000)",
[],
).unwrap();
db.conn().execute(
"INSERT INTO posts (id, project_id, title, slug, status, created_at, updated_at)
VALUES ('post2', 'p1', 'Draft Post', 'draft-post', 'draft', 1700000000000, 1700000000000)",
[],
).unwrap();
index_post(db.conn(), "post1", "Test Post", None, None, &[], &[], &[], "en").unwrap();
index_post(db.conn(), "post2", "Draft Post", None, None, &[], &[], &[], "en").unwrap();
let filters = PostSearchFilters {
status: Some("published"),
..Default::default()
};
let results = search_posts_filtered(db.conn(), "post", "en", &filters).unwrap();
assert_eq!(results, vec!["post1"]);
}
#[test]
fn search_filtered_by_year() {
let db = setup();
use crate::db::queries::project::{insert_project, make_test_project};
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
// 2024-06-15 in unix ms
let ts_2024: i64 = 1718409600000;
// 2023-06-15 in unix ms
let ts_2023: i64 = 1686873600000;
db.conn().execute(
"INSERT INTO posts (id, project_id, title, slug, status, created_at, updated_at)
VALUES ('p2024', 'p1', 'Year 2024', 'y2024', 'draft', ?1, ?1)",
rusqlite::params![ts_2024],
).unwrap();
db.conn().execute(
"INSERT INTO posts (id, project_id, title, slug, status, created_at, updated_at)
VALUES ('p2023', 'p1', 'Year 2023', 'y2023', 'draft', ?1, ?1)",
rusqlite::params![ts_2023],
).unwrap();
index_post(db.conn(), "p2024", "Year 2024", None, None, &[], &[], &[], "en").unwrap();
index_post(db.conn(), "p2023", "Year 2023", None, None, &[], &[], &[], "en").unwrap();
let filters = PostSearchFilters {
year: Some(2024),
..Default::default()
};
let results = search_posts_filtered(db.conn(), "year", "en", &filters).unwrap();
assert_eq!(results, vec!["p2024"]);
}
#[test]
fn search_filtered_with_limit_and_offset() {
let db = setup();
use crate::db::queries::project::{insert_project, make_test_project};
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
for i in 0..5 {
let id = format!("p{i}");
let slug = format!("post-{i}");
db.conn().execute(
"INSERT INTO posts (id, project_id, title, slug, status, created_at, updated_at)
VALUES (?1, 'p1', 'Searchable', ?2, 'draft', ?3, ?3)",
rusqlite::params![id, slug, 1700000000000i64 - i as i64 * 1000],
).unwrap();
index_post(db.conn(), &id, "Searchable", None, None, &[], &[], &[], "en").unwrap();
}
let filters = PostSearchFilters {
limit: Some(2),
offset: Some(1),
..Default::default()
};
let results = search_posts_filtered(db.conn(), "searchable", "en", &filters).unwrap();
assert_eq!(results.len(), 2);
}
}

371
crates/bds-core/src/db/migrations.rs
View File

@@ -1,334 +1,16 @@
use rusqlite::Connection;
/// Run all embedded migrations against the given connection.
mod embedded {
use refinery::embed_migrations;
embed_migrations!("migrations");
}
/// Run all embedded migrations against the given connection using refinery.
///
/// Creates the full bDS schema as specified in specs/schema.allium.
/// For M0 this is a single-step migration creating all core tables.
/// In M1 we will switch to refinery for proper versioned migrations.
pub fn run_migrations(conn: &Connection) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
conn.execute_batch(
"
-- ================================================================
-- CORE ENTITIES
-- ================================================================
CREATE TABLE IF NOT EXISTS projects (
id TEXT PRIMARY KEY,
name TEXT NOT NULL,
slug TEXT NOT NULL UNIQUE,
description TEXT,
data_path TEXT,
is_active INTEGER NOT NULL DEFAULT 0,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE TABLE IF NOT EXISTS posts (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
title TEXT NOT NULL,
slug TEXT NOT NULL,
excerpt TEXT,
content TEXT,
status TEXT NOT NULL DEFAULT 'draft',
author TEXT,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL,
published_at INTEGER,
file_path TEXT NOT NULL DEFAULT '',
checksum TEXT,
tags TEXT NOT NULL DEFAULT '[]',
categories TEXT NOT NULL DEFAULT '[]',
template_slug TEXT,
language TEXT,
do_not_translate INTEGER NOT NULL DEFAULT 0,
published_title TEXT,
published_content TEXT,
published_tags TEXT,
published_categories TEXT,
published_excerpt TEXT
);
CREATE UNIQUE INDEX IF NOT EXISTS posts_project_slug_idx
ON posts(project_id, slug);
CREATE TABLE IF NOT EXISTS post_translations (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
translation_for TEXT NOT NULL REFERENCES posts(id),
language TEXT NOT NULL,
title TEXT NOT NULL,
excerpt TEXT,
content TEXT,
status TEXT NOT NULL DEFAULT 'draft',
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL,
published_at INTEGER,
file_path TEXT NOT NULL DEFAULT '',
checksum TEXT
);
CREATE UNIQUE INDEX IF NOT EXISTS post_translations_translation_language_idx
ON post_translations(translation_for, language);
CREATE TABLE IF NOT EXISTS media (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
filename TEXT NOT NULL,
original_name TEXT NOT NULL,
mime_type TEXT NOT NULL,
size INTEGER NOT NULL,
width INTEGER,
height INTEGER,
title TEXT,
alt TEXT,
caption TEXT,
author TEXT,
file_path TEXT NOT NULL,
sidecar_path TEXT NOT NULL,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL,
checksum TEXT,
tags TEXT NOT NULL DEFAULT '[]',
language TEXT
);
CREATE TABLE IF NOT EXISTS media_translations (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
translation_for TEXT NOT NULL REFERENCES media(id),
language TEXT NOT NULL,
title TEXT,
alt TEXT,
caption TEXT,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS media_translations_translation_language_idx
ON media_translations(translation_for, language);
CREATE TABLE IF NOT EXISTS tags (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
name TEXT NOT NULL,
color TEXT,
post_template_slug TEXT,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS tags_project_name_idx
ON tags(project_id, name);
CREATE TABLE IF NOT EXISTS templates (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
slug TEXT NOT NULL,
title TEXT NOT NULL,
kind TEXT NOT NULL DEFAULT 'post',
enabled INTEGER NOT NULL DEFAULT 1,
version INTEGER NOT NULL DEFAULT 1,
file_path TEXT NOT NULL,
status TEXT NOT NULL DEFAULT 'published',
content TEXT,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS templates_project_slug_idx
ON templates(project_id, slug);
CREATE TABLE IF NOT EXISTS scripts (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
slug TEXT NOT NULL,
title TEXT NOT NULL,
kind TEXT NOT NULL DEFAULT 'utility',
entrypoint TEXT NOT NULL DEFAULT 'render',
enabled INTEGER NOT NULL DEFAULT 1,
version INTEGER NOT NULL DEFAULT 1,
file_path TEXT NOT NULL,
status TEXT NOT NULL DEFAULT 'published',
content TEXT,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS scripts_project_slug_idx
ON scripts(project_id, slug);
-- ================================================================
-- RELATIONSHIP TABLES
-- ================================================================
CREATE TABLE IF NOT EXISTS post_links (
id TEXT PRIMARY KEY,
source_post_id TEXT NOT NULL REFERENCES posts(id),
target_post_id TEXT NOT NULL REFERENCES posts(id),
link_text TEXT,
created_at INTEGER NOT NULL
);
CREATE TABLE IF NOT EXISTS post_media (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
post_id TEXT NOT NULL REFERENCES posts(id),
media_id TEXT NOT NULL REFERENCES media(id),
sort_order INTEGER NOT NULL DEFAULT 0,
created_at INTEGER NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS post_media_post_media_idx
ON post_media(post_id, media_id);
-- ================================================================
-- METADATA TABLES
-- ================================================================
CREATE TABLE IF NOT EXISTS settings (
key TEXT PRIMARY KEY,
value TEXT NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE TABLE IF NOT EXISTS generated_file_hashes (
project_id TEXT NOT NULL REFERENCES projects(id),
relative_path TEXT NOT NULL,
content_hash TEXT NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS generated_file_hashes_project_path_idx
ON generated_file_hashes(project_id, relative_path);
-- ================================================================
-- AI / CHAT TABLES (read-only in Rust core, must not error)
-- ================================================================
CREATE TABLE IF NOT EXISTS chat_conversations (
id TEXT PRIMARY KEY,
title TEXT NOT NULL,
model TEXT,
copilot_session_id TEXT,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL
);
CREATE TABLE IF NOT EXISTS chat_messages (
id INTEGER PRIMARY KEY AUTOINCREMENT,
conversation_id TEXT NOT NULL REFERENCES chat_conversations(id),
role TEXT NOT NULL,
content TEXT,
tool_call_id TEXT,
tool_calls TEXT,
created_at INTEGER NOT NULL
);
CREATE TABLE IF NOT EXISTS ai_providers (
id TEXT PRIMARY KEY,
name TEXT NOT NULL,
env TEXT,
npm TEXT,
api TEXT,
doc TEXT,
updated_at INTEGER NOT NULL
);
CREATE TABLE IF NOT EXISTS ai_models (
provider TEXT NOT NULL REFERENCES ai_providers(id),
model_id TEXT NOT NULL,
name TEXT NOT NULL,
family TEXT,
attachment INTEGER NOT NULL DEFAULT 0,
reasoning INTEGER NOT NULL DEFAULT 0,
tool_call INTEGER NOT NULL DEFAULT 0,
structured_output INTEGER NOT NULL DEFAULT 0,
temperature INTEGER NOT NULL DEFAULT 1,
knowledge TEXT,
release_date TEXT,
last_updated_date TEXT,
open_weights INTEGER NOT NULL DEFAULT 0,
input_price INTEGER,
output_price INTEGER,
cache_read_price INTEGER,
cache_write_price INTEGER,
context_window INTEGER NOT NULL DEFAULT 0,
max_input_tokens INTEGER NOT NULL DEFAULT 0,
max_output_tokens INTEGER NOT NULL DEFAULT 0,
interleaved TEXT,
status TEXT,
provider_npm TEXT,
updated_at INTEGER NOT NULL,
PRIMARY KEY (provider, model_id)
);
CREATE TABLE IF NOT EXISTS ai_model_modalities (
provider TEXT NOT NULL,
model_id TEXT NOT NULL,
direction TEXT NOT NULL,
modality TEXT NOT NULL,
FOREIGN KEY (provider, model_id) REFERENCES ai_models(provider, model_id)
);
CREATE TABLE IF NOT EXISTS ai_catalog_meta (
key TEXT PRIMARY KEY,
value TEXT NOT NULL
);
-- ================================================================
-- EMBEDDINGS TABLES (read-only in Rust core, must not error)
-- ================================================================
CREATE TABLE IF NOT EXISTS embedding_keys (
label INTEGER PRIMARY KEY,
post_id TEXT NOT NULL,
project_id TEXT NOT NULL,
content_hash TEXT NOT NULL,
vector TEXT NOT NULL
);
CREATE TABLE IF NOT EXISTS dismissed_duplicate_pairs (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
post_id_a TEXT NOT NULL,
post_id_b TEXT NOT NULL,
dismissed_at INTEGER NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS dismissed_pairs_idx
ON dismissed_duplicate_pairs(project_id, post_id_a, post_id_b);
-- ================================================================
-- IMPORT TABLES (read-only in Rust core, must not error)
-- ================================================================
CREATE TABLE IF NOT EXISTS import_definitions (
id TEXT PRIMARY KEY,
project_id TEXT NOT NULL REFERENCES projects(id),
name TEXT NOT NULL,
wxr_file_path TEXT,
uploads_folder_path TEXT,
last_analysis_result TEXT,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL
);
-- ================================================================
-- NOTIFICATION TABLES
-- ================================================================
CREATE TABLE IF NOT EXISTS db_notifications (
id INTEGER PRIMARY KEY AUTOINCREMENT,
entity_type TEXT NOT NULL,
entity_id TEXT NOT NULL,
action TEXT NOT NULL,
from_cli INTEGER NOT NULL DEFAULT 0,
seen_at INTEGER,
created_at INTEGER NOT NULL
);
",
)?;
/// Uses refinery for proper versioned migration tracking.
pub fn run_migrations(conn: &mut Connection) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
embedded::migrations::runner().run(conn)?;
Ok(())
}
@@ -337,9 +19,9 @@ mod tests {
use super::*;
fn setup() -> Connection {
let conn = Connection::open_in_memory().unwrap();
let mut conn = Connection::open_in_memory().unwrap();
conn.execute_batch("PRAGMA foreign_keys=ON;").unwrap();
run_migrations(&conn).unwrap();
run_migrations(&mut conn).unwrap();
conn
}
@@ -399,6 +81,23 @@ mod tests {
}
}
// ================================================================
// REFINERY TRACKING — verify migration history table exists
// ================================================================
#[test]
fn refinery_schema_history_exists() {
let conn = setup();
let count: i64 = conn
.query_row(
"SELECT COUNT(*) FROM refinery_schema_history",
[],
|row| row.get(0),
)
.unwrap();
assert!(count >= 1, "refinery should track at least one migration");
}
// ================================================================
// UNIQUE INDEX ENFORCEMENT — spec invariant tests
// ================================================================
@@ -434,7 +133,6 @@ mod tests {
insert_project(&conn, "p1", "blog1");
insert_project(&conn, "p2", "blog2");
insert_post(&conn, "post1", "p1", "hello");
// Same slug in a different project should succeed
conn.execute(
"INSERT INTO posts (id, project_id, title, slug, status, created_at, updated_at)
VALUES ('post2', 'p2', 'Other', 'hello', 'draft', 1000, 1000)",
@@ -643,7 +341,6 @@ mod tests {
#[test]
fn roundtrip_published_post_null_content() {
// spec: published posts have content = null in DB
let conn = setup();
insert_project(&conn, "p1", "blog");
conn.execute(
@@ -846,12 +543,6 @@ mod tests {
assert_eq!(hash, "sha256abc");
}
// ================================================================
// AI / CHAT / EMBEDDING / IMPORT / NOTIFICATION tables
// Must not error on read/write — spec says "read-only in Rust core"
// but schema must exist and be accessible.
// ================================================================
#[test]
fn roundtrip_chat_conversation() {
let conn = setup();
@@ -1006,10 +697,10 @@ mod tests {
#[test]
fn migrations_idempotent() {
let conn = Connection::open_in_memory().unwrap();
let mut conn = Connection::open_in_memory().unwrap();
conn.execute_batch("PRAGMA foreign_keys=ON;").unwrap();
run_migrations(&conn).unwrap();
run_migrations(&conn).expect("running migrations twice must not fail (CREATE IF NOT EXISTS)");
run_migrations(&mut conn).unwrap();
run_migrations(&mut conn).expect("running migrations twice must not fail");
}
// ================================================================

2
crates/bds-core/src/db/queries/media.rs
View File

@@ -149,7 +149,7 @@ mod tests {
use crate::db::Database;
fn setup() -> Database {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
db

2
crates/bds-core/src/db/queries/media_translation.rs
View File

@@ -103,7 +103,7 @@ mod tests {
use crate::db::Database;
fn setup() -> Database {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
insert_media(db.conn(), &make_test_media("m1", "p1")).unwrap();

2
crates/bds-core/src/db/queries/post.rs
View File

@@ -206,7 +206,7 @@ mod tests {
use crate::db::Database;
fn setup() -> Database {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
db

2
crates/bds-core/src/db/queries/post_link.rs
View File

@@ -55,7 +55,7 @@ mod tests {
use crate::db::Database;
fn setup() -> Database {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
let c = db.conn();

2
crates/bds-core/src/db/queries/post_media.rs
View File

@@ -70,7 +70,7 @@ mod tests {
use crate::db::Database;
fn setup() -> Database {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
db.conn()

2
crates/bds-core/src/db/queries/post_translation.rs
View File

@@ -130,7 +130,7 @@ mod tests {
use crate::model::PostStatus;
fn setup() -> Database {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
// insert a parent post

2
crates/bds-core/src/db/queries/project.rs
View File

@@ -106,7 +106,7 @@ mod tests {
use crate::db::Database;
fn setup() -> Database {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
db
}

2
crates/bds-core/src/db/queries/script.rs
View File

@@ -99,7 +99,7 @@ mod tests {
use crate::model::{ScriptKind, ScriptStatus};
fn setup() -> Database {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
db

2
crates/bds-core/src/db/queries/setting.rs
View File

@@ -39,7 +39,7 @@ mod tests {
use crate::db::Database;
fn setup() -> Database {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
db
}

2
crates/bds-core/src/db/queries/tag.rs
View File

@@ -77,7 +77,7 @@ mod tests {
use crate::db::Database;
fn setup() -> Database {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
db

2
crates/bds-core/src/db/queries/template.rs
View File

@@ -97,7 +97,7 @@ mod tests {
use crate::model::{TemplateKind, TemplateStatus};
fn setup() -> Database {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
db

2
crates/bds-core/src/engine/calendar.rs
View File

@@ -65,7 +65,7 @@ mod tests {
#[test]
fn calendar_empty_project() {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
let _ = db.migrate();
let tmp = tempfile::tempdir().unwrap();

2
crates/bds-core/src/engine/media.rs
View File

@@ -650,7 +650,7 @@ mod tests {
use tempfile::TempDir;
fn setup() -> (Database, TempDir) {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
ensure_fts_tables(db.conn()).unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();

2
crates/bds-core/src/engine/metadata_diff.rs
View File

@@ -619,7 +619,7 @@ mod tests {
use tempfile::TempDir;
fn setup() -> (Database, TempDir) {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
ensure_fts_tables(db.conn()).unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();

2
crates/bds-core/src/engine/post.rs
View File

@@ -865,7 +865,7 @@ mod tests {
use tempfile::TempDir;
fn setup() -> (Database, TempDir) {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
ensure_fts_tables(db.conn()).unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();

2
crates/bds-core/src/engine/post_media.rs
View File

@@ -89,7 +89,7 @@ mod tests {
use crate::util::sidecar::read_sidecar;
fn setup() -> (Database, TempDir) {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
let dir = TempDir::new().unwrap();

2
crates/bds-core/src/engine/project.rs
View File

@@ -152,7 +152,7 @@ mod tests {
use tempfile::TempDir;
fn setup() -> (Database, TempDir) {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
let dir = TempDir::new().unwrap();
(db, dir)

2
crates/bds-core/src/engine/rebuild.rs
View File

@@ -138,7 +138,7 @@ mod tests {
use tempfile::TempDir;
fn setup() -> (Database, TempDir) {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
fts::ensure_fts_tables(db.conn()).unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();

2
crates/bds-core/src/engine/script_rebuild.rs
View File

@@ -145,7 +145,7 @@ mod tests {
use tempfile::TempDir;
fn setup() -> (Database, TempDir) {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
let dir = TempDir::new().unwrap();

2
crates/bds-core/src/engine/search.rs
View File

@@ -130,7 +130,7 @@ mod tests {
use crate::engine;
fn setup() -> (Database, String) {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
let _ = db.migrate();
ensure_fts_tables(db.conn()).unwrap();

2
crates/bds-core/src/engine/tag.rs
View File

@@ -305,7 +305,7 @@ mod tests {
use tempfile::TempDir;
fn setup() -> (Database, TempDir) {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
let dir = TempDir::new().unwrap();
std::fs::create_dir_all(dir.path().join("meta")).unwrap();

2
crates/bds-core/src/engine/template_rebuild.rs
View File

@@ -144,7 +144,7 @@ mod tests {
use tempfile::TempDir;
fn setup() -> (Database, TempDir) {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();
let dir = TempDir::new().unwrap();

2
crates/bds-core/tests/m1_validation.rs
View File

@@ -44,7 +44,7 @@ fn make_test_project(id: &str, slug: &str) -> Project {
}
fn setup() -> (Database, TempDir) {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
ensure_fts_tables(db.conn()).unwrap();
insert_project(db.conn(), &make_test_project("p1", "blog")).unwrap();

4
crates/bds-core/tests/spec_claims.rs
View File

@@ -12,9 +12,9 @@ fn fixture_db() -> Connection {
}
fn memory_db() -> Connection {
let conn = Connection::open_in_memory().unwrap();
let mut conn = Connection::open_in_memory().unwrap();
conn.execute_batch("PRAGMA foreign_keys=ON;").unwrap();
bds_core::db::run_migrations(&conn).unwrap();
bds_core::db::run_migrations(&mut conn).unwrap();
conn
}

2
crates/bds-editor/src/lib.rs
View File

@@ -4,4 +4,4 @@ mod widget;
pub use buffer::EditorBuffer;
pub use highlight::Highlighter;
pub use widget::CodeEditor;
pub use widget::{CodeEditor, mono_metrics};

73
crates/bds-editor/src/widget.rs
View File

@@ -1,3 +1,6 @@
use std::sync::OnceLock;
use cosmic_text::{Attrs, Buffer as CosmicBuffer, Family, FontSystem, Metrics, Shaping};
use iced::advanced::layout::{self, Layout};
use iced::advanced::renderer;
use iced::advanced::text;
@@ -23,8 +26,44 @@ struct EditorState {
is_focused: bool,
}
const LINE_HEIGHT: f32 = 20.0;
const CHAR_WIDTH: f32 = 8.4;
/// Font metrics measured via cosmic-text, cached globally.
pub struct MonoMetrics {
pub char_width: f32,
pub line_height: f32,
}
static MONO_METRICS: OnceLock<MonoMetrics> = OnceLock::new();
/// Measure the monospace font metrics using cosmic-text.
pub fn mono_metrics() -> &'static MonoMetrics {
MONO_METRICS.get_or_init(|| {
let mut font_system = FontSystem::new();
let metrics = Metrics::new(FONT_SIZE, (FONT_SIZE * 1.43).ceil());
let mut buffer = CosmicBuffer::new(&mut font_system, metrics);
buffer.set_size(&mut font_system, Some(500.0), Some(100.0));
buffer.set_text(
&mut font_system,
"M",
Attrs::new().family(Family::Monospace),
Shaping::Advanced,
);
buffer.shape_until_scroll(&mut font_system, false);
let mut char_width = FONT_SIZE * 0.6; // fallback
let mut line_height = (FONT_SIZE * 1.43).ceil(); // fallback
for run in buffer.layout_runs() {
if let Some(glyph) = run.glyphs.first() {
char_width = glyph.w;
}
line_height = run.line_height;
break;
}
MonoMetrics { char_width, line_height }
})
}
const GUTTER_WIDTH: f32 = 50.0;
const FONT_SIZE: f32 = 14.0;
const BG_COLOR: Color = Color::from_rgb(0.18, 0.20, 0.25);
@@ -129,9 +168,10 @@ where
GUTTER_BG,
);
let metrics = mono_metrics();
let (cursor_line, cursor_col) = self.buffer.cursor();
let scroll = self.buffer.scroll_offset();
let visible_lines = (bounds.height / LINE_HEIGHT) as usize + 1;
let visible_lines = (bounds.height / metrics.line_height) as usize + 1;
let font = iced::Font::MONOSPACE;
@@ -142,8 +182,8 @@ where
break;
}
let y = bounds.y + vis_idx as f32 * LINE_HEIGHT;
if y + LINE_HEIGHT < bounds.y || y > bounds.y + bounds.height {
let y = bounds.y + vis_idx as f32 * metrics.line_height;
if y + metrics.line_height < bounds.y || y > bounds.y + bounds.height {
continue;
}
@@ -157,9 +197,9 @@ where
renderer.fill_text(
text::Text {
content: line_num,
bounds: Size::new(GUTTER_WIDTH - 8.0, LINE_HEIGHT),
bounds: Size::new(GUTTER_WIDTH - 8.0, metrics.line_height),
size: Pixels(FONT_SIZE),
line_height: iced::widget::text::LineHeight::Absolute(Pixels(LINE_HEIGHT)),
line_height: iced::widget::text::LineHeight::Absolute(Pixels(metrics.line_height)),
font,
horizontal_alignment: iced::alignment::Horizontal::Right,
vertical_alignment: iced::alignment::Vertical::Top,
@@ -183,9 +223,9 @@ where
renderer.fill_text(
text::Text {
content: line_text,
bounds: Size::new(bounds.width - GUTTER_WIDTH - 8.0, LINE_HEIGHT),
bounds: Size::new(bounds.width - GUTTER_WIDTH - 8.0, metrics.line_height),
size: Pixels(FONT_SIZE),
line_height: iced::widget::text::LineHeight::Absolute(Pixels(LINE_HEIGHT)),
line_height: iced::widget::text::LineHeight::Absolute(Pixels(metrics.line_height)),
font,
horizontal_alignment: iced::alignment::Horizontal::Left,
vertical_alignment: iced::alignment::Vertical::Top,
@@ -199,14 +239,14 @@ where
// Draw cursor on current line
if line_idx == cursor_line {
let cursor_x = text_x + cursor_col as f32 * CHAR_WIDTH;
let cursor_x = text_x + cursor_col as f32 * metrics.char_width;
renderer.fill_quad(
renderer::Quad {
bounds: Rectangle {
x: cursor_x,
y,
width: 2.0,
height: LINE_HEIGHT,
height: metrics.line_height,
},
border: iced::Border::default(),
shadow: iced::Shadow::default(),
@@ -231,6 +271,7 @@ where
) -> Status {
let state = tree.state.downcast_mut::<EditorState>();
let bounds = layout.bounds();
let metrics = mono_metrics();
match event {
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
@@ -238,8 +279,8 @@ where
state.is_focused = true;
// Place cursor at click position
if let Some(pos) = cursor.position_in(bounds) {
let line = (pos.y / LINE_HEIGHT) as usize + self.buffer.scroll_offset();
let col = ((pos.x - GUTTER_WIDTH - 8.0).max(0.0) / CHAR_WIDTH) as usize;
let line = (pos.y / metrics.line_height) as usize + self.buffer.scroll_offset();
let col = ((pos.x - GUTTER_WIDTH - 8.0).max(0.0) / metrics.char_width) as usize;
self.buffer.set_cursor(line, col);
}
return Status::Captured;
@@ -250,7 +291,7 @@ where
Event::Mouse(mouse::Event::WheelScrolled { delta }) if cursor.is_over(bounds) => {
let lines = match delta {
mouse::ScrollDelta::Lines { y, .. } => -(y * 3.0) as isize,
mouse::ScrollDelta::Pixels { y, .. } => -(y / LINE_HEIGHT) as isize,
mouse::ScrollDelta::Pixels { y, .. } => -(y / metrics.line_height) as isize,
};
self.buffer.scroll_by(lines);
return Status::Captured;
@@ -259,12 +300,12 @@ where
match key {
keyboard::Key::Named(keyboard::key::Named::ArrowUp) => {
self.buffer.move_up();
let vis = (bounds.height / LINE_HEIGHT) as usize;
let vis = (bounds.height / metrics.line_height) as usize;
self.buffer.ensure_cursor_visible(vis);
}
keyboard::Key::Named(keyboard::key::Named::ArrowDown) => {
self.buffer.move_down();
let vis = (bounds.height / LINE_HEIGHT) as usize;
let vis = (bounds.height / metrics.line_height) as usize;
self.buffer.ensure_cursor_visible(vis);
}
keyboard::Key::Named(keyboard::key::Named::ArrowLeft) => {

136
crates/bds-ui/src/app.rs
View File

@@ -15,6 +15,7 @@ use crate::state::navigation::{
handle_activity_click, OutputEntry, PanelTab, SidebarView, TaskSnapshot,
};
use crate::state::tabs::{self, Tab, TabType};
use crate::state::toast::{Toast, ToastLevel};
use crate::views::workspace;
// ───────────────────────────────────────────────────────────
@@ -67,6 +68,11 @@ pub enum Message {
ToggleLocaleDropdown,
ToggleProjectDropdown,
// Toast
ShowToast(ToastLevel, String),
DismissToast(u64),
ExpireToasts,
// Blog actions (dispatched to engine)
RebuildDatabase,
ReindexText,
@@ -131,9 +137,14 @@ pub struct BdsApp {
locale_dropdown_open: bool,
project_dropdown_open: bool,
// macOS lifecycle receiver
// Toasts
toasts: Vec<Toast>,
// macOS lifecycle receiver and retained delegate
#[cfg(target_os = "macos")]
_lifecycle_rx: std::sync::mpsc::Receiver<crate::platform::macos::LifecycleEvent>,
#[cfg(target_os = "macos")]
_lifecycle_delegate: Option<objc2::rc::Retained<crate::platform::macos::BdsAppDelegate>>,
}
// ───────────────────────────────────────────────────────────
@@ -156,8 +167,8 @@ impl BdsApp {
let _ = std::fs::create_dir_all(parent);
}
let db = Database::open(&db_path).ok();
if let Some(ref db) = db {
let mut db = Database::open(&db_path).ok();
if let Some(ref mut db) = db {
let _ = db.migrate();
}
@@ -215,6 +226,8 @@ impl BdsApp {
#[cfg(target_os = "macos")]
let (_lifecycle_tx, _lifecycle_rx) = crate::platform::macos::lifecycle_channel();
#[cfg(target_os = "macos")]
let _lifecycle_delegate = crate::platform::macos::install_delegate(_lifecycle_tx);
(
Self {
@@ -242,8 +255,11 @@ impl BdsApp {
offline_mode: false,
locale_dropdown_open: false,
project_dropdown_open: false,
toasts: Vec::new(),
#[cfg(target_os = "macos")]
_lifecycle_rx,
#[cfg(target_os = "macos")]
_lifecycle_delegate,
},
init_task,
)
@@ -282,6 +298,7 @@ impl BdsApp {
if let Some(t) = self.tabs.get(idx) {
self.active_tab = Some(t.id.clone());
}
self.sync_menu_state();
Task::none()
}
Message::CloseTab(id) => {
@@ -290,6 +307,7 @@ impl BdsApp {
} else {
self.active_tab = None;
}
self.sync_menu_state();
Task::none()
}
Message::SelectTab(id) => {
@@ -306,7 +324,6 @@ impl BdsApp {
// ── Project management ──
Message::ProjectsLoaded(projects) => {
self.projects = projects;
// Re-resolve active
if let Some(ref db) = self.db {
self.active_project = engine::project::get_active_project(db.conn())
.ok()
@@ -318,6 +335,7 @@ impl BdsApp {
.map(PathBuf::from);
}
self.refresh_counts();
self.sync_menu_state();
Task::none()
}
Message::SwitchProject(project_id) => {
@@ -332,24 +350,25 @@ impl BdsApp {
.and_then(|p| p.data_path.as_ref())
.map(PathBuf::from);
let name = self.active_project.as_ref().map(|p| p.name.clone()).unwrap_or_default();
self.add_output(&tw(self.ui_locale, "projectSelector.toast.switched", &[("name", &name)]));
self.notify(ToastLevel::Success, &tw(self.ui_locale, "projectSelector.toast.switched", &[("name", &name)]));
}
Err(_) => {
self.add_output(&t(self.ui_locale, "projectSelector.toast.switchFailed"));
self.notify(ToastLevel::Error, &t(self.ui_locale, "projectSelector.toast.switchFailed"));
}
}
}
self.sync_menu_state();
Task::none()
}
Message::ProjectSwitched(result) => {
match result {
Ok(name) => self.add_output(&tw(self.ui_locale, "projectSelector.toast.switched", &[("name", &name)])),
Err(msg) => self.add_output(&msg),
Ok(name) => self.notify(ToastLevel::Success, &tw(self.ui_locale, "projectSelector.toast.switched", &[("name", &name)])),
Err(msg) => self.notify(ToastLevel::Error, &msg),
}
Task::none()
}
Message::RequestCreateProject => {
crate::platform::dialog::pick_folder()
crate::platform::dialog::pick_folder(t(self.ui_locale, "dialog.selectFolder"))
}
Message::CreateProject { name, data_path } => {
if let Some(ref db) = self.db {
@@ -365,10 +384,10 @@ impl BdsApp {
self.active_project = Some(project.clone());
self.data_dir = project.data_path.as_ref().map(PathBuf::from);
let msg = tw(self.ui_locale, "projectSelector.toast.created", &[("name", &project.name)]);
self.add_output(&msg);
self.notify(ToastLevel::Success, &msg);
}
Err(_) => {
self.add_output(&t(self.ui_locale, "projectSelector.toast.createFailed"));
self.notify(ToastLevel::Error, &t(self.ui_locale, "projectSelector.toast.createFailed"));
}
}
}
@@ -376,8 +395,8 @@ impl BdsApp {
}
Message::ProjectCreated(result) => {
match result {
Ok(name) => self.add_output(&tw(self.ui_locale, "projectSelector.toast.created", &[("name", &name)])),
Err(msg) => self.add_output(&msg),
Ok(name) => self.notify(ToastLevel::Success, &tw(self.ui_locale, "projectSelector.toast.created", &[("name", &name)])),
Err(msg) => self.notify(ToastLevel::Error, &msg),
}
Task::none()
}
@@ -392,7 +411,7 @@ impl BdsApp {
self.projects.retain(|p| p.id != project_id);
}
Err(_) => {
self.add_output(&t(self.ui_locale, "projectSelector.toast.deleteFailed"));
self.notify(ToastLevel::Error, &t(self.ui_locale, "projectSelector.toast.deleteFailed"));
}
}
}
@@ -400,7 +419,7 @@ impl BdsApp {
}
Message::ProjectDeleted(result) => {
if let Err(msg) = result {
self.add_output(&msg);
self.notify(ToastLevel::Error, &msg);
}
Task::none()
}
@@ -449,6 +468,7 @@ impl BdsApp {
// ── Settings ──
Message::SetOfflineMode(mode) => {
self.offline_mode = mode;
self.sync_menu_state();
Task::none()
}
Message::SetUiLocale(locale) => {
@@ -564,11 +584,11 @@ impl BdsApp {
match &result {
Ok(detail) => {
self.task_manager.complete(task_id);
self.add_output(&format!("{label}: {detail}"));
self.notify(ToastLevel::Success, &format!("{label}: {detail}"));
}
Err(err) => {
self.task_manager.fail(task_id, err.clone());
self.add_output(&format!("{label} failed: {err}"));
self.notify(ToastLevel::Error, &format!("{label} failed: {err}"));
}
}
self.refresh_counts();
@@ -576,6 +596,20 @@ impl BdsApp {
Task::none()
}
// ── Toast ──
Message::ShowToast(level, msg) => {
self.toasts.push(Toast::new(level, msg));
Task::none()
}
Message::DismissToast(id) => {
self.toasts.retain(|t| t.id != id);
Task::none()
}
Message::ExpireToasts => {
self.toasts.retain(|t| !t.is_expired());
Task::none()
}
Message::Noop => Task::none(),
Message::InitMenuBar => {
#[cfg(target_os = "macos")]
@@ -608,6 +642,7 @@ impl BdsApp {
self.locale_dropdown_open,
self.project_dropdown_open,
self.ui_locale,
&self.toasts,
)
}
@@ -617,7 +652,14 @@ impl BdsApp {
let task_tick = iced::time::every(std::time::Duration::from_millis(500))
.map(|_| Message::TaskTick);
Subscription::batch([menu_sub, task_tick])
let toast_tick = if !self.toasts.is_empty() {
iced::time::every(std::time::Duration::from_millis(250))
.map(|_| Message::ExpireToasts)
} else {
Subscription::none()
};
Subscription::batch([menu_sub, task_tick, toast_tick])
}
// ── Private helpers ──
@@ -661,7 +703,10 @@ impl BdsApp {
}
Task::none()
}
MenuAction::ImportMedia => crate::platform::dialog::pick_media_files(),
MenuAction::ImportMedia => crate::platform::dialog::pick_media_files(
t(self.ui_locale, "dialog.importMedia"),
t(self.ui_locale, "dialog.imageFilter"),
),
MenuAction::Save => Task::none(), // Disabled in M2
MenuAction::OpenInBrowser => Task::none(),
MenuAction::OpenDataFolder => {
@@ -704,10 +749,9 @@ impl BdsApp {
MenuAction::ValidateTranslations => Task::done(Message::ValidateTranslations),
MenuAction::FillMissingTranslations => {
if self.offline_mode {
self.add_output(&t(self.ui_locale, "engine.fillMissingTranslationsOffline"));
self.notify(ToastLevel::Warning, &t(self.ui_locale, "engine.fillMissingTranslationsOffline"));
} else {
// AI translation not yet available — inform user
self.add_output(&t(self.ui_locale, "engine.fillMissingTranslationsNoAi"));
self.notify(ToastLevel::Warning, &t(self.ui_locale, "engine.fillMissingTranslationsNoAi"));
}
Task::none()
}
@@ -718,9 +762,8 @@ impl BdsApp {
}
MenuAction::UploadSite => {
if self.offline_mode {
self.add_output(&t(self.ui_locale, "engine.uploadOffline"));
self.notify(ToastLevel::Warning, &t(self.ui_locale, "engine.uploadOffline"));
} else if let Some(data_dir) = &self.data_dir {
// Check publishing credentials
let pub_prefs = engine::meta::read_publishing_json(data_dir).ok();
let has_creds = pub_prefs
.as_ref()
@@ -730,10 +773,9 @@ impl BdsApp {
})
.unwrap_or(false);
if !has_creds {
self.add_output(&t(self.ui_locale, "engine.uploadMissingCredentials"));
self.notify(ToastLevel::Warning, &t(self.ui_locale, "engine.uploadMissingCredentials"));
} else {
self.add_output(&t(self.ui_locale, "engine.uploadStarted"));
// SSH upload requires async SSH library (deferred to publishing milestone)
self.notify(ToastLevel::Info, &t(self.ui_locale, "engine.uploadStarted"));
}
}
Task::none()
@@ -802,6 +844,12 @@ impl BdsApp {
});
}
/// Show a toast notification AND log to output panel.
fn notify(&mut self, level: ToastLevel, text: &str) {
self.toasts.push(Toast::new(level, text.to_string()));
self.add_output(text);
}
/// Spawn a blocking engine operation on a background thread via TaskManager.
///
/// Returns `Task::none()` if no active project/db/data_dir.
@@ -879,4 +927,38 @@ impl BdsApp {
.unwrap_or_default();
}
}
/// Synchronise menu enabled/disabled state with current app state.
///
/// Called after state-changing operations (project switch, tab open/close,
/// offline toggle) so that menu items reflect what's actually possible.
fn sync_menu_state(&self) {
let has_project = self.active_project.is_some();
let has_tab = self.active_tab.is_some();
// File group: need active project for most, need open tab for Save
self.menu_registry.set_enabled(MenuAction::NewPost, has_project);
self.menu_registry.set_enabled(MenuAction::ImportMedia, has_project);
self.menu_registry.set_enabled(MenuAction::Save, has_tab);
self.menu_registry.set_enabled(MenuAction::OpenInBrowser, has_tab);
self.menu_registry.set_enabled(MenuAction::OpenDataFolder, has_project);
// Edit: Find/Replace need an open tab
self.menu_registry.set_enabled(MenuAction::Find, has_tab);
self.menu_registry.set_enabled(MenuAction::Replace, has_tab);
// Blog group: need active project
self.menu_registry.set_enabled(MenuAction::PublishSelected, has_project && has_tab);
self.menu_registry.set_enabled(MenuAction::PreviewPost, has_project && has_tab);
self.menu_registry.set_enabled(MenuAction::EditMenu, has_project);
self.menu_registry.set_enabled(MenuAction::RebuildDatabase, has_project);
self.menu_registry.set_enabled(MenuAction::ReindexText, has_project);
self.menu_registry.set_enabled(MenuAction::MetadataDiff, has_project);
self.menu_registry.set_enabled(MenuAction::RegenerateCalendar, has_project);
self.menu_registry.set_enabled(MenuAction::ValidateTranslations, has_project);
self.menu_registry.set_enabled(MenuAction::FillMissingTranslations, has_project && !self.offline_mode);
self.menu_registry.set_enabled(MenuAction::GenerateSitemap, has_project);
self.menu_registry.set_enabled(MenuAction::ValidateSite, has_project);
self.menu_registry.set_enabled(MenuAction::UploadSite, has_project && !self.offline_mode);
}
}

14
crates/bds-ui/src/platform/dialog.rs
View File

@@ -3,11 +3,11 @@ use iced::Task;
use crate::app::Message;
/// Pick a folder using the native file dialog.
pub fn pick_folder() -> Task<Message> {
pub fn pick_folder(title: String) -> Task<Message> {
Task::perform(
async {
async move {
rfd::AsyncFileDialog::new()
.set_title("Select Folder")
.set_title(&title)
.pick_folder()
.await
.map(|h| h.path().to_path_buf())
@@ -17,13 +17,13 @@ pub fn pick_folder() -> Task<Message> {
}
/// Pick one or more image/media files using the native file dialog.
pub fn pick_media_files() -> Task<Message> {
pub fn pick_media_files(title: String, filter_label: String) -> Task<Message> {
Task::perform(
async {
async move {
rfd::AsyncFileDialog::new()
.set_title("Import Media")
.set_title(&title)
.add_filter(
"Images",
&filter_label,
&["jpg", "jpeg", "png", "gif", "webp", "svg", "tiff", "bmp"],
)
.pick_files()

72
crates/bds-ui/src/platform/macos.rs
View File

@@ -1,6 +1,12 @@
use std::path::PathBuf;
use std::sync::mpsc;
use objc2::rc::Retained;
use objc2::runtime::ProtocolObject;
use objc2::{define_class, msg_send, DefinedClass, MainThreadMarker, MainThreadOnly};
use objc2_app_kit::{NSApplication, NSApplicationDelegate};
use objc2_foundation::{NSArray, NSNotification, NSObject, NSObjectProtocol, NSString, NSURL};
use crate::app::Message;
/// Events that arrive from macOS lifecycle hooks (openFile, openURLs).
@@ -10,11 +16,75 @@ pub enum LifecycleEvent {
UrlOpen(String),
}
/// Create the macOS lifecycle channel (sender goes to objc hooks, receiver polled by subscription).
/// Ivars for the delegate — holds the sender side of the lifecycle channel.
#[derive(Debug)]
pub struct DelegateIvars {
tx: mpsc::Sender<LifecycleEvent>,
}
define_class!(
// SAFETY: NSObject has no subclassing requirements. BdsAppDelegate does not impl Drop.
#[unsafe(super(NSObject))]
#[thread_kind = MainThreadOnly]
#[name = "BdsAppDelegate"]
#[ivars = DelegateIvars]
pub struct BdsAppDelegate;
unsafe impl NSObjectProtocol for BdsAppDelegate {}
unsafe impl NSApplicationDelegate for BdsAppDelegate {
#[unsafe(method(applicationDidFinishLaunching:))]
fn did_finish_launching(&self, _notification: &NSNotification) {
// App is already running via Iced; nothing to do here.
}
#[unsafe(method(application:openFile:))]
fn application_open_file(&self, _sender: &NSApplication, filename: &NSString) -> bool {
let path = PathBuf::from(filename.to_string());
let _ = self.ivars().tx.send(LifecycleEvent::FileOpen(path));
true
}
#[unsafe(method(application:openURLs:))]
fn application_open_urls(&self, _sender: &NSApplication, urls: &NSArray<NSURL>) {
for i in 0..urls.len() {
if let Some(url) = urls.objectAtIndex(i).absoluteString() {
let _ = self.ivars().tx.send(LifecycleEvent::UrlOpen(url.to_string()));
}
}
}
}
);
impl BdsAppDelegate {
fn new(mtm: MainThreadMarker, tx: mpsc::Sender<LifecycleEvent>) -> Retained<Self> {
let this = Self::alloc(mtm);
let this = this.set_ivars(DelegateIvars { tx });
unsafe { msg_send![super(this), init] }
}
}
/// Create the macOS lifecycle channel and wire the native delegate.
///
/// Returns `(Retained<BdsAppDelegate>, Receiver)`. The delegate must be kept alive
/// for the lifetime of the application (drop it and the callbacks stop).
pub fn lifecycle_channel() -> (mpsc::Sender<LifecycleEvent>, mpsc::Receiver<LifecycleEvent>) {
mpsc::channel()
}
/// Install the native Objective-C delegate on NSApplication, wiring it to the given sender.
///
/// Must be called from the main thread after the Iced application is running.
/// Returns the retained delegate (caller must keep it alive).
pub fn install_delegate(tx: mpsc::Sender<LifecycleEvent>) -> Option<Retained<BdsAppDelegate>> {
let mtm = MainThreadMarker::new()?;
let delegate = BdsAppDelegate::new(mtm, tx);
let app = NSApplication::sharedApplication(mtm);
let object = ProtocolObject::from_ref(&*delegate);
app.setDelegate(Some(object));
Some(delegate)
}
/// Poll the macOS lifecycle receiver for the next event and map to a Message.
pub fn poll_lifecycle(
receiver: &mpsc::Receiver<LifecycleEvent>,

2
crates/bds-ui/src/state/mod.rs
View File

@@ -1,5 +1,7 @@
pub mod navigation;
pub mod tabs;
pub mod toast;
pub use navigation::{SidebarView, PanelTab, TaskSnapshot, OutputEntry};
pub use tabs::{Tab, TabType};
pub use toast::{Toast, ToastLevel};

80
crates/bds-ui/src/state/toast.rs Normal file
View File

@@ -0,0 +1,80 @@
/// Toast notification state.
///
/// Toasts are ephemeral, auto-dismissing messages shown at the top of
/// the workspace. Each toast has a severity level, a message, and a
/// monotonically increasing id used for targeted dismissal.
use std::sync::atomic::{AtomicU64, Ordering};
static NEXT_TOAST_ID: AtomicU64 = AtomicU64::new(1);
/// Severity determines the visual style.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum ToastLevel {
Info,
Success,
Warning,
Error,
}
/// A single toast notification.
#[derive(Debug, Clone)]
pub struct Toast {
pub id: u64,
pub level: ToastLevel,
pub message: String,
/// Unix-millis when this toast was created.
pub created_at: u64,
}
impl Toast {
/// Default display duration in milliseconds.
pub const DEFAULT_DURATION_MS: u64 = 4000;
pub fn new(level: ToastLevel, message: String) -> Self {
let now = std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.unwrap_or_default()
.as_millis() as u64;
Self {
id: NEXT_TOAST_ID.fetch_add(1, Ordering::Relaxed),
level,
message,
created_at: now,
}
}
/// Whether this toast has exceeded its display duration.
pub fn is_expired(&self) -> bool {
let now = std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.unwrap_or_default()
.as_millis() as u64;
now.saturating_sub(self.created_at) >= Self::DEFAULT_DURATION_MS
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn toast_ids_are_unique() {
let a = Toast::new(ToastLevel::Info, "a".into());
let b = Toast::new(ToastLevel::Info, "b".into());
assert_ne!(a.id, b.id);
}
#[test]
fn toast_levels() {
let t = Toast::new(ToastLevel::Error, "oops".into());
assert_eq!(t.level, ToastLevel::Error);
assert!(!t.message.is_empty());
}
#[test]
fn fresh_toast_not_expired() {
let t = Toast::new(ToastLevel::Info, "test".into());
assert!(!t.is_expired());
}
}

1
crates/bds-ui/src/views/mod.rs
View File

@@ -5,4 +5,5 @@ pub mod tab_bar;
pub mod status_bar;
pub mod panel;
pub mod project_selector;
pub mod toast;
pub mod welcome;

104
crates/bds-ui/src/views/toast.rs Normal file
View File

@@ -0,0 +1,104 @@
use iced::widget::{button, container, row, text, Space};
use iced::widget::text::Shaping;
use iced::{Alignment, Background, Border, Color, Element, Length, Padding, Theme};
use crate::app::Message;
use crate::state::toast::{Toast, ToastLevel};
/// Background color per toast severity.
fn toast_bg(level: ToastLevel) -> Color {
match level {
ToastLevel::Info => Color::from_rgb(0.16, 0.22, 0.34),
ToastLevel::Success => Color::from_rgb(0.12, 0.30, 0.16),
ToastLevel::Warning => Color::from_rgb(0.38, 0.30, 0.10),
ToastLevel::Error => Color::from_rgb(0.38, 0.14, 0.14),
}
}
/// Border color per toast severity.
fn toast_border(level: ToastLevel) -> Color {
match level {
ToastLevel::Info => Color::from_rgb(0.25, 0.40, 0.65),
ToastLevel::Success => Color::from_rgb(0.20, 0.55, 0.25),
ToastLevel::Warning => Color::from_rgb(0.65, 0.50, 0.15),
ToastLevel::Error => Color::from_rgb(0.65, 0.20, 0.20),
}
}
fn toast_style(level: ToastLevel) -> impl Fn(&Theme) -> container::Style {
move |_theme: &Theme| container::Style {
background: Some(Background::Color(toast_bg(level))),
border: Border {
color: toast_border(level),
width: 1.0,
radius: 4.0.into(),
},
..container::Style::default()
}
}
fn dismiss_btn(_theme: &Theme, status: button::Status) -> button::Style {
let color = match status {
button::Status::Hovered => Color::WHITE,
_ => Color::from_rgb(0.65, 0.65, 0.70),
};
button::Style {
background: Some(Background::Color(Color::TRANSPARENT)),
text_color: color,
border: Border::default(),
..button::Style::default()
}
}
/// Render the toast stack as an overlay element.
///
/// Returns `None` when no toasts are visible.
pub fn view(toasts: &[Toast]) -> Option<Element<'static, Message>> {
if toasts.is_empty() {
return None;
}
let items: Vec<Element<'static, Message>> = toasts
.iter()
.map(|toast| {
let level = toast.level;
let dismiss = button(text("\u{2715}").size(11).shaping(Shaping::Advanced))
.on_press(Message::DismissToast(toast.id))
.padding([2, 4])
.style(dismiss_btn);
container(
row![
text(toast.message.clone())
.size(12)
.shaping(Shaping::Advanced)
.color(Color::WHITE),
Space::with_width(Length::Fill),
dismiss,
]
.spacing(8)
.align_y(Alignment::Center)
.padding([6, 12]),
)
.width(Length::Fixed(420.0))
.style(toast_style(level))
.into()
})
.collect();
Some(
container(
container(
iced::widget::Column::with_children(items)
.spacing(4)
.align_x(Alignment::Center),
)
.width(Length::Fill)
.align_x(Alignment::Center)
.padding(Padding { top: 8.0, right: 0.0, bottom: 0.0, left: 0.0 }),
)
.width(Length::Fill)
.height(Length::Shrink)
.into(),
)
}

24
crates/bds-ui/src/views/workspace.rs
View File

@@ -8,7 +8,8 @@ use bds_core::model::{Media, Post, Project};
use crate::app::Message;
use crate::state::navigation::{OutputEntry, PanelTab, SidebarView, TaskSnapshot};
use crate::state::tabs::Tab;
use crate::views::{activity_bar, panel, project_selector, sidebar, status_bar, tab_bar, welcome};
use crate::state::toast::Toast;
use crate::views::{activity_bar, panel, project_selector, sidebar, status_bar, tab_bar, toast, welcome};
/// Main content area background.
fn content_bg(_theme: &Theme) -> container::Style {
@@ -67,6 +68,8 @@ pub fn view(
project_dropdown_open: bool,
// i18n
locale: UiLocale,
// Toasts
toasts: &[Toast],
) -> Element<'static, Message> {
// Activity bar (leftmost column)
let activity = activity_bar::view(sidebar_view, locale);
@@ -181,12 +184,25 @@ pub fn view(
None
};
// Collect overlays: dropdowns and toasts
let mut overlays: Vec<Element<'static, Message>> = Vec::new();
if let Some(toast_overlay) = toast::view(toasts) {
overlays.push(toast_overlay);
}
if let Some(overlay) = overlay {
stack![base_layout, overlay]
overlays.push(overlay);
}
if overlays.is_empty() {
base_layout
} else {
let mut layers = vec![base_layout];
layers.extend(overlays);
stack(layers)
.width(Length::Fill)
.height(Length::Fill)
.into()
} else {
base_layout
}
}

6
crates/bds-ui/tests/app_smoke.rs
View File

@@ -13,6 +13,7 @@ use bds_core::i18n::UiLocale;
use bds_ui::app::Message;
use bds_ui::state::navigation::{PanelTab, SidebarView};
use bds_ui::state::tabs::{Tab, TabType};
use bds_ui::state::toast::ToastLevel;
// ── Smoke: Message enum is well-formed ──
@@ -87,6 +88,11 @@ fn new_message_variants_constructable() {
label: "test".into(),
result: Ok("ok".into()),
};
// Toast
let _show = Message::ShowToast(ToastLevel::Info, "hello".into());
let _dismiss = Message::DismissToast(1);
let _expire = Message::ExpireToasts;
}
// ── Smoke: BdsApp type is accessible from integration tests ──

163
crates/bds-ui/tests/m2_validation.rs Normal file
View File

@@ -0,0 +1,163 @@
//! M2: Native Workspace validation tests.
//!
//! Validates toast system, menu sync logic, dialog i18n,
//! and keyboard shortcut coverage.
use bds_core::i18n::{translate, UiLocale};
use bds_ui::state::toast::{Toast, ToastLevel};
use bds_ui::platform::menu::MenuAction;
// ── Toast system ──
#[test]
fn toast_ids_are_monotonically_increasing() {
let a = Toast::new(ToastLevel::Info, "first".into());
let b = Toast::new(ToastLevel::Warning, "second".into());
let c = Toast::new(ToastLevel::Error, "third".into());
assert!(b.id > a.id);
assert!(c.id > b.id);
}
#[test]
fn toast_level_variants() {
let info = Toast::new(ToastLevel::Info, "info".into());
let success = Toast::new(ToastLevel::Success, "ok".into());
let warning = Toast::new(ToastLevel::Warning, "warn".into());
let error = Toast::new(ToastLevel::Error, "err".into());
assert_eq!(info.level, ToastLevel::Info);
assert_eq!(success.level, ToastLevel::Success);
assert_eq!(warning.level, ToastLevel::Warning);
assert_eq!(error.level, ToastLevel::Error);
}
#[test]
fn fresh_toast_is_not_expired() {
let t = Toast::new(ToastLevel::Info, "test".into());
assert!(!t.is_expired());
}
#[test]
fn toast_preserves_message() {
let t = Toast::new(ToastLevel::Error, "something failed".into());
assert_eq!(t.message, "something failed");
}
// ── Menu enable/disable rules ──
// (These test the expected invariants, not the BdsApp method directly,
// since BdsApp::new() requires main thread for muda.)
#[test]
fn menu_actions_that_need_project() {
let project_actions = [
MenuAction::NewPost,
MenuAction::ImportMedia,
MenuAction::OpenDataFolder,
MenuAction::EditMenu,
MenuAction::RebuildDatabase,
MenuAction::ReindexText,
MenuAction::MetadataDiff,
MenuAction::RegenerateCalendar,
MenuAction::ValidateTranslations,
MenuAction::GenerateSitemap,
MenuAction::ValidateSite,
];
// All should have i18n keys
for action in &project_actions {
let key = action.i18n_key();
let label = translate(UiLocale::En, key);
assert_ne!(label, key, "missing translation for {key}");
}
assert_eq!(project_actions.len(), 11);
}
#[test]
fn menu_actions_that_need_tab() {
let tab_actions = [
MenuAction::Save,
MenuAction::OpenInBrowser,
MenuAction::Find,
MenuAction::Replace,
];
for action in &tab_actions {
let key = action.i18n_key();
let label = translate(UiLocale::En, key);
assert_ne!(label, key, "missing translation for {key}");
}
assert_eq!(tab_actions.len(), 4);
}
#[test]
fn menu_actions_gated_by_offline() {
let online_only = [
MenuAction::FillMissingTranslations,
MenuAction::UploadSite,
];
for action in &online_only {
let key = action.i18n_key();
let label = translate(UiLocale::En, key);
assert_ne!(label, key, "missing translation for {key}");
}
assert_eq!(online_only.len(), 2);
}
// ── Dialog i18n ──
#[test]
fn dialog_keys_exist_in_all_locales() {
let keys = ["dialog.selectFolder", "dialog.importMedia", "dialog.imageFilter"];
for locale in UiLocale::all() {
for key in &keys {
let label = translate(*locale, key);
assert_ne!(label, *key, "missing {key} for locale {locale}");
}
}
}
// ── Keyboard shortcut coverage ──
#[test]
fn accelerator_actions_match_spec() {
// M2 spec: these actions must have keyboard shortcuts
let accelerated = [
MenuAction::NewPost, // Cmd+N
MenuAction::ImportMedia, // Cmd+I
MenuAction::Save, // Cmd+S
MenuAction::Find, // Cmd+F
MenuAction::Replace, // Cmd+H
MenuAction::EditPreferences, // Cmd+,
MenuAction::ViewPosts, // Cmd+1
MenuAction::ViewMedia, // Cmd+2
MenuAction::ToggleSidebar, // Cmd+B
MenuAction::TogglePanel, // Cmd+J
MenuAction::PublishSelected, // Cmd+Shift+P
MenuAction::PreviewPost, // Cmd+Shift+V
MenuAction::GenerateSitemap, // Cmd+R
MenuAction::ValidateSite, // Cmd+Shift+L
MenuAction::UploadSite, // Cmd+Shift+U
];
// All must be valid MenuAction variants with i18n keys
for action in &accelerated {
assert!(!action.i18n_key().is_empty());
}
assert_eq!(accelerated.len(), 15, "M2 spec has 15 accelerator-bound actions");
}
// ── Toast i18n keys ──
#[test]
fn toast_keys_exist_in_all_locales() {
let keys = [
"projectSelector.toast.switched",
"projectSelector.toast.switchFailed",
"projectSelector.toast.created",
"projectSelector.toast.createFailed",
"projectSelector.toast.deleteFailed",
];
for locale in UiLocale::all() {
for key in &keys {
let label = translate(*locale, key);
assert_ne!(label, *key, "missing {key} for locale {locale}");
}
}
}

2
crates/bds-ui/tests/project_flow.rs
View File

@@ -8,7 +8,7 @@ use bds_core::engine::project;
use tempfile::TempDir;
fn setup() -> (Database, TempDir) {
let db = Database::open_in_memory().unwrap();
let mut db = Database::open_in_memory().unwrap();
db.migrate().unwrap();
let dir = TempDir::new().unwrap();
(db, dir)

5
locales/ui/de.json
View File

@@ -122,5 +122,8 @@
"engine.uploadMissingCredentials": "Veröffentlichungsdaten unvollständig. In Projekteinstellungen konfigurieren.",
"engine.uploadOffline": "Hochladen nicht möglich: Flugmodus ist aktiv",
"engine.generateSiteStarted": "Seite wird generiert...",
"engine.generateSiteNoProject": "Kein aktives Projekt"
"engine.generateSiteNoProject": "Kein aktives Projekt",
"dialog.selectFolder": "Ordner auswählen",
"dialog.importMedia": "Medien importieren",
"dialog.imageFilter": "Bilder"
}

5
locales/ui/en.json
View File

@@ -122,5 +122,8 @@
"engine.uploadMissingCredentials": "Publishing credentials incomplete. Configure in project settings.",
"engine.uploadOffline": "Cannot upload: airplane mode is active",
"engine.generateSiteStarted": "Generating site...",
"engine.generateSiteNoProject": "No active project"
"engine.generateSiteNoProject": "No active project",
"dialog.selectFolder": "Select Folder",
"dialog.importMedia": "Import Media",
"dialog.imageFilter": "Images"
}

5
locales/ui/es.json
View File

@@ -122,5 +122,8 @@
"engine.uploadMissingCredentials": "Credenciales de publicación incompletas. Configúralas en los ajustes del proyecto.",
"engine.uploadOffline": "No se puede subir: el modo avión está activo",
"engine.generateSiteStarted": "Generando sitio...",
"engine.generateSiteNoProject": "No hay proyecto activo"
"engine.generateSiteNoProject": "No hay proyecto activo",
"dialog.selectFolder": "Seleccionar carpeta",
"dialog.importMedia": "Importar medios",
"dialog.imageFilter": "Imágenes"
}

5
locales/ui/fr.json
View File

@@ -122,5 +122,8 @@
"engine.uploadMissingCredentials": "Identifiants de publication incomplets. Configurez-les dans les paramètres du projet.",
"engine.uploadOffline": "Impossible de publier : le mode avion est actif",
"engine.generateSiteStarted": "Génération du site...",
"engine.generateSiteNoProject": "Aucun projet actif"
"engine.generateSiteNoProject": "Aucun projet actif",
"dialog.selectFolder": "Sélectionner un dossier",
"dialog.importMedia": "Importer des médias",
"dialog.imageFilter": "Images"
}

5
locales/ui/it.json
View File

@@ -122,5 +122,8 @@
"engine.uploadMissingCredentials": "Credenziali di pubblicazione incomplete. Configurale nelle impostazioni del progetto.",
"engine.uploadOffline": "Impossibile caricare: la modalità aereo è attiva",
"engine.generateSiteStarted": "Generazione del sito...",
"engine.generateSiteNoProject": "Nessun progetto attivo"
"engine.generateSiteNoProject": "Nessun progetto attivo",
"dialog.selectFolder": "Seleziona cartella",
"dialog.importMedia": "Importa media",
"dialog.imageFilter": "Immagini"
}