Skip to content

A treemap for finding and removing what fills your disk, for Omarchy. Rust + GPUI.

Rust

Merge PR #36: deduplicate repeated filesystem views

Tobi Lutkef3f37c27c4d1
diff --cc crates/disktree-core/src/scan.rs
index 2dcda50,fbf767c..df59be9
--- a/crates/disktree-core/src/scan.rs
+++ b/crates/disktree-core/src/scan.rs
@@@ -750,9 -682,9 +750,10 @@@ fn scan_blocking(root: &Path, context:
format!("{} is not a directory", root.display()),
));
}
- let resolved = root.canonicalize().ok();
- let canonical = root.canonicalize().unwrap_or_else(|_| root.to_path_buf());
- let mut never = crate::space::never_scanned(root, &canonical);
- never.extend(crate::space::repeated_mounts_for(root, &canonical));
++let resolved = root.canonicalize().ok();
+ let canonical = resolved.as_deref().unwrap_or(root);
- let never = crate::space::never_scanned(root, canonical);
++ let mut never = space::never_scanned(root, canonical);
++ never.extend(space::repeated_mounts_for(root, canonical));
let _ = context.never_scanned.set(never.into_iter().collect());
if context.options.one_filesystem {
*lock(&context.root_device) = Some(device_of(&root_meta));
diff --cc crates/disktree-core/src/space.rs
index 7fab726,8934885..3040721
--- a/crates/disktree-core/src/space.rs
+++ b/crates/disktree-core/src/space.rs
@@@ -511,31 -476,81 +641,106 @@@ tmpfs /tmp tmpfs rw 0
portal /run/user/1000/doc fuse.portal rw 0 0
";
+ const MOUNTINFO: &str = "\
+ 22 1 0:21 /@ / rw,relatime - btrfs /dev/mapper/root rw,subvol=/@
+ 23 22 0:21 /@home /home rw,relatime - btrfs /dev/mapper/root rw,subvol=/@home
+ 24 22 0:21 /@log /var/log rw,relatime - btrfs /dev/mapper/root rw,subvol=/@log
+ 25 22 0:21 /@snapshots /.snapshots rw - btrfs /dev/mapper/root rw
+ 26 22 0:30 / /data rw,relatime shared:5 - btrfs /dev/mapper/data rw
+ 27 22 0:30 / /mnt/data rw,relatime shared:5 - btrfs /dev/mapper/data rw
+ 28 22 0:31 / /tmp rw - tmpfs tmpfs rw
+ 29 22 259:3 / /boot rw - vfat /dev/nvme0n1p1 rw
+ ";
+
+ fn repeated(table: &str, root: &str) -> Vec<PathBuf> {
+ let mut paths =
+ repeated_mounts(&parse_mountinfo(table), Path::new(root));
+ paths.sort();
+ paths
+ }
+
+ #[test]
+ fn subvolumes_are_not_repeats_but_a_second_mount_of_a_disk_is() {
+ assert_eq!(repeated(MOUNTINFO, "/"), [PathBuf::from("/mnt/data")]);
+ assert!(repeated(MOUNTINFO, "/home/tobi").is_empty());
+ assert!(repeated(MOUNTINFO, "/data").is_empty());
+ assert!(
+ repeated(MOUNTINFO, "/mnt/data").is_empty(),
+ "the view that was asked for is scanned"
+ );
+ }
+
+ #[test]
+ fn a_bind_mount_inside_the_scan_is_left_out() {
+ let table = format!(
+ "{MOUNTINFO}30 23 0:21 /@home/tobi/src /srv/src rw - btrfs /dev/mapper/root rw\n"
+ );
+ assert_eq!(
+ repeated(&table, "/"),
+ [PathBuf::from("/mnt/data"), PathBuf::from("/srv/src")]
+ );
+ // From home, the original is outside the scan: nothing repeats.
+ assert!(repeated(&table, "/home/tobi").is_empty());
+ assert!(repeated(&table, "/srv").is_empty());
+ }
+
+ #[test]
+ fn the_top_of_a_btrfs_disk_beside_its_subvolumes_is_counted_once() {
+ let table = format!(
+ "{MOUNTINFO}31 22 0:21 / /mnt/top rw - btrfs /dev/mapper/root rw\n"
+ );
+ // The root cannot be left out, so its copy under /mnt/top is; the
+ // other subvolumes are seen under /mnt/top instead of twice.
+ assert_eq!(
+ repeated(&table, "/"),
+ [
+ PathBuf::from("/.snapshots"),
+ PathBuf::from("/home"),
+ PathBuf::from("/mnt/data"),
+ PathBuf::from("/mnt/top/@"),
+ PathBuf::from("/var/log"),
+ ]
+ );
+ }
+
+ #[test]
+ fn mountinfo_escapes_are_decoded_once() {
+ let mounts = parse_mountinfo(
+ "not a mount line\n\
+ 40 22 8:1 /a\\040b /media/My\\040Disk\\134040 rw - ext4 /dev/sda1 rw\n",
+ );
+ assert_eq!(mounts.len(), 1);
+ assert_eq!(mounts[0].fs_root, Path::new("/a b"));
+ assert_eq!(mounts[0].point, Path::new("/media/My Disk\\040"));
+ assert_eq!(mounts[0].source, "/dev/sda1");
+ assert_eq!(mounts[0].fstype, "ext4");
+ }
+
+ #[test]
+ fn volumes_with_least_space_come_first_and_unknowns_last() {
+ let volume = |name: &str, available: Option<u64>| Volume {
+ point: PathBuf::from(name),
+ device: None,
+ space: available.map(|available| SpaceInfo {
+ total: 100,
+ free: available,
+ available,
+ }),
+ };
+ let mut volumes = vec![
+ volume("unknown", None),
+ volume("roomy", Some(90)),
+ volume("full", Some(0)),
+ volume("nearly-full", Some(5)),
+ ];
+ sort_by_free_space(&mut volumes);
+ let names: Vec<_> = volumes.iter().map(|v| v.point.clone()).collect();
+ assert_eq!(
+ names,
+ ["full", "nearly-full", "roomy", "unknown"].map(PathBuf::from)
+ );
+ }
+
#[test]
fn a_volume_includes_its_subvolumes_and_nothing_else() {
let mounts = parse_mounts(OMARCHY);