Improve NVMe serial parsing and restructure MergerFS display

- Fix NVMe serial number parsing to handle whitespace variations
- Move mount point to MergerFS header, remove drive count
- Restructure data drives to same level as parity with Data_1, Data_2 labels
- Remove "Total:" label from pool usage line
- Update parity to use closing tree symbol as last item

Cargo.lock

@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "cm-dashboard"
-version = "0.1.154"
+version = "0.1.156"
 dependencies = [
  "anyhow",
  "chrono",
@@ -301,7 +301,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.154"
+version = "0.1.156"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -324,7 +324,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.154"
+version = "0.1.156"
 dependencies = [
  "chrono",
  "serde",

agent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.154"
+version = "0.1.156"
 edition = "2021"
 
 [dependencies]

agent/src/collectors/disk.rs

@@ -457,11 +457,15 @@ impl DiskCollector {
                 }
             }
             
-            // Serial number parsing
-            if line.starts_with("Serial Number:") {
+            // Serial number parsing (both SATA and NVMe)
+            if line.contains("Serial Number:") {
                 if let Some(serial_part) = line.split("Serial Number:").nth(1) {
-                    if let Some(serial_str) = serial_part.split_whitespace().next() {
-                        serial_number = Some(serial_str.to_string());
+                    let serial_str = serial_part.trim();
+                    if !serial_str.is_empty() {
+                        // Take first whitespace-separated token
+                        if let Some(serial) = serial_str.split_whitespace().next() {
+                            serial_number = Some(serial.to_string());
+                        }
                     }
                 }
             }
@@ -534,6 +538,7 @@ impl DiskCollector {
 
             agent_data.system.storage.drives.push(DriveData {
                 name: drive.name.clone(),
+                serial_number: smart.and_then(|s| s.serial_number.clone()),
                 health: smart.map(|s| s.health.clone()).unwrap_or_else(|| drive.health.clone()),
                 temperature_celsius: smart.and_then(|s| s.temperature_celsius),
                 wear_percent: smart.and_then(|s| s.wear_percent),

dashboard/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.154"
+version = "0.1.156"
 edition = "2021"
 
 [dependencies]

dashboard/src/ui/widgets/system.rs

@@ -239,8 +239,11 @@ impl SystemWidget {
             };
 
             // Add drive info
+            let display_name = drive.serial_number.as_ref()
+                .map(|s| truncate_serial(s))
+                .unwrap_or(drive.name.clone());
             let storage_drive = StorageDrive {
-                name: drive.name.clone(),
+                name: display_name,
                 temperature: drive.temperature_celsius,
                 wear_percent: drive.wear_percent,
                 status: Status::Ok,
@@ -310,8 +313,10 @@ impl SystemWidget {
                 } else {
                     Status::Unknown
                 };
-                
-                let display_name = drive.serial_number.clone().unwrap_or(drive.name.clone());
+
+                let display_name = drive.serial_number.as_ref()
+                    .map(|s| truncate_serial(s))
+                    .unwrap_or(drive.name.clone());
                 let storage_drive = StorageDrive {
                     name: display_name,
                     temperature: drive.temperature_celsius,
@@ -333,8 +338,10 @@ impl SystemWidget {
                 } else {
                     Status::Unknown
                 };
-                
-                let display_name = drive.serial_number.clone().unwrap_or(drive.name.clone());
+
+                let display_name = drive.serial_number.as_ref()
+                    .map(|s| truncate_serial(s))
+                    .unwrap_or(drive.name.clone());
                 let storage_drive = StorageDrive {
                     name: display_name,
                     temperature: drive.temperature_celsius,
@@ -384,8 +391,8 @@ impl SystemWidget {
                     pool.name.clone()
                 }
             } else {
-                // For mergerfs pools, show pool name with format like "mergerfs (2+1):"
-                format!("{}:", pool.pool_type)
+                // For mergerfs pools, show pool type with mount point
+                format!("mergerfs {}:", pool.mount_point)
             };
 
             let pool_spans = StatusIcons::create_status_spans(pool.status.clone(), &pool_label);
@@ -424,7 +431,7 @@ impl SystemWidget {
                 //   └─ Mount: /srv/media
                 
                 // Pool total usage
-                let total_text = format!("Total: {:.0}% {:.1}GB/{:.1}GB",
+                let total_text = format!("{:.0}% {:.1}GB/{:.1}GB",
                     pool.usage_percent.unwrap_or(0.0),
                     pool.used_gb.unwrap_or(0.0),
                     pool.total_gb.unwrap_or(0.0)
@@ -435,20 +442,30 @@ impl SystemWidget {
                 total_spans.extend(StatusIcons::create_status_spans(Status::Ok, &total_text));
                 lines.push(Line::from(total_spans));
 
-                // Data Disks section
-                if !pool.data_drives.is_empty() {
-                    lines.push(Line::from(vec![
-                        Span::styled("  ├─ ", Typography::tree()),
-                        Span::styled("Data Disks:", Typography::secondary())
-                    ]));
-                    for (i, drive) in pool.data_drives.iter().enumerate() {
-                        let is_last = i == pool.data_drives.len() - 1;
-                        let tree_symbol = if is_last { "  │  └─ " } else { "  │  ├─ " };
-                        render_mergerfs_drive(drive, tree_symbol, &mut lines);
+                // Data drives - at same level as parity
+                for (i, drive) in pool.data_drives.iter().enumerate() {
+                    let mut drive_details = Vec::new();
+                    if let Some(temp) = drive.temperature {
+                        drive_details.push(format!("T: {}°C", temp as i32));
                     }
+                    if let Some(wear) = drive.wear_percent {
+                        drive_details.push(format!("W: {}%", wear as i32));
+                    }
+
+                    let drive_text = if !drive_details.is_empty() {
+                        format!("Data_{}: {} {}", i + 1, drive.name, drive_details.join(" "))
+                    } else {
+                        format!("Data_{}: {}", i + 1, drive.name)
+                    };
+
+                    let mut data_spans = vec![
+                        Span::styled("  ├─ ", Typography::tree()),
+                    ];
+                    data_spans.extend(StatusIcons::create_status_spans(drive.status.clone(), &drive_text));
+                    lines.push(Line::from(data_spans));
                 }
 
-                // Parity section
+                // Parity drives - last item
                 if !pool.parity_drives.is_empty() {
                     for drive in &pool.parity_drives {
                         let mut drive_details = Vec::new();
@@ -458,27 +475,20 @@ impl SystemWidget {
                         if let Some(wear) = drive.wear_percent {
                             drive_details.push(format!("W: {}%", wear as i32));
                         }
-                        
+
                         let drive_text = if !drive_details.is_empty() {
-                            format!("{} {}", drive.name, drive_details.join(" "))
+                            format!("Parity: {} {}", drive.name, drive_details.join(" "))
                         } else {
-                            drive.name.clone()
+                            format!("Parity: {}", drive.name)
                         };
-                        
+
                         let mut parity_spans = vec![
-                            Span::styled("  ├─ ", Typography::tree()),
-                            Span::styled("Parity: ", Typography::secondary()),
+                            Span::styled("  └─ ", Typography::tree()),
                         ];
                         parity_spans.extend(StatusIcons::create_status_spans(drive.status.clone(), &drive_text));
                         lines.push(Line::from(parity_spans));
                     }
                 }
-
-                // Mount point
-                lines.push(Line::from(vec![
-                    Span::styled("  └─ Mount: ", Typography::tree()),
-                    Span::styled(&pool.mount_point, Typography::secondary())
-                ]));
             }
         }
 
@@ -486,6 +496,16 @@ impl SystemWidget {
     }
 }
 
+/// Truncate serial number to last 8 characters
+fn truncate_serial(serial: &str) -> String {
+    let len = serial.len();
+    if len > 8 {
+        serial[len - 8..].to_string()
+    } else {
+        serial.to_string()
+    }
+}
+
 /// Helper function to render a drive in a MergerFS pool
 fn render_mergerfs_drive<'a>(drive: &StorageDrive, tree_symbol: &'a str, lines: &mut Vec<Line<'a>>) {
     let mut drive_details = Vec::new();
@@ -542,6 +562,7 @@ impl SystemWidget {
 
         // First line: serial number with temperature and wear
         if let Some(serial) = &self.backup_disk_serial {
+            let truncated_serial = truncate_serial(serial);
             let mut details = Vec::new();
             if let Some(temp) = self.backup_disk_temperature {
                 details.push(format!("T: {}°C", temp as i32));
@@ -551,9 +572,9 @@ impl SystemWidget {
             }
 
             let disk_text = if !details.is_empty() {
-                format!("{} {}", serial, details.join(" "))
+                format!("{} {}", truncated_serial, details.join(" "))
             } else {
-                serial.clone()
+                truncated_serial
             };
 
             let backup_status = match self.backup_status.as_str() {

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.154"
+version = "0.1.156"
 edition = "2021"
 
 [dependencies]

shared/src/agent_data.rs

@@ -66,6 +66,7 @@ pub struct StorageData {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct DriveData {
     pub name: String,
+    pub serial_number: Option<String>,
     pub health: String,
     pub temperature_celsius: Option<f32>,
     pub wear_percent: Option<f32>,