feat: use better disk names

FyraLabs · Jul 6, 2024 · 1857f59 · 1857f59
1 parent 83c826b
commit 1857f59
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,7 @@ gnome-desktop = "0.4.2"
 chrono-tz = "0.9.0"
 paste = "1.0.15"
 tempfile = "3.10.1"
-lsblk = "0.2.4"
+lsblk = "0.3.0"
 # serde_ini = "0.2.0"
 # serde-enum-str = "0.4.0"
 const_format = "0.2.32"

diff --git a/src/disks.rs b/src/disks.rs
@@ -29,13 +29,19 @@ pub fn detect_os() -> Vec<DiskInit> {
         .into_iter()
         .filter(lsblk::BlockDevice::is_disk)
         .map(|disk| {
+            let model = disk
+                .sysfs()
+                .and_then(|p| std::fs::read_to_string(p.join("device").join("model")));
             let ret = DiskInit {
                 disk_name: format!(
                     "{} ({})",
-                    disk.label
-                        .as_deref()
+                    model
+                        .as_ref()
+                        .map(|s| s.trim())
+                        .ok()
+                        .or(disk.label.as_deref())
                         .or(disk.id.as_deref())
-                        .map_or("".into(), |s| format!("{s} ")),
+                        .map_or("".into(), |s| s),
                     disk.name,
                 )
                 .trim()