authorclover caruso <git@paperclover.net> 2026-10-10 21:29:14-07:00
committerclover caruso <git@paperclover.net> 2026-10-10 22:56:06-07:00
logb28c7cbe0b6bd7420e717e2005265ecbea3a37de
tree322d97775b50afaf2dd6283bac6019c71b0659bf
parent1cec85d1bb8078889dab2f72485b2407ee2d2de3
signature Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU (~clover)

fix: deliver the refreshed recycle-bin catalog to the open notebook

Keep the completed recycle/unrecycle Notebook in Site.library and reconcile its catalog independently of page loading. Delivery follows the current section in the original open notebook lineage, leaving newer navigation and closed/reopened notebooks alone. Acquire structural ownership before retaining the replica, and enqueue catalog completion before releasing it, to avoid folder-rename lock inversion and older catalog delivery after a newer structure mutation. Extend the existing delete/Undo/Redo regression to check refreshed bin tabs without a watcher and unchanged replica ownership. Fixes #119 Assisted-by: gpt-6.1-sol

1 files changed, 77 insertions(+), 16 deletions(-)

crates/snowbound/src/undo.rs+77-16
......@@ -411,7 +411,7 @@ impl Site {
411411 /// Does `change` to the section's pages, `shown` the page open; `None` where what it
412412 /// changes is gone or holds what it did not make, which it leaves alone.
413413 async fn change(
414 &self,
414 &mut self,
415415 change: Change,
416416 shown: ExGuid,
417417 ) -> Result<Option<Applied>, Box<dyn Error>> {
......@@ -454,10 +454,9 @@ impl Site {
454454 let (show, added) = self.after(&listed, &pages, show, &mut ops);
455455 if !created && binned {
456456 let pages: Vec<Page> = kept.iter().map(|kept| kept.page.clone()).collect();
457 self.library
458 .reopen()?
459 .recycle_pages_async(&pages, &self.author)
460 .await?;
457 let mut notebook = self.library.reopen()?;
458 notebook.recycle_pages_async(&pages, &self.author).await?;
459 self.library = Arc::new(self.library.with(notebook));
461460 self.replica.written_async().await?;
462461 }
463462 self.apply(ops).await?;
......@@ -508,10 +507,9 @@ impl Site {
508507 if !created && binned {
509508 let identities: Vec<[u8; 16]> =
510509 back.iter().filter_map(|kept| kept.page.identity).collect();
511 self.library
512 .reopen()?
513 .unrecycle_pages_async(&identities)
514 .await?;
510 let mut notebook = self.library.reopen()?;
511 notebook.unrecycle_pages_async(&identities).await?;
512 self.library = Arc::new(self.library.with(notebook));
515513 }
516514 Applied {
517515 undo: Change::Delete {
......@@ -1062,13 +1060,29 @@ impl State {
10621060 };
10631061 self.persist()?;
10641062 let session = self.session.as_ref().ok_or("No section is open")?;
1065 let site = Site {
1063 let changing = if matches!(
1064 &change,
1065 Change::Delete { created: false, .. } | Change::Restore { created: false, .. }
1066 ) && matches!(session.library.notebook, Ok(Some(_)))
1067 {
1068 Some(
1069 session
1070 .library
1071 .structure
1072 .try_lock_arc()
1073 .ok_or_else(|| std::io::Error::from(std::io::ErrorKind::WouldBlock))?,
1074 )
1075 } else {
1076 None
1077 };
1078 let mut site = Site {
10661079 replica: Arc::clone(session.section.replica()),
10671080 library: Arc::clone(&session.library),
10681081 author: self.author.clone(),
10691082 fresh: self.dated_page(None, "")?,
10701083 };
10711084 let shown = session.space;
1085 let original = Arc::clone(&site.library);
10721086 let proxy = self.proxy.clone();
10731087 self.undo.busy += 1;
10741088 self.switching = Some((None, web_time::Instant::now()));
......@@ -1080,8 +1094,34 @@ impl State {
10801094 };
10811095 let failed = applied.as_ref().err().map(ToString::to_string);
10821096 let (stale, applied) = (failed.is_none(), applied.ok().flatten());
1097 let library = Arc::clone(&site.library);
10831098 let _ = proxy.send_event(UserEvent::Then(Box::new(move |state: &mut State| {
10841099 state.undo.busy -= 1;
1100 let lineage = |listed: &Library| {
1101 listed.location == original.location
1102 && Arc::ptr_eq(&listed.structure, &original.structure)
1103 };
1104 if !Arc::ptr_eq(&original, &library)
1105 && state.notebooks.iter().any(|listed| lineage(listed))
1106 {
1107 let path = state
1108 .session
1109 .as_ref()
1110 .filter(|session| lineage(&session.library))
1111 .map(|session| session.tabs[session.tab].path.clone());
1112 if let Some(path) = path {
1113 state.adopt(Arc::clone(&library), Some(&path))?;
1114 } else {
1115 state.list(&library);
1116 if state
1117 .sectionless
1118 .as_ref()
1119 .is_some_and(|listed| lineage(listed))
1120 {
1121 state.sectionless = Some(library);
1122 }
1123 }
1124 }
10851125 let Some(applied) = applied else {
10861126 // What it would change is gone: Undo goes on to the step before.
10871127 return match taken {
......@@ -1102,6 +1142,7 @@ impl State {
11021142 state.edited(Vec::new());
11031143 Ok(())
11041144 })));
1145 drop(changing);
11051146 if let Some(failed) = failed {
11061147 return Err(failed.into());
11071148 }
......@@ -1426,21 +1467,41 @@ mod tests {
14261467 fn deleted_pages_come_back_where_they_were_and_leave_the_bin() {
14271468 let fixture = Fixture::new("delete", &["First", "Second", "Third"]);
14281469 let second = fixture.space("Second");
1429 let deleted = fixture
1430 .change(Change::Delete {
1470 let mut site = fixture.site();
1471 assert!(site.library.tabs(crate::recycle::BIN).is_empty());
1472 let deleted = pollster::block_on(site.change(
1473 Change::Delete {
14311474 pages: vec![second],
14321475 show: None,
14331476 created: false,
1434 })
1435 .unwrap();
1477 },
1478 fixture.space("First"),
1479 ))
1480 .unwrap()
1481 .unwrap();
1482 assert!(!site.library.tabs(crate::recycle::BIN).is_empty());
1483 assert!(!Arc::ptr_eq(&site.library, &fixture.library));
1484 assert!(Arc::ptr_eq(
1485 &site.library.structure,
1486 &fixture.library.structure
1487 ));
1488 assert!(Arc::ptr_eq(&site.replica, fixture.section().replica()));
1489 assert!(fixture.library.tabs(crate::recycle::BIN).is_empty());
1490 let deleted_library = Arc::clone(&site.library);
14361491 assert_eq!(fixture.titles(), titled(&["First", "Third"]));
14371492 assert_eq!(deleted.show, fixture.space("Third"));
14381493 assert_eq!(fixture.binned(), ["Second"]);
1439 let restored = fixture.change(deleted.undo).unwrap();
1494 let restored = pollster::block_on(site.change(deleted.undo, deleted.show))
1495 .unwrap()
1496 .unwrap();
1497 assert!(!Arc::ptr_eq(&site.library, &deleted_library));
1498 assert!(!site.library.tabs(crate::recycle::BIN).is_empty());
14401499 assert_eq!(fixture.titles(), titled(&["First", "Second", "Third"]));
14411500 assert_eq!(restored.show, fixture.space("Second"));
14421501 assert!(fixture.binned().is_empty());
1443 let again = fixture.change(restored.undo).unwrap();
1502 let again = pollster::block_on(site.change(restored.undo, restored.show))
1503 .unwrap()
1504 .unwrap();
14441505 assert_eq!(fixture.titles(), titled(&["First", "Third"]));
14451506 assert_eq!(fixture.binned(), ["Second"]);
14461507