jason/socktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: show parent disks with aggregated partition stats

Browse Source
This commit is contained in:
jasonwitty 2025-10-06 10:46:51 -07:00
parent 34e260a612
commit 689498c5f4
2 changed files with 123 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
socktop/src/ui/disks.rs
View File

@ -26,7 +26,9 @@ pub fn draw_disks(f: &mut ratatui::Frame<'_>, area: Rect, m: Option<&Metrics>) {
// Filter duplicates by keeping first occurrence of each unique name
let mut seen_names = std::collections::HashSet::new();
let unique_disks: Vec<_> = mm.disks.iter()
let unique_disks: Vec<_> = mm
.disks
.iter()
.filter(|d| seen_names.insert(d.name.clone()))
.collect();
@ -63,7 +65,8 @@ pub fn draw_disks(f: &mut ratatui::Frame<'_>, area: Rect, m: Option<&Metrics>) {
let indent = if d.is_partition { " └─" } else { "" };
// Add temperature if available
let temp_str = d.temperature
let temp_str = d
.temperature
.map(|t| format!(" {}°C", t.round() as i32))
.unwrap_or_default();

134
socktop_agent/src/metrics.rs
View File

@ -340,13 +340,13 @@ pub async fn collect_disks(state: &AppState) -> Vec<DiskInfo> {
for c in components.iter() {
let label = c.label().to_ascii_lowercase();
// Match common disk/SSD/NVMe sensor labels
if label.contains("nvme") || label.contains("ssd") || label.contains("disk") {
if let Some(temp) = c.temperature() {
// Extract device name from label (e.g., "nvme0" from "Composite nvme0")
for part in label.split_whitespace() {
if part.starts_with("nvme") || part.starts_with("sd") {
temps.insert(part.to_string(), temp);
}
if (label.contains("nvme") || label.contains("ssd") || label.contains("disk"))
&& let Some(temp) = c.temperature()
{
// Extract device name from label (e.g., "nvme0" from "Composite nvme0")
for part in label.split_whitespace() {
if part.starts_with("nvme") || part.starts_with("sd") {
temps.insert(part.to_string(), temp);
}
}
}
@ -354,25 +354,33 @@ pub async fn collect_disks(state: &AppState) -> Vec<DiskInfo> {
temps
};
let disks: Vec<DiskInfo> = disks_list
// First collect all partitions from sysinfo
let partitions: Vec<DiskInfo> = disks_list
.iter()
.map(|d| {
let name = d.name().to_string_lossy().into_owned();
// Determine if this is a partition (contains 'p' followed by digit, or just digit after device name)
let is_partition = name.contains("p1") || name.contains("p2") || name.contains("p3")
|| name.ends_with('1') || name.ends_with('2') || name.ends_with('3')
|| name.ends_with('4') || name.ends_with('5') || name.ends_with('6')
|| name.ends_with('7') || name.ends_with('8') || name.ends_with('9');
// Determine if this is a partition
let is_partition = name.contains("p1")
|| name.contains("p2")
|| name.contains("p3")
|| name.ends_with('1')
|| name.ends_with('2')
|| name.ends_with('3')
|| name.ends_with('4')
|| name.ends_with('5')
|| name.ends_with('6')
|| name.ends_with('7')
|| name.ends_with('8')
|| name.ends_with('9');
// Try to find temperature for this disk
let temperature = disk_temps.iter()
.find_map(|(key, &temp)| {
if name.starts_with(key) {
Some(temp)
} else {
None
}
});
let temperature = disk_temps.iter().find_map(|(key, &temp)| {
if name.starts_with(key) {
Some(temp)
} else {
None
}
});
DiskInfo {
name,
@ -383,6 +391,90 @@ pub async fn collect_disks(state: &AppState) -> Vec<DiskInfo> {
}
})
.collect();
// Now create parent disk entries by aggregating partition data
let mut parent_disks: std::collections::HashMap<String, (u64, u64, Option<f32>)> =
std::collections::HashMap::new();
for partition in &partitions {
if partition.is_partition {
// Extract parent disk name
// nvme0n1p1 -> nvme0n1, sda1 -> sda, mmcblk0p1 -> mmcblk0
let parent_name = if let Some(pos) = partition.name.rfind('p') {
// Check if character after 'p' is a digit
if partition.name.chars().nth(pos + 1).is_some_and(|c| c.is_ascii_digit()) {
&partition.name[..pos]
} else {
// Handle sda1, sdb2, etc (just trim trailing digit)
partition.name.trim_end_matches(char::is_numeric)
}
} else {
// Handle sda1, sdb2, etc (just trim trailing digit)
partition.name.trim_end_matches(char::is_numeric)
};
// Aggregate partition stats into parent
let entry = parent_disks
.entry(parent_name.to_string())
.or_insert((0, 0, partition.temperature));
entry.0 += partition.total;
entry.1 += partition.available;
// Keep temperature if any partition has it
if entry.2.is_none() {
entry.2 = partition.temperature;
}
}
}
// Create parent disk entries
let mut disks: Vec<DiskInfo> = parent_disks
.into_iter()
.map(|(name, (total, available, temperature))| DiskInfo {
name,
total,
available,
temperature,
is_partition: false,
})
.collect();
// Sort parent disks by name
disks.sort_by(|a, b| a.name.cmp(&b.name));
// Add partitions after their parent disk
for partition in partitions {
if partition.is_partition {
// Find parent disk index
let parent_name = if let Some(pos) = partition.name.rfind('p') {
if partition.name.chars().nth(pos + 1).is_some_and(|c| c.is_ascii_digit()) {
&partition.name[..pos]
} else {
partition.name.trim_end_matches(char::is_numeric)
}
} else {
partition.name.trim_end_matches(char::is_numeric)
};
// Find where to insert this partition (after its parent)
if let Some(parent_idx) = disks.iter().position(|d| d.name == parent_name) {
// Insert after parent and any existing partitions of that parent
let mut insert_idx = parent_idx + 1;
while insert_idx < disks.len()
&& disks[insert_idx].is_partition
&& disks[insert_idx].name.starts_with(parent_name)
{
insert_idx += 1;
}
disks.insert(insert_idx, partition);
} else {
// Parent not found (shouldn't happen), just add at end
disks.push(partition);
}
} else {
// Not a partition (e.g., zram0), add at end
disks.push(partition);
}
}
{
let mut cache = state.cache_disks.lock().await;
cache.set(disks.clone());