diff --git a/src/models/lidarr_models_tests.rs b/src/models/lidarr_models_tests.rs index f59b464..7a31e9a 100644 --- a/src/models/lidarr_models_tests.rs +++ b/src/models/lidarr_models_tests.rs @@ -296,6 +296,7 @@ mod tests { #[test] fn test_lidarr_serdeable_from_disk_spaces() { let disk_spaces = vec![DiskSpace { + path: Some("/path".to_owned()), free_space: 1, total_space: 1, }]; diff --git a/src/models/radarr_models_tests.rs b/src/models/radarr_models_tests.rs index 2c84364..d7843db 100644 --- a/src/models/radarr_models_tests.rs +++ b/src/models/radarr_models_tests.rs @@ -233,6 +233,7 @@ mod tests { #[test] fn test_radarr_serdeable_from_disk_spaces() { let disk_spaces = vec![DiskSpace { + path: Some("/path".to_owned()), free_space: 1, total_space: 1, }]; diff --git a/src/models/servarr_models.rs b/src/models/servarr_models.rs index 477e04c..36a0033 100644 --- a/src/models/servarr_models.rs +++ b/src/models/servarr_models.rs @@ -83,6 +83,7 @@ pub struct CommandBody { #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)] #[serde(rename_all = "camelCase")] pub struct DiskSpace { + pub path: Option, #[serde(deserialize_with = "super::from_i64")] pub free_space: i64, #[serde(deserialize_with = "super::from_i64")] diff --git a/src/models/sonarr_models_tests.rs b/src/models/sonarr_models_tests.rs index 0d4c0cf..205e2e7 100644 --- a/src/models/sonarr_models_tests.rs +++ b/src/models/sonarr_models_tests.rs @@ -427,6 +427,7 @@ mod tests { #[test] fn test_sonarr_serdeable_from_disk_spaces() { let disk_spaces = vec![DiskSpace { + path: Some("/path".to_owned()), free_space: 1, total_space: 1, }]; diff --git a/src/network/radarr_network/system/radarr_system_network_tests.rs b/src/network/radarr_network/system/radarr_system_network_tests.rs index bc07454..19f15b9 100644 --- a/src/network/radarr_network/system/radarr_system_network_tests.rs +++ b/src/network/radarr_network/system/radarr_system_network_tests.rs @@ -17,10 +17,12 @@ mod tests { let (mock, app, _server) = MockServarrApi::get() .returns(json!([ { + "path": "/path1", "freeSpace": 1111, "totalSpace": 2222, }, { + "path": "/path2", "freeSpace": 3333, "totalSpace": 4444 } @@ -30,10 +32,12 @@ mod tests { let mut network = test_network(&app); let disk_space_vec = vec![ DiskSpace { + path: Some("/path1".to_owned()), free_space: 1111, total_space: 2222, }, DiskSpace { + path: Some("/path2".to_owned()), free_space: 3333, total_space: 4444, }, diff --git a/src/network/servarr_test_utils.rs b/src/network/servarr_test_utils.rs index 38ea73c..23c0872 100644 --- a/src/network/servarr_test_utils.rs +++ b/src/network/servarr_test_utils.rs @@ -4,6 +4,7 @@ use chrono::DateTime; pub fn diskspace() -> DiskSpace { DiskSpace { + path: Some("/path".to_owned()), free_space: 6500, total_space: 8675309, } diff --git a/src/network/sonarr_network/system/sonarr_system_network_tests.rs b/src/network/sonarr_network/system/sonarr_system_network_tests.rs index b254176..5742f22 100644 --- a/src/network/sonarr_network/system/sonarr_system_network_tests.rs +++ b/src/network/sonarr_network/system/sonarr_system_network_tests.rs @@ -113,10 +113,12 @@ mod tests { let (mock, app, _server) = MockServarrApi::get() .returns(json!([ { + "path": "/path1", "freeSpace": 1111, "totalSpace": 2222, }, { + "path": "/path2", "freeSpace": 3333, "totalSpace": 4444 } @@ -127,10 +129,12 @@ mod tests { let mut network = test_network(&app); let disk_space_vec = vec![ DiskSpace { + path: Some("/path1".to_owned()), free_space: 1111, total_space: 2222, }, DiskSpace { + path: Some("/path2".to_owned()), free_space: 3333, total_space: 4444, }, diff --git a/src/ui/lidarr_ui/mod.rs b/src/ui/lidarr_ui/mod.rs index a6aba0d..4ef8300 100644 --- a/src/ui/lidarr_ui/mod.rs +++ b/src/ui/lidarr_ui/mod.rs @@ -148,10 +148,15 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) { for i in 0..disk_space_vec.len() { let DiskSpace { + path, free_space, total_space, } = &disk_space_vec[i]; - let title = format!("Disk {}", i + 1); + let title = if let Some(path) = path { + path + } else { + &format!("Disk {}", i + 1) + }; let ratio = if *total_space == 0 { 0f64 } else { diff --git a/src/ui/radarr_ui/mod.rs b/src/ui/radarr_ui/mod.rs index 882d85a..ec8ae32 100644 --- a/src/ui/radarr_ui/mod.rs +++ b/src/ui/radarr_ui/mod.rs @@ -141,10 +141,15 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) { for i in 0..disk_space_vec.len() { let DiskSpace { + path, free_space, total_space, } = &disk_space_vec[i]; - let title = format!("Disk {}", i + 1); + let title = if let Some(path) = path { + path + } else { + &format!("Disk {}", i + 1) + }; let ratio = if *total_space == 0 { 0f64 } else { diff --git a/src/ui/sonarr_ui/mod.rs b/src/ui/sonarr_ui/mod.rs index 5469e8a..d9e081b 100644 --- a/src/ui/sonarr_ui/mod.rs +++ b/src/ui/sonarr_ui/mod.rs @@ -149,10 +149,16 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) { for i in 0..disk_space_vec.len() { let DiskSpace { + path, free_space, total_space, + .. } = &disk_space_vec[i]; - let title = format!("Disk {}", i + 1); + let title = if let Some(path) = path { + path + } else { + &format!("Disk {}", i + 1) + }; let ratio = if *total_space == 0 { 0f64 } else {