feat: Added config option to filter for specific disk space paths to display in the UI (CLI is unaffected)
This commit is contained in:
@@ -101,7 +101,28 @@ impl Network<'_, '_> {
|
||||
|
||||
self
|
||||
.handle_request::<(), Vec<DiskSpace>>(request_props, |disk_space_vec, mut app| {
|
||||
app.data.sonarr_data.disk_space_vec = disk_space_vec;
|
||||
if let Some(paths) = app
|
||||
.server_tabs
|
||||
.get_active_config()
|
||||
.as_ref()
|
||||
.expect("Servarr config is undefined")
|
||||
.monitored_storage_paths
|
||||
.as_ref()
|
||||
&& !paths.is_empty()
|
||||
{
|
||||
app.data.sonarr_data.disk_space_vec = disk_space_vec
|
||||
.into_iter()
|
||||
.filter(|it| {
|
||||
if let Some(path) = it.path.as_ref() {
|
||||
paths.contains(path)
|
||||
} else {
|
||||
true
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
} else {
|
||||
app.data.sonarr_data.disk_space_vec = disk_space_vec;
|
||||
}
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::app::{App, ServarrConfig};
|
||||
use crate::models::HorizontallyScrollableText;
|
||||
use crate::models::servarr_models::{
|
||||
DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, Update,
|
||||
@@ -11,6 +12,8 @@ mod tests {
|
||||
use chrono::DateTime;
|
||||
use pretty_assertions::{assert_eq, assert_str_eq};
|
||||
use serde_json::json;
|
||||
use std::sync::Arc;
|
||||
use tokio::sync::Mutex;
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_handle_get_sonarr_host_config_event() {
|
||||
@@ -127,6 +130,11 @@ mod tests {
|
||||
.await;
|
||||
app.lock().await.server_tabs.next();
|
||||
let mut network = test_network(&app);
|
||||
let filtered_disk_space_vec = vec![DiskSpace {
|
||||
path: Some("/path1".to_owned()),
|
||||
free_space: 1111,
|
||||
total_space: 2222,
|
||||
}];
|
||||
let disk_space_vec = vec![
|
||||
DiskSpace {
|
||||
path: Some("/path1".to_owned()),
|
||||
@@ -150,6 +158,66 @@ mod tests {
|
||||
mock.assert_async().await;
|
||||
assert_eq!(
|
||||
app.lock().await.data.sonarr_data.disk_space_vec,
|
||||
filtered_disk_space_vec
|
||||
);
|
||||
assert_eq!(disk_space, disk_space_vec);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_handle_get_sonarr_diskspace_event_populates_data_with_all_storage_when_monitored_storage_paths_is_empty()
|
||||
{
|
||||
let (mock, base_app, _server) = MockServarrApi::get()
|
||||
.returns(json!([
|
||||
{
|
||||
"path": "/path1",
|
||||
"freeSpace": 1111,
|
||||
"totalSpace": 2222,
|
||||
},
|
||||
{
|
||||
"path": "/path2",
|
||||
"freeSpace": 3333,
|
||||
"totalSpace": 4444
|
||||
}
|
||||
]))
|
||||
.build_for(SonarrEvent::GetDiskSpace)
|
||||
.await;
|
||||
let mut app = App::test_default();
|
||||
let servarr_config = ServarrConfig {
|
||||
monitored_storage_paths: Some(vec![]),
|
||||
..base_app.lock().await.server_tabs.tabs[1]
|
||||
.config
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.clone()
|
||||
};
|
||||
app.server_tabs.tabs[1].config = Some(servarr_config);
|
||||
app.server_tabs.next();
|
||||
let app_arc = Arc::new(Mutex::new(app));
|
||||
|
||||
let mut network = test_network(&app_arc);
|
||||
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,
|
||||
},
|
||||
];
|
||||
|
||||
let SonarrSerdeable::DiskSpaces(disk_space) = network
|
||||
.handle_sonarr_event(SonarrEvent::GetDiskSpace)
|
||||
.await
|
||||
.unwrap()
|
||||
else {
|
||||
panic!("Expected DiskSpaces")
|
||||
};
|
||||
mock.assert_async().await;
|
||||
assert_eq!(
|
||||
app_arc.lock().await.data.sonarr_data.disk_space_vec,
|
||||
disk_space_vec
|
||||
);
|
||||
assert_eq!(disk_space, disk_space_vec);
|
||||
|
||||
Reference in New Issue
Block a user