cm/cm-dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 271 Wiki Activity

Fix duplicate drive display in mergerfs pools
All checks were successful
Build and Release / build-and-release (push) Successful in 2m9s
Details

Browse Source 
- Restructure storage rendering logic to prevent drive duplication
- Use specific mergerfs check instead of generic multi-drive condition
- Ensure drives only appear once under organized data/parity sections
This commit is contained in:
Christoffer Martinsson 2025-11-23 17:46:09 +01:00
parent 54483653f9
commit 43fb838c9b
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

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

2
agent/Cargo.toml
View File

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

2
dashboard/Cargo.toml
View File

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

12
dashboard/src/ui/widgets/system.rs
View File

@ -512,7 +512,7 @@ impl SystemWidget {
lines.push(Line::from(usage_spans)); lines.push(Line::from(usage_spans));
// Drive lines with enhanced grouping // Drive lines with enhanced grouping
if pool.pool_type != "single" && pool.drives.len() > 1 { if pool.pool_type.contains("mergerfs") && pool.drives.len() > 1 {
// Group drives by type for mergerfs pools // Group drives by type for mergerfs pools
let (data_drives, parity_drives): (Vec<_>, Vec<_>) = pool.drives.iter().enumerate() let (data_drives, parity_drives): (Vec<_>, Vec<_>) = pool.drives.iter().enumerate()
.partition(|(_, drive)| { .partition(|(_, drive)| {
@ -521,7 +521,7 @@ impl SystemWidget {
}); });
// Show data drives // Show data drives
if !data_drives.is_empty() && pool.pool_type.contains("mergerfs") { if !data_drives.is_empty() {
lines.push(Line::from(vec![ lines.push(Line::from(vec![
Span::raw(" "), Span::raw(" "),
Span::styled("├─ ", Typography::tree()), Span::styled("├─ ", Typography::tree()),
@ -539,7 +539,7 @@ impl SystemWidget {
} }
// Show parity drives // Show parity drives
if !parity_drives.is_empty() && pool.pool_type.contains("mergerfs") { if !parity_drives.is_empty() {
lines.push(Line::from(vec![ lines.push(Line::from(vec![
Span::raw(" "), Span::raw(" "),
Span::styled("└─ ", Typography::tree()), Span::styled("└─ ", Typography::tree()),
@ -554,14 +554,14 @@ impl SystemWidget {
self.render_drive_line(&mut lines, drive, " ├─"); self.render_drive_line(&mut lines, drive, " ├─");
} }
} }
} else { }
// Regular drive listing for non-mergerfs pools } else if pool.pool_type != "single" && pool.drives.len() > 1 {
// Regular drive listing for non-mergerfs multi-drive pools
for (i, drive) in pool.drives.iter().enumerate() { for (i, drive) in pool.drives.iter().enumerate() {
let is_last = i == pool.drives.len() - 1; let is_last = i == pool.drives.len() - 1;
let tree_symbol = if is_last { "└─" } else { "├─" }; let tree_symbol = if is_last { "└─" } else { "├─" };
self.render_drive_line(&mut lines, drive, tree_symbol); self.render_drive_line(&mut lines, drive, tree_symbol);
} }
}
} else if pool.pool_type.starts_with("drive (") { } else if pool.pool_type.starts_with("drive (") {
// Physical drive pools: show drive info + filesystem children // Physical drive pools: show drive info + filesystem children
// First show drive information // First show drive information

2
shared/Cargo.toml
View File

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