Commit e7e347121c236326f4a147b72e90b321d81adebc | snowbound

author	clover caruso <git@paperclover.net> 2026-10-10 19:51:11-07:00
committer	clover caruso <git@paperclover.net> 2026-10-10 22:56:05-07:00
log	e7e347121c236326f4a147b72e90b321d81adebc
tree	971ad78d9718d6b83c7b41c9b97652f53c5073c4
parent	9c8254dbc5a7af05da2ef7a0b1835916f3c697ba
signature	Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU (~clover)

fix(desktop): retain navigation after delayed notebook rename

Deliver the renamed catalog and location migration regardless of navigation.
Restore the captured section only while the loading generation and shown
notebook lineage still match, and clear only the matching pending folder
rename pair.

Fixes #109
Assisted-by: gpt-6.1-sol

1 files changed, 15 insertions(+), 3 deletions(-)

crates
- snowbound
  - src
    manage.rs

crates/snowbound/src/manage.rs+15-3

 @@ -736,7 +736,7 @@ impl State {
             self.title();
         }
         self.folder_rename = Some((library.location.clone(), to.clone()));
-        let (cache, proxy) = (self.cache.clone(), self.proxy.clone());
+        let (cache, proxy, requested) = (self.cache.clone(), self.proxy.clone(), self.loading);
         crate::spawn_async(move || async move {
             let structure = Arc::clone(&library.structure);
             let _structure = structure.lock().await;
 @@ -773,7 +773,20 @@ impl State {
             }
             let reopened = Arc::new(reopened);
             let _ = proxy.send_event(crate::UserEvent::Then(Box::new(move |state| {
-                state.renamed_notebook(&library, reopened, showing.then_some(shown));
+                if state
+                    .folder_rename
+                    .as_ref()
+                    .is_some_and(|(from, target)| from == &library.location && target == &to)
+                {
+                    state.folder_rename = None;
+                }
+                let restore = showing
+                    && requested == state.loading
+                    && state.notebook().is_some_and(|current| {
+                        current.location == library.location
+                            && Arc::ptr_eq(&current.structure, &library.structure)
+                    });
+                state.renamed_notebook(&library, reopened, restore.then_some(shown));
                 if let Some(problem) = problem {
                     platform::alert("Couldn't rename the folder", &problem);
                 }
 @@ -791,7 +804,6 @@ impl State {
         reopened: Arc<Library>,
         shown: Option<Option<String>>,
     ) {
-        self.folder_rename = None;
         let (from, to) = (old.location.clone(), reopened.location.clone());
         match (self.notebooks.iter_mut()).find(|open| Arc::ptr_eq(open, old)) {
             Some(open) => *open = Arc::clone(&reopened),