1 files changed, 63 insertions, 21 deletions

diff --git a/rsnix/src/fs.rs b/rsnix/src/fs.rs
index 063560a..b560bfa 100644
--- a/rsnix/src/fs.rs
+++ b/rsnix/src/fs.rs
@@ -183,33 +183,75 @@ pub fn init() -> (usize, usize) {
     );
 
     // Mount every FAT32 volume under /disk/<UID>/ (UID = label-serial).
-    let disks = crate::fat::volume_count();
-    if disks > 0 {
-        let disk_dir = add("disk", Some(root), FileType::Dir, NodeData::Dir(Vec::new()));
-        for vol in 0..disks {
-            let uid = String::from(crate::fat::uid(vol));
-            let root_cl = crate::fat::root_cluster(vol);
-            add(
-                &uid,
-                Some(disk_dir),
-                FileType::Dir,
-                NodeData::Disk(DiskInfo {
-                    vol,
-                    parent: root_cl,
-                    name: String::new(),
-                    is_dir: true,
-                    size: 0,
-                    cluster: root_cl,
-                }),
-            );
-        }
-    }
+    // `rescan_disks()` also keeps this table current after hotplug events.
+    let _ = rescan_disks();
 
     let dirs = nodes().iter().filter(|n| n.kind == FileType::Dir).count();
     let files = nodes().len() - dirs;
     (dirs, files)
 }
 
+/// (Re)sync the /disk mount table with the FAT volumes: create the /disk
+/// dir lazily, ensure a mount node for every mounted volume (refreshing
+/// its backing info), and tombstone nodes whose volume was unmounted.
+/// Returns (added, removed) node ops.
+pub fn rescan_disks() -> (usize, usize) {
+    let mut added = 0usize;
+    let mut removed = 0usize;
+    let disk_dir = match lookup(0, "disk") {
+        Some(h) => h,
+        None => add("disk", Some(0), FileType::Dir, NodeData::Dir(Vec::new())),
+    };
+    for vol in 0..crate::fat::volume_count() {
+        if !crate::fat::is_mounted(vol) {
+            continue;
+        }
+        let uid = String::from(crate::fat::uid(vol));
+        let root_cl = crate::fat::root_cluster(vol);
+        match lookup(disk_dir, &uid) {
+            Some(h) => {
+                // Refresh the backing info in case the volume's slot moved.
+                if let NodeData::Disk(i) = &mut nodes()[h].data {
+                    i.vol = vol;
+                    i.parent = root_cl;
+                    i.cluster = root_cl;
+                }
+                nodes()[h].removed = false;
+            }
+            None => {
+                add(
+                    &uid,
+                    Some(disk_dir),
+                    FileType::Dir,
+                    NodeData::Disk(DiskInfo {
+                        vol,
+                        parent: root_cl,
+                        name: String::new(),
+                        is_dir: true,
+                        size: 0,
+                        cluster: root_cl,
+                    }),
+                );
+                added += 1;
+            }
+        }
+    }
+    if let NodeData::Dir(v) = &nodes()[disk_dir].data {
+        for &c in v.clone().iter() {
+            if nodes()[c].removed {
+                continue;
+            }
+            if let NodeData::Disk(i) = &nodes()[c].data
+                && !crate::fat::is_mounted(i.vol)
+            {
+                nodes()[c].removed = true;
+                removed += 1;
+            }
+        }
+    }
+    (added, removed)
+}
+
 fn lookup(dir: usize, name: &str) -> Option<usize> {
     let children = match &nodes()[dir].data {
         NodeData::Dir(v) => v.clone(),