Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make disks show info about unmounted disks as well, first effort #1446

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make disks show info about unmounted disks as well, first effort #1446

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16ffd96
Make disks show info about unmounted disks as well, first effort
CongLuanTran Dec 30, 2024
bf44c76
fix formats
CongLuanTran Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions src/unix/linux/disk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,12 @@ fn get_all_list(container: &mut Vec<Disk>, content: &str, refresh_kind: DiskRefr

let procfs_disk_stats = disk_stats(&refresh_kind);

// The list of unmounted disks, initially it include all disks
let mut unmounted = procfs_disk_stats
.keys()
.map(|disk| "/dev/".to_owned() + disk)
.collect::<Vec<String>>();

for (fs_spec, fs_file, fs_vfstype) in content
.lines()
.map(|line| {
Expand Down Expand Up @@ -423,7 +429,39 @@ fn get_all_list(container: &mut Vec<Disk>, content: &str, refresh_kind: DiskRefr
&procfs_disk_stats,
refresh_kind,
));

// If the disk is mounted, remove it from the list
unmounted.retain(|disk| disk != fs_spec);
}

// Process the unmounted disks
for disk in unmounted {
// The mount point should be left empty unless it is ZRAM
let mount_point = match disk.contains("zram") {
true => "[SWAP]",
_ => "",
};
let mount_point = Path::new(mount_point);

// File system is Unknown or swap
// TODO: Find a way to figure out the file system (like lsblk)
let file_system = match disk.contains("zram") {
true => "swap",
_ => "Unknown",
};

container.push(new_disk(
disk.as_ref(),
mount_point,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this new feature, I think mount_point should become an enum looking like this:

enum MountPoint {
    Path(Path)
    Swap,
    Unmounted,
}

file_system.as_ref(),
&removable_entries,
&procfs_disk_stats,
refresh_kind,
));
}

// Sort the container to make the output looks better
container.sort_by(|a, b| a.name().cmp(b.name()));
}

/// Disk IO stat information from `/proc/diskstats` file.
Expand Down
Loading