Commit 426cd8cd8b10a8ebc02af363750ce3144677e062 | snowbound

author	clover caruso <git@paperclover.net> 2026-10-01 22:36:38-07:00
committer	clover caruso <git@paperclover.net> 2026-10-01 22:42:02-07:00
log	426cd8cd8b10a8ebc02af363750ce3144677e062
tree	40535f8eaef7864964c35130108ab48e796d5f4b
parent	83112c0bfd59fdfe0b0ea81e1fbc64ea9839a008
signature	Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU

fix: keep sync advice while working offline

Turning Work Offline on during a problem state dropped the advice line,
shifting everything below it. The advice now stays, and the toggle test
covers every state, password-protected and unreadable sections included.

Assisted-by: claude-opus-5.5

1 files changed, 35 insertions(+), 31 deletions(-)

crates
- snowbound
  - src
    sync.rs

crates/snowbound/src/sync.rs+35-31

 @@ -441,28 +441,25 @@ fn build(ui: &mut Ui, facts: &Facts) -> Picked {
     let host = facts.place.first().map_or("the notebook", String::as_str);
     let waiting = changes(sync.queued);
     let conflict;
-    let advice = if facts.offline {
+    // A problem's advice stays while working offline, so turning it on moves nothing.
-        None
+    let advice = match state {
-    } else {
+        SyncState::NotConnected => Some(match sync.queued {
-        match state {
+            0 => format!("Can’t reach {host}. Sync continues when it’s back."),
-            SyncState::NotConnected => Some(match sync.queued {
+            _ => format!("Can’t reach {host}. {waiting} will sync when it’s back."),
-                0 => format!("Can’t reach {host}. Sync continues when it’s back."),
+        }),
-                _ => format!("Can’t reach {host}. {waiting} will sync when it’s back."),
+        SyncState::InUse => {
-            }),
+            Some("Someone else is saving a section. Sync continues when they finish.".into())
-            SyncState::InUse => {
-                Some("Someone else is saving a section. Sync continues when they finish.".into())
-            }
-            SyncState::ReadOnly => Some(format!(
-                "This location is read-only. Your changes stay on {THIS}."
-            )),
-            SyncState::Protected => {
-                Some("Snowbound can’t open password-protected sections yet.".into())
-            }
-            SyncState::Unreadable | SyncState::Failed => {
-                Some("Snowbound keeps trying. Sync Now tries again at once.".into())
-            }
-            _ => None,
         }
+        SyncState::ReadOnly => Some(format!(
+            "This location is read-only. Your changes stay on {THIS}."
+        )),
+        SyncState::Protected => {
+            Some("Snowbound can’t open password-protected sections yet.".into())
+        }
+        SyncState::Unreadable | SyncState::Failed => {
+            Some("Snowbound keeps trying. Sync Now tries again at once.".into())
+        }
+        _ => None,
     };
     if !showing && headline == "Up to date" && !facts.conflicts.is_empty() {
         conflict = match facts.conflicts.as_slice() {
 @@ -1380,6 +1377,18 @@ mod tests {
                     _ => status(true, 0, None),
                 }))
             }),
+            ("protected", || {
+                facts(sections(|index| match index {
+                    1 => status(true, 0, Some((io::ErrorKind::Unsupported, "Protected"))),
+                    _ => status(true, 0, None),
+                }))
+            }),
+            ("unreadable", || {
+                facts(sections(|index| match index {
+                    4 => status(true, 0, Some((io::ErrorKind::InvalidData, "Not a section"))),
+                    _ => status(true, 0, None),
+                }))
+            }),
             ("in-use", || {
                 facts(sections(|index| match index {
                     2 => status(true, 2, Some((io::ErrorKind::ResourceBusy, "In use"))),
 @@ -1433,17 +1442,12 @@ mod tests {
         )))
     }
-    /// Work offline's switch stays put as it turns on and off, and so do the buttons below
+    /// Work offline's switch, and everything below it, stays put as it turns on and off.
-    /// but where a problem's advice, which offline leaves out, goes and comes back.
     #[test]
     fn toggling_offline_moves_nothing() {
         let switch = id().child("status").child("header").child("offline");
         let controls = id().child("controls");
         for (name, made) in states() {
-            let advised = !matches!(
-                overall(&made().sections).state(),
-                SyncState::UpToDate | SyncState::Syncing
-            );
             let mut places = Vec::new();
             for offline in [false, true, false] {
                 let mut ui = ui(Appearance::Light);
 @@ -1452,10 +1456,10 @@ mod tests {
                 settle(&mut ui, &mut now, &facts);
                 places.push((ui.rect(switch).unwrap(), ui.rect(controls).unwrap()));
             }
-            for pair in places.windows(2) {
+            assert!(
-                assert_eq!(pair[0].0, pair[1].0, "{name}");
+                places.windows(2).all(|pair| pair[0] == pair[1]),
-                assert!(advised || pair[0].1 == pair[1].1, "{name}: {places:?}");
+                "{name}: {places:?}"
-            }
+            );
         }
     }