From b68c94eb1755ab47f0bfae94f8f36a3fabdc0214 Mon Sep 17 00:00:00 2001 From: AlienTech Software Date: Tue, 17 Nov 2026 14:57:11 -0800 Subject: [PATCH 1/3] feat(options): move the notebooks folder now; reset follows the build Changing the folder moves the window to it at once and remembers it. Use the default folder goes back to the folder this build starts with: the development folder in a debug build, and Documents\NoteCraft in production. The development folder is read only in a debug build. Also restores the doc comment above set_ui_scale. Co-Authored-By: Claude Haiku 5.5 --- apps/notecraft/src/main.rs | 3 ++- crates/engine/src/session.rs | 24 +++++++++++++++++++++ crates/store/src/settings.rs | 12 +++++++++++ crates/ui-egui/src/app.rs | 41 +++++++++++++++++++++--------------- i18n/ar-XB.tsv | 3 ++- i18n/en-XA.tsv | 3 ++- i18n/en.tsv | 3 ++- 7 files changed, 68 insertions(+), 21 deletions(-) diff --git a/apps/notecraft/src/main.rs b/apps/notecraft/src/main.rs index 3ad4fb9..32a0783 100644 --- a/apps/notecraft/src/main.rs +++ b/apps/notecraft/src/main.rs @@ -56,8 +56,9 @@ impl eframe::App for Shell { fn notebooks_dir(args: &[String]) -> PathBuf { let configured = notecraft_store::settings::configured_notebooks_dir(&Settings::default_location()); + // The development folder counts only in a debug build; a production install never reads it. let local = PathBuf::from("my-notebooks"); - let local = local.is_dir().then_some(local); + let local = (cfg!(debug_assertions) && local.is_dir()).then_some(local); notebooks_dir_from(args, configured, local, notecraft_store::settings::default_notebooks_dir()) } diff --git a/crates/engine/src/session.rs b/crates/engine/src/session.rs index e1d9f52..67b8fb1 100644 --- a/crates/engine/src/session.rs +++ b/crates/engine/src/session.rs @@ -48,6 +48,15 @@ impl Session { &self.root } + /// Moves the session to another notebooks folder and lists the notebooks in it. The folder + /// is created when it does not exist yet, as at start. + pub fn set_root(&mut self, root: &Path) -> Result<(), EngineError> { + std::fs::create_dir_all(root).map_err(|e| StoreError::io("create", root, e))?; + self.root = std::fs::canonicalize(root).map_err(|e| StoreError::io("open", root, e))?; + self.refresh(); + Ok(()) + } + pub fn reviewed_export(&self) -> Option<¬ecraft_store::export::Prepared> { self.export.as_ref() } @@ -208,6 +217,21 @@ fn first_page(n: &Node) -> Option { mod tests { use super::*; + #[test] + fn changing_the_root_shows_the_notebooks_in_the_new_folder() { + let t = notecraft_store::testing::TempDir::new("session-set-root"); + let settings = notecraft_store::Settings::at(t.path().join("settings.toml")); + let first = t.path().join("first"); + let second = t.path().join("second"); + notecraft_store::ops::create_notebook(&second, "Work", None, &settings).expect("second notebook"); + let mut session = Session::new(&first, settings).expect("session"); + + session.set_root(&second).expect("change the root"); + + assert_eq!(session.root(), std::fs::canonicalize(&second).expect("canonical").as_path()); + assert!(session.tree().iter().any(|n| n.path.ends_with("work")), "the new folder's notebooks are listed"); + } + #[test] fn a_panic_becomes_an_error() { let r: Result<(), EngineError> = guarded(|| panic!("boom")); diff --git a/crates/store/src/settings.rs b/crates/store/src/settings.rs index f5bd2fa..eb4c013 100644 --- a/crates/store/src/settings.rs +++ b/crates/store/src/settings.rs @@ -38,6 +38,12 @@ pub fn default_notebooks_dir() -> PathBuf { default_notebooks_dir_for_home(home) } +/// The notebooks folder this build starts with: the development folder in a debug build, and the +/// per-user folder in a production build. "Use the default folder" goes back to this. +pub fn build_default_notebooks_dir() -> PathBuf { + if cfg!(debug_assertions) { PathBuf::from("my-notebooks") } else { default_notebooks_dir() } +} + /// The per-user notebook folder, kept separate so every platform can test the same contract. pub fn default_notebooks_dir_for_home(home: impl AsRef) -> PathBuf { home.as_ref().join("Documents").join("NoteCraft") @@ -191,6 +197,12 @@ mod tests { assert_eq!(configured_notebooks_dir(&s), Some(PathBuf::from("Notes/Research"))); } + #[test] + fn a_debug_build_defaults_to_the_development_folder() { + let expected = if cfg!(debug_assertions) { PathBuf::from("my-notebooks") } else { default_notebooks_dir() }; + assert_eq!(build_default_notebooks_dir(), expected); + } + #[test] fn a_cleared_notebooks_root_means_the_default_folder() { let t = TempDir::new("settings-notebook-root-cleared"); diff --git a/crates/ui-egui/src/app.rs b/crates/ui-egui/src/app.rs index 7c0da0f..86a1bdd 100644 --- a/crates/ui-egui/src/app.rs +++ b/crates/ui-egui/src/app.rs @@ -1555,8 +1555,6 @@ impl NoteCraftApp { self.ui_scale } - /// Draws the whole window larger or smaller, for a screen where the system's own scale - /// leaves the ribbon and the menus too small to read, and remembers the choice. /// Saves the notebooks folder NoteCraft uses from the next start. `None` goes back to the /// default folder. The current session keeps its folder until then. pub fn save_notebooks_root(&mut self, folder: Option<&std::path::Path>) -> Result<(), String> { @@ -1571,16 +1569,29 @@ impl NoteCraftApp { self.apply_notebooks_root_choice(Some(&picked)); } + /// Moves NoteCraft to the chosen notebooks folder now, or to the default folder for this build + /// when `folder` is None, and remembers the choice for the next start. fn apply_notebooks_root_choice(&mut self, folder: Option<&std::path::Path>) { - match self.save_notebooks_root(folder) { - Ok(()) => self.say(crate::tl_id!("ui.notebooks_folder_next_start")), - Err(error) => { - let message = crate::i18n::format_message_id("ui.could_not_save_the_notebooks_folder_error", &[("error", &error)]); - self.complain(&message); - } + let target = folder.map_or_else(notecraft_store::settings::build_default_notebooks_dir, std::path::Path::to_path_buf); + if let Err(error) = self.save_notebooks_root(folder) { + let message = crate::i18n::format_message_id("ui.could_not_save_the_notebooks_folder_error", &[("error", &error)]); + self.complain(&message); + return; + } + if let Err(error) = self.session.set_root(&target) { + let error = error.to_string(); + let message = crate::i18n::format_message_id("ui.could_not_open_the_notebooks_folder_error", &[("error", &error)]); + self.complain(&message); + return; } + self.editor = None; + self.pad = None; + let shown = target.display().to_string(); + self.say(crate::i18n::format_message_id("ui.notebooks_folder_changed", &[("folder", &shown)])); } + /// Draws the whole window larger or smaller, for a screen where the system's own scale + /// leaves the ribbon and the menus too small to read, and remembers the choice. pub fn set_ui_scale(&mut self, percent: u16) { if let Err(error) = self.session.settings.set(UI_SCALE_KEY, &percent.to_string()) { let error = error.to_string(); @@ -11264,22 +11275,18 @@ mod alert_tests { } #[test] - fn choosing_a_notebooks_folder_saves_it_for_the_next_start() { + fn choosing_a_notebooks_folder_moves_to_it_now() { let t = notecraft_store::testing::TempDir::new("notebooks-folder-choice"); let settings = notecraft_store::Settings::at(t.path().join("settings.toml")); settings.set("privacy_welcome_seen", "true").expect("settings"); let session = Session::new(&t.path().join("notebooks"), settings.clone()).expect("session"); let mut app = NoteCraftApp::new(session); + let chosen = t.path().join("chosen"); - app.save_notebooks_root(Some(std::path::Path::new("Notes/Research"))).expect("save the folder"); - assert_eq!( - notecraft_store::settings::configured_notebooks_dir(&settings), - Some(std::path::PathBuf::from("Notes/Research")), - "the chosen folder is used at the next start" - ); + app.apply_notebooks_root_choice(Some(&chosen)); - app.save_notebooks_root(None).expect("use the default folder"); - assert_eq!(notecraft_store::settings::configured_notebooks_dir(&settings), None, "the default folder is used again"); + assert_eq!(app.session().root(), std::fs::canonicalize(&chosen).expect("canonical").as_path(), "the window moves to the chosen folder"); + assert_eq!(settings.get("last_notebooks_root"), Some(chosen.to_string_lossy().into_owned()), "the choice is remembered"); } #[test] diff --git a/i18n/ar-XB.tsv b/i18n/ar-XB.tsv index 74f813b..6eb33aa 100644 --- a/i18n/ar-XB.tsv +++ b/i18n/ar-XB.tsv @@ -1188,6 +1188,7 @@ @id ui.change_notebooks_folder [[RLI]]$$$Change notebooks folder...@@@[[PDI]] @id ui.use_the_default_notebooks_folder [[RLI]]$$$Use the default folder@@@[[PDI]] @id ui.choose_the_notebooks_folder [[RLI]]$$$Choose the notebooks folder@@@[[PDI]] -@id ui.notebooks_folder_next_start [[RLI]]$$$The notebooks folder changes the next time NoteCraft starts.@@@[[PDI]] @id ui.could_not_save_the_notebooks_folder_error [[RLI]]$$$Could not save the notebooks folder: {error}@@@[[PDI]] @id ui.notebooks_folder_current [[RLI]]$$$NoteCraft keeps new notebooks in {folder}.@@@[[PDI]] +@id ui.notebooks_folder_changed [[RLI]]$$$The notebooks folder is now {folder}.@@@[[PDI]] +@id ui.could_not_open_the_notebooks_folder_error [[RLI]]$$$Could not open the notebooks folder: {error}@@@[[PDI]] diff --git a/i18n/en-XA.tsv b/i18n/en-XA.tsv index c01bfc2..2e84a6e 100644 --- a/i18n/en-XA.tsv +++ b/i18n/en-XA.tsv @@ -1188,6 +1188,7 @@ @id ui.change_notebooks_folder $$$Change notebooks folder...@@@ @id ui.use_the_default_notebooks_folder $$$Use the default folder@@@ @id ui.choose_the_notebooks_folder $$$Choose the notebooks folder@@@ -@id ui.notebooks_folder_next_start $$$The notebooks folder changes the next time NoteCraft starts.@@@ @id ui.could_not_save_the_notebooks_folder_error $$$Could not save the notebooks folder: {error}@@@ @id ui.notebooks_folder_current $$$NoteCraft keeps new notebooks in {folder}.@@@ +@id ui.notebooks_folder_changed $$$The notebooks folder is now {folder}.@@@ +@id ui.could_not_open_the_notebooks_folder_error $$$Could not open the notebooks folder: {error}@@@ diff --git a/i18n/en.tsv b/i18n/en.tsv index c72df48..1f2e921 100644 --- a/i18n/en.tsv +++ b/i18n/en.tsv @@ -1188,6 +1188,7 @@ @id ui.change_notebooks_folder Change notebooks folder... @id ui.use_the_default_notebooks_folder Use the default folder @id ui.choose_the_notebooks_folder Choose the notebooks folder -@id ui.notebooks_folder_next_start The notebooks folder changes the next time NoteCraft starts. @id ui.could_not_save_the_notebooks_folder_error Could not save the notebooks folder: {error} @id ui.notebooks_folder_current NoteCraft keeps new notebooks in {folder}. +@id ui.notebooks_folder_changed The notebooks folder is now {folder}. +@id ui.could_not_open_the_notebooks_folder_error Could not open the notebooks folder: {error} From a91aea1a8da489ad0d70d24db57148cd85059203 Mon Sep 17 00:00:00 2001 From: AlienTech Software Date: Tue, 17 Nov 2026 15:04:26 -0800 Subject: [PATCH 2/3] fix(options): the folder chooser opens in the current notebooks folder The dialog now starts in the notebooks folder NoteCraft uses now, instead of Documents. Co-Authored-By: Claude Haiku 5.5 --- crates/ui-egui/src/app.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/crates/ui-egui/src/app.rs b/crates/ui-egui/src/app.rs index 86a1bdd..86fbd80 100644 --- a/crates/ui-egui/src/app.rs +++ b/crates/ui-egui/src/app.rs @@ -1563,7 +1563,8 @@ impl NoteCraftApp { } fn choose_default_notebooks_folder(&mut self) { - let Some(picked) = pick_notebooks_folder() else { + // The dialog opens where the notebooks are now, not in Documents. + let Some(picked) = pick_notebooks_folder(&self.session.root().to_path_buf()) else { return; }; self.apply_notebooks_root_choice(Some(&picked)); @@ -11059,12 +11060,12 @@ fn drawing_help_page(notebooks: &[PathBuf], language: &str) -> Option { /// The notebooks folder chooser. The web build has no native folder dialog, so it chooses nothing. #[cfg(not(target_arch = "wasm32"))] -fn pick_notebooks_folder() -> Option { - rfd::FileDialog::new().set_title(crate::tl_id!("ui.choose_the_notebooks_folder")).pick_folder() +fn pick_notebooks_folder(start: &std::path::Path) -> Option { + rfd::FileDialog::new().set_title(crate::tl_id!("ui.choose_the_notebooks_folder")).set_directory(start).pick_folder() } #[cfg(target_arch = "wasm32")] -fn pick_notebooks_folder() -> Option { +fn pick_notebooks_folder(_start: &std::path::Path) -> Option { None } From 9ded3e461dc19f358da429e2df7042eaf811b598 Mon Sep 17 00:00:00 2001 From: AlienTech Software Date: Tue, 17 Nov 2026 15:06:59 -0800 Subject: [PATCH 3/3] test(options): regression tests for the notebooks folder The window lists the notebooks in a newly chosen folder at once, and a debug build never resets to the production folder. Also fixes a clippy warning in the folder chooser. Co-Authored-By: Claude Haiku 5.5 --- crates/store/src/settings.rs | 7 +++++++ crates/ui-egui/src/app.rs | 20 +++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/crates/store/src/settings.rs b/crates/store/src/settings.rs index eb4c013..a490322 100644 --- a/crates/store/src/settings.rs +++ b/crates/store/src/settings.rs @@ -203,6 +203,13 @@ mod tests { assert_eq!(build_default_notebooks_dir(), expected); } + #[test] + fn a_debug_build_never_resets_to_the_production_folder() { + if cfg!(debug_assertions) { + assert_ne!(build_default_notebooks_dir(), default_notebooks_dir(), "a dev build resets to my-notebooks, not Documents"); + } + } + #[test] fn a_cleared_notebooks_root_means_the_default_folder() { let t = TempDir::new("settings-notebook-root-cleared"); diff --git a/crates/ui-egui/src/app.rs b/crates/ui-egui/src/app.rs index 86fbd80..2a428fb 100644 --- a/crates/ui-egui/src/app.rs +++ b/crates/ui-egui/src/app.rs @@ -1564,7 +1564,7 @@ impl NoteCraftApp { fn choose_default_notebooks_folder(&mut self) { // The dialog opens where the notebooks are now, not in Documents. - let Some(picked) = pick_notebooks_folder(&self.session.root().to_path_buf()) else { + let Some(picked) = pick_notebooks_folder(self.session.root()) else { return; }; self.apply_notebooks_root_choice(Some(&picked)); @@ -11290,6 +11290,24 @@ mod alert_tests { assert_eq!(settings.get("last_notebooks_root"), Some(chosen.to_string_lossy().into_owned()), "the choice is remembered"); } + #[test] + fn after_a_change_the_window_lists_the_notebooks_in_the_new_folder() { + let t = notecraft_store::testing::TempDir::new("notebooks-folder-list"); + let settings = notecraft_store::Settings::at(t.path().join("settings.toml")); + settings.set("privacy_welcome_seen", "true").expect("settings"); + let session = Session::new(&t.path().join("notebooks"), settings.clone()).expect("session"); + let mut app = NoteCraftApp::new(session); + let chosen = t.path().join("chosen"); + notecraft_store::ops::create_notebook(&chosen, "Research", None, &settings).expect("a notebook in the chosen folder"); + + app.apply_notebooks_root_choice(Some(&chosen)); + + assert!( + app.session().tree().iter().any(|n| n.path.ends_with("research")), + "the notebook in the chosen folder is listed at once, not after a restart" + ); + } + #[test] fn the_wizard_opens_once_after_install_and_not_for_later_versions() { let t = notecraft_store::testing::TempDir::new("welcome-wizard-once");