build: Removed #[allow(dead_code)] from the LIDARR_LOGO since it is now being utilized

README.md

@@ -380,6 +380,13 @@ lidarr:
   - host: 192.168.0.86
     port: 8686
     api_token: ${MY_LIDARR_API_TOKEN} # Example of configuring using environment variables
+    monitored_storage_paths: # Filter which Root Folders or Disk Storage you want displayed in the UI's 'Stats' block
+      # Note: Setting these values does not affect what shows up in the 'Root Folders' tab of the UI.
+      - /nfs    # An example disk (i.e. '<servarr> list disk-space' command) you want displayed in the UI under 'Storage:'
+      - /media  # An example root folder you want displayed in the UI
+                # Root folders collapse up to the super-directory to reduce duplication in the UI. For example:
+                # if you have root folders '/media/tv', '/media/cartoons' and '/media/reality', and you set this
+                # monitored path, the UI will show '/media/[tv,cartoons,reality]' under Root Folders
 whisparr:
   - host: 192.168.0.69
     port: 6969

src/app/app_tests.rs

@@ -507,6 +507,56 @@ mod tests {
     assert_none!(config.custom_headers);
   }
 
+  #[test]
+  #[serial]
+  fn test_deserialize_optional_env_var_string_vec_is_present() {
+    unsafe { std::env::set_var("TEST_VAR_DESERIALIZE_STRING_VEC_OPTION", "/path1") };
+    let expected_monitored_paths = ["/path1", "/path2"];
+    let yaml_data = r#"
+      monitored_storage_paths:
+        - ${TEST_VAR_DESERIALIZE_STRING_VEC_OPTION}
+        - /path2
+    "#;
+
+    let config: ServarrConfig = serde_yaml::from_str(yaml_data).unwrap();
+
+    assert_some_eq_x!(&config.monitored_storage_paths, &expected_monitored_paths);
+    unsafe { std::env::remove_var("TEST_VAR_DESERIALIZE_STRING_VEC_OPTION") };
+  }
+
+  #[test]
+  #[serial]
+  fn test_deserialize_optional_env_var_string_vec_does_not_overwrite_non_env_value() {
+    unsafe {
+      std::env::set_var(
+        "TEST_VAR_DESERIALIZE_STRING_VEC_OPTION_NO_OVERWRITE",
+        "/path3",
+      )
+    };
+    let expected_monitored_paths = ["/path1", "/path2"];
+    let yaml_data = r#"
+      monitored_storage_paths:
+        - /path1
+        - /path2
+    "#;
+
+    let config: ServarrConfig = serde_yaml::from_str(yaml_data).unwrap();
+
+    assert_some_eq_x!(&config.monitored_storage_paths, &expected_monitored_paths);
+    unsafe { std::env::remove_var("TEST_VAR_DESERIALIZE_STRING_VEC_OPTION_NO_OVERWRITE") };
+  }
+
+  #[test]
+  fn test_deserialize_optional_env_var_string_vec_empty() {
+    let yaml_data = r#"
+      api_token: "test123"
+    "#;
+
+    let config: ServarrConfig = serde_yaml::from_str(yaml_data).unwrap();
+
+    assert_none!(config.monitored_storage_paths);
+  }
+
   #[test]
   #[serial]
   fn test_deserialize_optional_u16_env_var_is_present() {
@@ -620,10 +670,11 @@ mod tests {
     let api_token = "thisisatest".to_owned();
     let api_token_file = "/root/.config/api_token".to_owned();
     let ssl_cert_path = "/some/path".to_owned();
+    let monitored_storage = vec!["/path1".to_owned(), "/path2".to_owned()];
     let mut custom_headers = HeaderMap::new();
     custom_headers.insert("X-Custom-Header", "value".parse().unwrap());
     let expected_str = format!(
-      "ServarrConfig {{ name: Some(\"{name}\"), host: Some(\"{host}\"), port: Some({port}), uri: Some(\"{uri}\"), weight: Some({weight}), api_token: Some(\"***********\"), api_token_file: Some(\"{api_token_file}\"), ssl_cert_path: Some(\"{ssl_cert_path}\"), custom_headers: Some({{\"x-custom-header\": \"value\"}}) }}"
+      "ServarrConfig {{ name: Some(\"{name}\"), host: Some(\"{host}\"), port: Some({port}), uri: Some(\"{uri}\"), weight: Some({weight}), api_token: Some(\"***********\"), api_token_file: Some(\"{api_token_file}\"), ssl_cert_path: Some(\"{ssl_cert_path}\"), custom_headers: Some({{\"x-custom-header\": \"value\"}}), monitored_storage_paths: Some([\"/path1\", \"/path2\"]) }}"
     );
     let servarr_config = ServarrConfig {
       name: Some(name),
@@ -635,6 +686,7 @@ mod tests {
       api_token_file: Some(api_token_file),
       ssl_cert_path: Some(ssl_cert_path),
       custom_headers: Some(custom_headers),
+      monitored_storage_paths: Some(monitored_storage),
     };
 
     assert_str_eq!(format!("{servarr_config:?}"), expected_str);

src/app/mod.rs

@@ -436,6 +436,8 @@ pub struct ServarrConfig {
     serialize_with = "serialize_header_map"
   )]
   pub custom_headers: Option<HeaderMap>,
+  #[serde(default, deserialize_with = "deserialize_optional_env_var_string_vec")]
+  pub monitored_storage_paths: Option<Vec<String>>,
 }
 
 impl ServarrConfig {
@@ -482,6 +484,7 @@ impl Default for ServarrConfig {
       api_token_file: None,
       ssl_cert_path: None,
       custom_headers: None,
+      monitored_storage_paths: None,
     }
   }
 }
@@ -548,6 +551,24 @@ where
   }
 }
 
+fn deserialize_optional_env_var_string_vec<'de, D>(
+  deserializer: D,
+) -> Result<Option<Vec<String>>, D::Error>
+where
+  D: serde::Deserializer<'de>,
+{
+  let opt: Option<Vec<String>> = Option::deserialize(deserializer)?;
+  match opt {
+    Some(vec) => Ok(Some(
+      vec
+        .into_iter()
+        .map(|it| interpolate_env_vars(&it))
+        .collect(),
+    )),
+    None => Ok(None),
+  }
+}
+
 fn deserialize_u16_env_var<'de, D>(deserializer: D) -> Result<Option<u16>, D::Error>
 where
   D: serde::Deserializer<'de>,

src/cli/lidarr/list_command_handler.rs

@@ -59,6 +59,8 @@ pub enum LidarrListCommand {
   Artists,
   #[command(about = "List all items in the Lidarr blocklist")]
   Blocklist,
+  #[command(about = "List disk space details for all provisioned root folders in Lidarr")]
+  DiskSpace,
   #[command(about = "List all active downloads in Lidarr")]
   Downloads {
     #[arg(long, help = "How many downloads to fetch", default_value_t = 500)]
@@ -209,6 +211,13 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, LidarrListCommand> for LidarrListCommandH
           .await?;
         serde_json::to_string_pretty(&resp)?
       }
+      LidarrListCommand::DiskSpace => {
+        let resp = self
+          .network
+          .handle_network_event(LidarrEvent::GetDiskSpace.into())
+          .await?;
+        serde_json::to_string_pretty(&resp)?
+      }
       LidarrListCommand::Downloads { count } => {
         let resp = self
           .network

src/cli/lidarr/list_command_handler_tests.rs

@@ -28,6 +28,7 @@ mod tests {
       #[values(
         "artists",
         "blocklist",
+        "disk-space",
         "indexers",
         "metadata-profiles",
         "quality-profiles",
@@ -435,6 +436,7 @@ mod tests {
     #[rstest]
     #[case(LidarrListCommand::Artists, LidarrEvent::ListArtists)]
     #[case(LidarrListCommand::Blocklist, LidarrEvent::GetBlocklist)]
+    #[case(LidarrListCommand::DiskSpace, LidarrEvent::GetDiskSpace)]
     #[case(LidarrListCommand::Indexers, LidarrEvent::GetIndexers)]
     #[case(LidarrListCommand::MetadataProfiles, LidarrEvent::GetMetadataProfiles)]
     #[case(LidarrListCommand::QualityProfiles, LidarrEvent::GetQualityProfiles)]

src/logos.rs

@@ -36,8 +36,6 @@ pub const READARR_LOGO: &str = "⠀⠀⠀⠀⠀⣀⣠⣤⣄⣀⠀⠀⠀⠀⠀
 ⠀⠀⠈⠳⣬⣙⠻⠿⠟⣋⣥⠞⠁⠀⠀
 ⠀⠀⠀⠀⠀⠉⠙⠛⠋⠉⠀⠀⠀⠀⠀
 ";
-// Allowing this code for now since we'll eventually be implementing additional Servarr support and we'll need it then
-#[allow(dead_code)]
 pub const LIDARR_LOGO: &str = "⠀⠀⠀⣠⣴⣶⡿⠻⣿⣶⣦⣄⠀⠀⠀
 ⠀⢠⣾⠟⠋⠀⠀⢀⣀⠀⠙⠻⣷⡄⠀
 ⢠⣿⠋⠀⣴⠃⠀⢸⣿⣿⣦⡀⠙⣿⡄

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,
     }];

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,
     }];

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<String>,
   #[serde(deserialize_with = "super::from_i64")]
   pub free_space: i64,
   #[serde(deserialize_with = "super::from_i64")]

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,
     }];

src/network/lidarr_network/system/lidarr_system_network_tests.rs

@@ -16,21 +16,34 @@ mod tests {
   async fn test_handle_get_diskspace_event() {
     let diskspace_json = json!([
       {
+        "path": "/path1",
         "freeSpace": 1111,
         "totalSpace": 2222,
       },
       {
+        "path": "/path2",
         "freeSpace": 3333,
         "totalSpace": 4444
       }
     ]);
-    let response: Vec<DiskSpace> = serde_json::from_value(diskspace_json.clone()).unwrap();
     let (mock, app, _server) = MockServarrApi::get()
       .returns(diskspace_json)
       .build_for(LidarrEvent::GetDiskSpace)
       .await;
     app.lock().await.server_tabs.set_index(2);
     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,
+      },
+    ];
 
     let result = network.handle_lidarr_event(LidarrEvent::GetDiskSpace).await;
 
@@ -40,8 +53,11 @@ mod tests {
       panic!("Expected DiskSpaces");
     };
 
-    assert_eq!(disk_spaces, response);
+    assert_eq!(
-    assert!(!app.lock().await.data.lidarr_data.disk_space_vec.is_empty());
+      app.lock().await.data.lidarr_data.disk_space_vec,
+      disk_space_vec
+    );
+    assert_eq!(disk_spaces, disk_space_vec);
   }
 
   #[tokio::test]

src/network/network_tests.rs

@@ -862,6 +862,7 @@ pub(in crate::network) mod test_utils {
         host,
         port,
         api_token: Some("test1234".to_owned()),
+        monitored_storage_paths: Some(vec!["/path1".to_owned()]),
         ..ServarrConfig::default()
       };
 

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,
       },

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,
   }

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,
       },

src/ui/lidarr_ui/mod.rs

@@ -1,5 +1,3 @@
-use std::{cmp, iter};
-
 #[cfg(test)]
 use crate::ui::ui_test_utils::test_utils::Utc;
 use chrono::Duration;
@@ -14,6 +12,7 @@ use ratatui::{
   text::Text,
   widgets::Paragraph,
 };
+use std::{cmp, iter};
 
 use super::{
   DrawUi, draw_tabs,
@@ -28,6 +27,7 @@ use crate::ui::lidarr_ui::downloads::DownloadsUi;
 use crate::ui::lidarr_ui::indexers::IndexersUi;
 use crate::ui::lidarr_ui::root_folders::RootFoldersUi;
 use crate::ui::lidarr_ui::system::SystemUi;
+use crate::ui::utils::{extract_monitored_disk_space_vec, extract_monitored_root_folders};
 use crate::{
   app::App,
   logos::LIDARR_LOGO,
@@ -100,6 +100,8 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
       start_time,
       ..
     } = &app.data.lidarr_data;
+    let monitored_disk_space_vec = extract_monitored_disk_space_vec(app, disk_space_vec.clone());
+    let monitored_root_folders = extract_monitored_root_folders(app, root_folders.items.clone());
 
     let mut constraints = vec![
       Constraint::Length(1),
@@ -110,7 +112,7 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
     constraints.append(
       &mut iter::repeat_n(
         Constraint::Length(1),
-        disk_space_vec.len() + root_folders.items.len() + 1,
+        monitored_disk_space_vec.len() + monitored_root_folders.len() + 1,
       )
       .collect(),
     );
@@ -146,12 +148,17 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
     f.render_widget(uptime_paragraph, stat_item_areas[1]);
     f.render_widget(storage, stat_item_areas[2]);
 
-    for i in 0..disk_space_vec.len() {
+    for i in 0..monitored_disk_space_vec.len() {
       let DiskSpace {
+        path,
         free_space,
         total_space,
-      } = &disk_space_vec[i];
+      } = &monitored_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 {
@@ -163,12 +170,12 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
       f.render_widget(space_gauge, stat_item_areas[i + 3]);
     }
 
-    f.render_widget(folders, stat_item_areas[disk_space_vec.len() + 3]);
+    f.render_widget(folders, stat_item_areas[monitored_disk_space_vec.len() + 3]);
 
-    for i in 0..root_folders.items.len() {
+    for i in 0..monitored_root_folders.len() {
       let RootFolder {
         path, free_space, ..
-      } = &root_folders.items[i];
+      } = &monitored_root_folders[i];
       let space: f64 = convert_to_gb(*free_space);
       let root_folder_space = Paragraph::new(format!("{path}: {space:.2} GB free"))
         .block(borderless_block())
@@ -176,7 +183,7 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
 
       f.render_widget(
         root_folder_space,
-        stat_item_areas[i + disk_space_vec.len() + 4],
+        stat_item_areas[i + monitored_disk_space_vec.len() + 4],
       )
     }
   } else {

src/ui/radarr_ui/mod.rs

@@ -1,15 +1,3 @@
-#[cfg(test)]
-use crate::ui::ui_test_utils::test_utils::Utc;
-use chrono::Duration;
-#[cfg(not(test))]
-use chrono::Utc;
-use ratatui::Frame;
-use ratatui::layout::{Constraint, Layout, Rect};
-use ratatui::prelude::Stylize;
-use ratatui::text::Text;
-use ratatui::widgets::{Paragraph, Row};
-use std::{cmp, iter};
-
 use crate::app::App;
 use crate::logos::RADARR_LOGO;
 use crate::models::Route;
@@ -27,11 +15,23 @@ use crate::ui::radarr_ui::library::LibraryUi;
 use crate::ui::radarr_ui::root_folders::RootFoldersUi;
 use crate::ui::radarr_ui::system::SystemUi;
 use crate::ui::styles::ManagarrStyle;
+#[cfg(test)]
+use crate::ui::ui_test_utils::test_utils::Utc;
 use crate::ui::utils::{
-  borderless_block, layout_block, line_gauge_with_label, line_gauge_with_title, title_block,
+  borderless_block, extract_monitored_disk_space_vec, extract_monitored_root_folders, layout_block,
+  line_gauge_with_label, line_gauge_with_title, title_block,
 };
 use crate::ui::widgets::loading_block::LoadingBlock;
 use crate::utils::convert_to_gb;
+use chrono::Duration;
+#[cfg(not(test))]
+use chrono::Utc;
+use ratatui::Frame;
+use ratatui::layout::{Constraint, Layout, Rect};
+use ratatui::prelude::Stylize;
+use ratatui::text::Text;
+use ratatui::widgets::{Paragraph, Row};
+use std::{cmp, iter};
 
 mod blocklist;
 mod collections;
@@ -93,6 +93,8 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
       start_time,
       ..
     } = &app.data.radarr_data;
+    let monitored_disk_space_vec = extract_monitored_disk_space_vec(app, disk_space_vec.clone());
+    let monitored_root_folders = extract_monitored_root_folders(app, root_folders.items.clone());
 
     let mut constraints = vec![
       Constraint::Length(1),
@@ -103,7 +105,7 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
     constraints.append(
       &mut iter::repeat_n(
         Constraint::Length(1),
-        disk_space_vec.len() + root_folders.items.len() + 1,
+        monitored_disk_space_vec.len() + monitored_root_folders.len() + 1,
       )
       .collect(),
     );
@@ -139,12 +141,17 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
     f.render_widget(uptime_paragraph, stat_item_areas[1]);
     f.render_widget(storage, stat_item_areas[2]);
 
-    for i in 0..disk_space_vec.len() {
+    for i in 0..monitored_disk_space_vec.len() {
       let DiskSpace {
+        path,
         free_space,
         total_space,
-      } = &disk_space_vec[i];
+      } = &monitored_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 {
@@ -156,12 +163,13 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
       f.render_widget(space_gauge, stat_item_areas[i + 3]);
     }
 
-    f.render_widget(folders, stat_item_areas[disk_space_vec.len() + 3]);
+    f.render_widget(folders, stat_item_areas[monitored_disk_space_vec.len() + 3]);
 
-    for i in 0..root_folders.items.len() {
+    let monitored_root_folders = extract_monitored_root_folders(app, root_folders.items.clone());
+    for i in 0..monitored_root_folders.len() {
       let RootFolder {
         path, free_space, ..
-      } = &root_folders.items[i];
+      } = &monitored_root_folders[i];
       let space: f64 = convert_to_gb(*free_space);
       let root_folder_space = Paragraph::new(format!("{path}: {space:.2} GB free"))
         .block(borderless_block())
@@ -169,7 +177,7 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
 
       f.render_widget(
         root_folder_space,
-        stat_item_areas[i + disk_space_vec.len() + 4],
+        stat_item_areas[i + monitored_disk_space_vec.len() + 4],
       )
     }
   } else {

src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab.snap

@@ -9,7 +9,7 @@ expression: output
 │Lidarr Version:  1.2.3.4                                               ││Test download title                                                   ││  ⠀⠀⠀⣠⣴⣶⡿⠻⣿⣶⣦⣄⠀⠀⠀ │
 │Uptime: 0d 00:00:44                                                    ││50% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││  ⠀⢠⣾⠟⠋⠀⠀⢀⣀⠀⠙⠻⣷⡄⠀ │
 │Storage:                                                               ││                                                                      ││  ⢠⣿⠋⠀⣴⠃⠀⢸⣿⣿⣦⡀⠙⣿⡄ │
-│Disk 1: 100% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││                                                                      ││  ⣾⡟⠀⢸⠃⠀⠀⠀⠈⠉⠉⠁⠀⢹⣷ │
+│/path: 100% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││                                                                      ││  ⣾⡟⠀⢸⠃⠀⠀⠀⠈⠉⠉⠁⠀⢹⣷ │
 │Root Folders:                                                          ││                                                                      ││  ⢿⣧⠀⠈⠀⠀⠀⠀⠀⠀⢀⡟⠀⣸⡿ │
 │/nfs: 204800.00 GB free                                                ││                                                                      ││  ⠘⣿⣄⠀⠻⣿⣿⡇⠀⢀⠞⠀⣠⣿⠃ │
 │                                                                       ││                                                                      ││  ⠀⠘⢿⣦⣄⠀⠉⠁⠀⠀⣠⣴⡿⠃⠀ │

src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab_error_popup.snap

@@ -9,7 +9,7 @@ expression: output
 │Lidarr Version:  1.2.3.4           ╭  Keybindings  ──────────────────────────────────────────────────────────────────────────╮                 ││  ⠀⠀⠀⣠⣴⣶⡿⠻⣿⣶⣦⣄⠀⠀⠀ │
 │Uptime: 0d 00:00:44                │   Key                          Alt Key                      Description                 │━━━━━━━━━━━━━━━━━││  ⠀⢠⣾⠟⠋⠀⠀⢀⣀⠀⠙⠻⣷⡄⠀ │
 │Storage:                           │=> a                                                         add                         │                 ││  ⢠⣿⠋⠀⣴⠃⠀⢸⣿⣿⣦⡀⠙⣿⡄ │
-│Disk 1: 100% ━━━━━━━━━━━━━━━━━━━━━━│   e                                                         edit                        │                 ││  ⣾⡟⠀⢸⠃⠀⠀⠀⠈⠉⠉⠁⠀⢹⣷ │
+│/path: 100% ━━━━━━━━━━━━━━━━━━━━━━━│   e                                                         edit                        │                 ││  ⣾⡟⠀⢸⠃⠀⠀⠀⠈⠉⠉⠁⠀⢹⣷ │
 │Root Folders:                      │   m                                                         toggle monitoring           │                 ││  ⢿⣧⠀⠈⠀⠀⠀⠀⠀⠀⢀⡟⠀⣸⡿ │
 │/nfs: 204800.00 GB free            │   o                                                         sort                        │                 ││  ⠘⣿⣄⠀⠻⣿⣿⡇⠀⢀⠞⠀⣠⣿⠃ │
 │                                   │   del                                                       delete                      │                 ││  ⠀⠘⢿⣦⣄⠀⠉⠁⠀⠀⣠⣴⡿⠃⠀ │

src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab_with_error.snap

@@ -12,7 +12,7 @@ expression: output
 │Lidarr Version:  1.2.3.4                                               ││Test download title                                                   ││  ⠀⠀⠀⣠⣴⣶⡿⠻⣿⣶⣦⣄⠀⠀⠀ │
 │Uptime: 0d 00:00:44                                                    ││50% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││  ⠀⢠⣾⠟⠋⠀⠀⢀⣀⠀⠙⠻⣷⡄⠀ │
 │Storage:                                                               ││                                                                      ││  ⢠⣿⠋⠀⣴⠃⠀⢸⣿⣿⣦⡀⠙⣿⡄ │
-│Disk 1: 100% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││                                                                      ││  ⣾⡟⠀⢸⠃⠀⠀⠀⠈⠉⠉⠁⠀⢹⣷ │
+│/path: 100% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││                                                                      ││  ⣾⡟⠀⢸⠃⠀⠀⠀⠈⠉⠉⠁⠀⢹⣷ │
 │Root Folders:                                                          ││                                                                      ││  ⢿⣧⠀⠈⠀⠀⠀⠀⠀⠀⢀⡟⠀⣸⡿ │
 │/nfs: 204800.00 GB free                                                ││                                                                      ││  ⠘⣿⣄⠀⠻⣿⣿⡇⠀⢀⠞⠀⣠⣿⠃ │
 │                                                                       ││                                                                      ││  ⠀⠘⢿⣦⣄⠀⠉⠁⠀⠀⣠⣴⡿⠃⠀ │

src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__radarr_ui_renders_library_tab.snap

@@ -9,7 +9,7 @@ expression: output
 │Radarr Version:  1.2.3.4                                               ││Test Download Title                                                   ││  ⠀⣠⣶⢶⣶⣤⣀⠀⠀⠀⠀⠀⠀⠀⠀ │
 │Uptime: 0d 00:00:44                                                    ││50% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││  ⠀⣿⡇⠀⠈⠙⠻⢿⣶⣤⡀⠀⠀⠀⠀ │
 │Storage:                                                               ││                                                                      ││  ⠀⣿⡇⠀⠀⠀⠀⠀⠈⠙⠻⢷⣦⡄⠀ │
-│Disk 1: 100% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││                                                                      ││  ⠀⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⢉⠻⠀ │
+│/path: 100% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││                                                                      ││  ⠀⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⢉⠻⠀ │
 │Root Folders:                                                          ││                                                                      ││  ⠀⣿⡇⠀⠀⠀⠀⠀⢀⣠⣴⣾⠿⠀⠀ │
 │/nfs: 204800.00 GB free                                                ││                                                                      ││  ⠀⢿⡇⠀⠀⣀⣤⣶⡿⠛⠉⠀⠀⠀⠀ │
 │                                                                       ││                                                                      ││  ⠀⠀⠰⠶⡿⠟⠋⠁⠀⠀⠀⠀⠀⠀⠀ │

src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__radarr_ui_renders_library_tab_error_popup.snap

@@ -9,7 +9,7 @@ expression: output
 │Radarr Version:  1.2.3.4           ╭  Keybindings  ──────────────────────────────────────────────────────────────────────────╮                 ││  ⠀⣠⣶⢶⣶⣤⣀⠀⠀⠀⠀⠀⠀⠀⠀ │
 │Uptime: 0d 00:00:44                │   Key                          Alt Key                      Description                 │━━━━━━━━━━━━━━━━━││  ⠀⣿⡇⠀⠈⠙⠻⢿⣶⣤⡀⠀⠀⠀⠀ │
 │Storage:                           │=> a                                                         add                         │                 ││  ⠀⣿⡇⠀⠀⠀⠀⠀⠈⠙⠻⢷⣦⡄⠀ │
-│Disk 1: 100% ━━━━━━━━━━━━━━━━━━━━━━│   e                                                         edit                        │                 ││  ⠀⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⢉⠻⠀ │
+│/path: 100% ━━━━━━━━━━━━━━━━━━━━━━━│   e                                                         edit                        │                 ││  ⠀⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⢉⠻⠀ │
 │Root Folders:                      │   m                                                         toggle monitoring           │                 ││  ⠀⣿⡇⠀⠀⠀⠀⠀⢀⣠⣴⣾⠿⠀⠀ │
 │/nfs: 204800.00 GB free            │   o                                                         sort                        │                 ││  ⠀⢿⡇⠀⠀⣀⣤⣶⡿⠛⠉⠀⠀⠀⠀ │
 │                                   │   del                                                       delete                      │                 ││  ⠀⠀⠰⠶⡿⠟⠋⠁⠀⠀⠀⠀⠀⠀⠀ │

src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__radarr_ui_renders_library_tab_with_error.snap

@@ -12,7 +12,7 @@ expression: output
 │Radarr Version:  1.2.3.4                                               ││Test Download Title                                                   ││  ⠀⣠⣶⢶⣶⣤⣀⠀⠀⠀⠀⠀⠀⠀⠀ │
 │Uptime: 0d 00:00:44                                                    ││50% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││  ⠀⣿⡇⠀⠈⠙⠻⢿⣶⣤⡀⠀⠀⠀⠀ │
 │Storage:                                                               ││                                                                      ││  ⠀⣿⡇⠀⠀⠀⠀⠀⠈⠙⠻⢷⣦⡄⠀ │
-│Disk 1: 100% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││                                                                      ││  ⠀⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⢉⠻⠀ │
+│/path: 100% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││                                                                      ││  ⠀⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⢉⠻⠀ │
 │Root Folders:                                                          ││                                                                      ││  ⠀⣿⡇⠀⠀⠀⠀⠀⢀⣠⣴⣾⠿⠀⠀ │
 │/nfs: 204800.00 GB free                                                ││                                                                      ││  ⠀⢿⡇⠀⠀⣀⣤⣶⡿⠛⠉⠀⠀⠀⠀ │
 │                                                                       ││                                                                      ││  ⠀⠀⠰⠶⡿⠟⠋⠁⠀⠀⠀⠀⠀⠀⠀ │

src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__sonarr_ui_renders_library_tab.snap

@@ -9,7 +9,7 @@ expression: output
 │Sonarr Version:  1.2.3.4                                               ││Test Download Title                                                   ││ ⠀⠀⠀⣠⣴⣶⣿⣿⣿⣿⣶⣦⣄⠀⠀⠀ │
 │Uptime: 0d 00:00:44                                                    ││50% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││ ⠀⣠⡀⠈⠻⣿⣿⣿⣿⣿⣿⠟⠁⢀⣀⠀ │
 │Storage:                                                               ││                                                                      ││ ⢰⣿⣿⣦⠐⠄⠉⠉⠉⠉⠠⠂⣰⣿⣿⡆ │
-│Disk 1: 100% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││                                                                      ││ ⣿⣿⣿⣿⡆⠀⣴⣿⣿⣦⠀⢰⣿⣿⣿⣿ │
+│/path: 100% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││                                                                      ││ ⣿⣿⣿⣿⡆⠀⣴⣿⣿⣦⠀⢰⣿⣿⣿⣿ │
 │Root Folders:                                                          ││                                                                      ││ ⣿⣿⣿⣿⡇⠀⠻⣿⣿⠟⠀⠸⣿⣿⣿⣿ │
 │/nfs: 204800.00 GB free                                                ││                                                                      ││ ⠸⣿⣿⠟⠠⠂⠀⢀⡀⠀⠐⠄⠻⣿⣿⠇ │
 │                                                                       ││                                                                      ││ ⠀⠙⠁⢀⣴⣾⣿⣿⣿⣿⣷⣦⡀⠈⠋⠀ │

src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__sonarr_ui_renders_library_tab_error_popup.snap

@@ -9,7 +9,7 @@ expression: output
 │Sonarr Version:  1.2.3.4           ╭  Keybindings  ──────────────────────────────────────────────────────────────────────────╮                 ││ ⠀⠀⠀⣠⣴⣶⣿⣿⣿⣿⣶⣦⣄⠀⠀⠀ │
 │Uptime: 0d 00:00:44                │   Key                          Alt Key                      Description                 │━━━━━━━━━━━━━━━━━││ ⠀⣠⡀⠈⠻⣿⣿⣿⣿⣿⣿⠟⠁⢀⣀⠀ │
 │Storage:                           │=> a                                                         add                         │                 ││ ⢰⣿⣿⣦⠐⠄⠉⠉⠉⠉⠠⠂⣰⣿⣿⡆ │
-│Disk 1: 100% ━━━━━━━━━━━━━━━━━━━━━━│   e                                                         edit                        │                 ││ ⣿⣿⣿⣿⡆⠀⣴⣿⣿⣦⠀⢰⣿⣿⣿⣿ │
+│/path: 100% ━━━━━━━━━━━━━━━━━━━━━━━│   e                                                         edit                        │                 ││ ⣿⣿⣿⣿⡆⠀⣴⣿⣿⣦⠀⢰⣿⣿⣿⣿ │
 │Root Folders:                      │   m                                                         toggle monitoring           │                 ││ ⣿⣿⣿⣿⡇⠀⠻⣿⣿⠟⠀⠸⣿⣿⣿⣿ │
 │/nfs: 204800.00 GB free            │   o                                                         sort                        │                 ││ ⠸⣿⣿⠟⠠⠂⠀⢀⡀⠀⠐⠄⠻⣿⣿⠇ │
 │                                   │   del                                                       delete                      │                 ││ ⠀⠙⠁⢀⣴⣾⣿⣿⣿⣿⣷⣦⡀⠈⠋⠀ │

src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__sonarr_ui_renders_library_tab_with_error.snap

@@ -12,7 +12,7 @@ expression: output
 │Sonarr Version:  1.2.3.4                                               ││Test Download Title                                                   ││ ⠀⠀⠀⣠⣴⣶⣿⣿⣿⣿⣶⣦⣄⠀⠀⠀ │
 │Uptime: 0d 00:00:44                                                    ││50% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││ ⠀⣠⡀⠈⠻⣿⣿⣿⣿⣿⣿⠟⠁⢀⣀⠀ │
 │Storage:                                                               ││                                                                      ││ ⢰⣿⣿⣦⠐⠄⠉⠉⠉⠉⠠⠂⣰⣿⣿⡆ │
-│Disk 1: 100% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││                                                                      ││ ⣿⣿⣿⣿⡆⠀⣴⣿⣿⣦⠀⢰⣿⣿⣿⣿ │
+│/path: 100% ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━││                                                                      ││ ⣿⣿⣿⣿⡆⠀⣴⣿⣿⣦⠀⢰⣿⣿⣿⣿ │
 │Root Folders:                                                          ││                                                                      ││ ⣿⣿⣿⣿⡇⠀⠻⣿⣿⠟⠀⠸⣿⣿⣿⣿ │
 │/nfs: 204800.00 GB free                                                ││                                                                      ││ ⠸⣿⣿⠟⠠⠂⠀⢀⡀⠀⠐⠄⠻⣿⣿⠇ │
 │                                                                       ││                                                                      ││ ⠀⠙⠁⢀⣴⣾⣿⣿⣿⣿⣷⣦⡀⠈⠋⠀ │

src/ui/sonarr_ui/mod.rs

@@ -1,5 +1,3 @@
-use std::{cmp, iter};
-
 #[cfg(test)]
 use crate::ui::ui_test_utils::test_utils::Utc;
 use blocklist::BlocklistUi;
@@ -18,8 +16,18 @@ use ratatui::{
   widgets::Paragraph,
 };
 use root_folders::RootFoldersUi;
+use std::{cmp, iter};
 use system::SystemUi;
 
+use super::{
+  DrawUi, draw_tabs,
+  styles::ManagarrStyle,
+  utils::{
+    borderless_block, layout_block, line_gauge_with_label, line_gauge_with_title, title_block,
+  },
+  widgets::loading_block::LoadingBlock,
+};
+use crate::ui::utils::{extract_monitored_disk_space_vec, extract_monitored_root_folders};
 use crate::{
   app::App,
   logos::SONARR_LOGO,
@@ -32,15 +40,6 @@ use crate::{
   utils::convert_to_gb,
 };
 
-use super::{
-  DrawUi, draw_tabs,
-  styles::ManagarrStyle,
-  utils::{
-    borderless_block, layout_block, line_gauge_with_label, line_gauge_with_title, title_block,
-  },
-  widgets::loading_block::LoadingBlock,
-};
-
 mod blocklist;
 mod downloads;
 mod history;
@@ -101,6 +100,8 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
       start_time,
       ..
     } = &app.data.sonarr_data;
+    let monitored_disk_space_vec = extract_monitored_disk_space_vec(app, disk_space_vec.clone());
+    let monitored_root_folders = extract_monitored_root_folders(app, root_folders.items.clone());
 
     let mut constraints = vec![
       Constraint::Length(1),
@@ -111,7 +112,7 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
     constraints.append(
       &mut iter::repeat_n(
         Constraint::Length(1),
-        disk_space_vec.len() + root_folders.items.len() + 1,
+        monitored_disk_space_vec.len() + monitored_root_folders.len() + 1,
       )
       .collect(),
     );
@@ -147,12 +148,18 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
     f.render_widget(uptime_paragraph, stat_item_areas[1]);
     f.render_widget(storage, stat_item_areas[2]);
 
-    for i in 0..disk_space_vec.len() {
+    for i in 0..monitored_disk_space_vec.len() {
       let DiskSpace {
+        path,
         free_space,
         total_space,
-      } = &disk_space_vec[i];
+        ..
-      let title = format!("Disk {}", i + 1);
+      } = &monitored_disk_space_vec[i];
+      let title = if let Some(path) = path {
+        path
+      } else {
+        &format!("Disk {}", i + 1)
+      };
       let ratio = if *total_space == 0 {
         0f64
       } else {
@@ -164,12 +171,12 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
       f.render_widget(space_gauge, stat_item_areas[i + 3]);
     }
 
-    f.render_widget(folders, stat_item_areas[disk_space_vec.len() + 3]);
+    f.render_widget(folders, stat_item_areas[monitored_disk_space_vec.len() + 3]);
 
-    for i in 0..root_folders.items.len() {
+    for i in 0..monitored_root_folders.len() {
       let RootFolder {
         path, free_space, ..
-      } = &root_folders.items[i];
+      } = &monitored_root_folders[i];
       let space: f64 = convert_to_gb(*free_space);
       let root_folder_space = Paragraph::new(format!("{path}: {space:.2} GB free"))
         .block(borderless_block())
@@ -177,7 +184,7 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
 
       f.render_widget(
         root_folder_space,
-        stat_item_areas[i + disk_space_vec.len() + 4],
+        stat_item_areas[i + monitored_disk_space_vec.len() + 4],
       )
     }
   } else {

src/ui/utils.rs

@@ -1,3 +1,5 @@
+use crate::app::App;
+use crate::models::servarr_models::{DiskSpace, RootFolder};
 use crate::ui::THEME;
 use crate::ui::styles::{
   ManagarrStyle, default_style, failure_style, primary_style, secondary_style,
@@ -7,6 +9,8 @@ use ratatui::layout::{Alignment, Constraint, Layout, Rect};
 use ratatui::style::{Style, Stylize};
 use ratatui::text::{Line, Span, Text};
 use ratatui::widgets::{Block, BorderType, Borders, LineGauge, ListItem, Paragraph, Wrap};
+use std::collections::{HashMap, HashSet};
+use std::path::{Path, PathBuf};
 
 #[cfg(test)]
 #[path = "utils_tests.rs"]
@@ -179,3 +183,120 @@ pub(super) fn decorate_peer_style(seeders: u64, leechers: u64, text: Text<'_>) -
     text.success()
   }
 }
+
+pub(super) fn extract_monitored_root_folders(
+  app: &App<'_>,
+  root_folders: Vec<RootFolder>,
+) -> Vec<RootFolder> {
+  let monitored_paths = app
+    .server_tabs
+    .get_active_config()
+    .as_ref()
+    .unwrap()
+    .monitored_storage_paths
+    .as_ref();
+
+  if let Some(monitored_paths) = monitored_paths
+    && !monitored_paths.is_empty()
+  {
+    let monitored_paths: Vec<PathBuf> = monitored_paths.iter().map(PathBuf::from).collect();
+
+    let mut collapsed_folders: HashMap<PathBuf, (RootFolder, Vec<String>)> = HashMap::new();
+    let mut unmatched_folders: Vec<RootFolder> = Vec::new();
+
+    for root_folder in root_folders {
+      let root_path = Path::new(&root_folder.path);
+
+      let matching_monitored_path = monitored_paths
+        .iter()
+        .filter(|mp| root_path.starts_with(mp))
+        .max_by_key(|mp| mp.components().count());
+
+      if let Some(monitored_path) = matching_monitored_path {
+        let subfolder_name = root_path
+          .strip_prefix(monitored_path)
+          .ok()
+          .and_then(|p| p.components().next())
+          .map(|c| c.as_os_str().to_string_lossy().to_string())
+          .unwrap_or_default();
+
+        collapsed_folders
+          .entry(monitored_path.clone())
+          .and_modify(|(_, subfolders)| {
+            if !subfolder_name.is_empty() && !subfolders.contains(&subfolder_name) {
+              subfolders.push(subfolder_name.clone());
+            }
+          })
+          .or_insert_with(|| {
+            let subfolders = if subfolder_name.is_empty() {
+              vec![]
+            } else {
+              vec![subfolder_name]
+            };
+            (root_folder.clone(), subfolders)
+          });
+      } else {
+        unmatched_folders.push(root_folder);
+      }
+    }
+
+    let mut result: Vec<RootFolder> = collapsed_folders
+      .into_iter()
+      .map(|(monitored_path, (mut root_folder, mut subfolders))| {
+        subfolders.sort();
+        let path_str = monitored_path.to_string_lossy();
+        root_folder.path = if subfolders.is_empty() {
+          path_str.to_string()
+        } else {
+          format!(
+            "{}/[{}]",
+            path_str.trim_end_matches('/'),
+            subfolders.join(",")
+          )
+        };
+        root_folder
+      })
+      .collect();
+
+    result.extend(unmatched_folders);
+    result.sort_by(|a, b| a.path.cmp(&b.path));
+    result
+  } else {
+    root_folders
+  }
+}
+
+pub(super) fn extract_monitored_disk_space_vec(
+  app: &App<'_>,
+  disk_space_vec: Vec<DiskSpace>,
+) -> Vec<DiskSpace> {
+  let monitored_paths = app
+    .server_tabs
+    .get_active_config()
+    .as_ref()
+    .unwrap()
+    .monitored_storage_paths
+    .as_ref();
+  if let Some(monitored_paths) = monitored_paths
+    && !monitored_paths.is_empty()
+  {
+    let monitored: HashSet<&str> = monitored_paths.iter().map(|s| s.as_str()).collect();
+    let mut seen_paths = HashSet::new();
+    let mut filtered_disk_space_vec = Vec::with_capacity(disk_space_vec.len());
+
+    for ds in disk_space_vec {
+      match ds.path.as_deref() {
+        None => filtered_disk_space_vec.push(ds),
+        Some(p) => {
+          if monitored.contains(p) && seen_paths.insert(p.to_owned()) {
+            filtered_disk_space_vec.push(ds)
+          }
+        }
+      }
+    }
+
+    filtered_disk_space_vec
+  } else {
+    disk_space_vec
+  }
+}

src/ui/utils_tests.rs

@@ -1,9 +1,12 @@
 #[cfg(test)]
 mod test {
+  use crate::app::{App, ServarrConfig};
+  use crate::models::servarr_models::{DiskSpace, RootFolder};
   use crate::ui::styles::{ManagarrStyle, default_style, failure_style, secondary_style};
   use crate::ui::utils::{
     borderless_block, centered_rect, convert_to_minutes_hours_days, decorate_peer_style,
-    get_width_from_percentage, layout_block, layout_block_bottom_border, layout_block_top_border,
+    extract_monitored_disk_space_vec, extract_monitored_root_folders, get_width_from_percentage,
+    layout_block, layout_block_bottom_border, layout_block_top_border,
     layout_block_top_border_with_title, layout_block_with_title, logo_block, style_block_highlight,
     style_log_list_item, title_block, title_block_centered, title_style, unstyled_title_block,
   };
@@ -278,6 +281,287 @@ mod test {
     }
   }
 
+  #[test]
+  fn test_extract_monitored_root_folders_collapses_subfolders() {
+    let mut app = App::test_default();
+    app.server_tabs.tabs[0].config = Some(ServarrConfig {
+      monitored_storage_paths: Some(vec!["/nfs".to_owned()]),
+      ..ServarrConfig::default()
+    });
+    let root_folders = vec![
+      RootFolder {
+        id: 1,
+        path: "/nfs/cartoons".to_string(),
+        accessible: true,
+        free_space: 100,
+        unmapped_folders: None,
+      },
+      RootFolder {
+        id: 2,
+        path: "/nfs/tv".to_string(),
+        accessible: true,
+        free_space: 100,
+        unmapped_folders: None,
+      },
+      RootFolder {
+        id: 3,
+        path: "/nfs/reality".to_string(),
+        accessible: true,
+        free_space: 100,
+        unmapped_folders: None,
+      },
+    ];
+
+    let monitored_root_folders = extract_monitored_root_folders(&app, root_folders);
+
+    assert_eq!(monitored_root_folders.len(), 1);
+    assert_eq!(monitored_root_folders[0].path, "/nfs/[cartoons,reality,tv]");
+    assert_eq!(monitored_root_folders[0].free_space, 100);
+  }
+
+  #[test]
+  fn test_extract_monitored_root_folders_uses_most_specific_monitored_path() {
+    let mut app = App::test_default();
+    app.server_tabs.tabs[0].config = Some(ServarrConfig {
+      monitored_storage_paths: Some(vec!["/nfs".to_owned(), "/".to_owned()]),
+      ..ServarrConfig::default()
+    });
+    let root_folders = vec![
+      RootFolder {
+        id: 1,
+        path: "/nfs/cartoons".to_string(),
+        accessible: true,
+        free_space: 100,
+        unmapped_folders: None,
+      },
+      RootFolder {
+        id: 2,
+        path: "/nfs/tv".to_string(),
+        accessible: true,
+        free_space: 100,
+        unmapped_folders: None,
+      },
+      RootFolder {
+        id: 3,
+        path: "/other/movies".to_string(),
+        accessible: true,
+        free_space: 200,
+        unmapped_folders: None,
+      },
+    ];
+
+    let monitored_root_folders = extract_monitored_root_folders(&app, root_folders);
+
+    assert_eq!(monitored_root_folders.len(), 2);
+    assert_eq!(monitored_root_folders[0].path, "/[other]");
+    assert_eq!(monitored_root_folders[0].free_space, 200);
+    assert_eq!(monitored_root_folders[1].path, "/nfs/[cartoons,tv]");
+    assert_eq!(monitored_root_folders[1].free_space, 100);
+  }
+
+  #[test]
+  fn test_extract_monitored_root_folders_preserves_unmatched_folders() {
+    let mut app = App::test_default();
+    app.server_tabs.tabs[0].config = Some(ServarrConfig {
+      monitored_storage_paths: Some(vec!["/nfs".to_owned()]),
+      ..ServarrConfig::default()
+    });
+    let root_folders = vec![
+      RootFolder {
+        id: 1,
+        path: "/nfs/tv".to_string(),
+        accessible: true,
+        free_space: 100,
+        unmapped_folders: None,
+      },
+      RootFolder {
+        id: 2,
+        path: "/other/movies".to_string(),
+        accessible: true,
+        free_space: 200,
+        unmapped_folders: None,
+      },
+    ];
+
+    let monitored_root_folders = extract_monitored_root_folders(&app, root_folders);
+
+    assert_eq!(monitored_root_folders.len(), 2);
+    assert_eq!(monitored_root_folders[0].path, "/nfs/[tv]");
+    assert_eq!(monitored_root_folders[1].path, "/other/movies");
+  }
+
+  #[test]
+  fn test_extract_monitored_root_folders_returns_all_when_monitored_storage_paths_is_empty() {
+    let mut app = App::test_default();
+    app.server_tabs.tabs[0].config = Some(ServarrConfig {
+      monitored_storage_paths: Some(vec![]),
+      ..ServarrConfig::default()
+    });
+    let root_folders = vec![
+      RootFolder {
+        id: 1,
+        path: "/nfs".to_string(),
+        accessible: true,
+        free_space: 10,
+        unmapped_folders: None,
+      },
+      RootFolder {
+        id: 2,
+        path: "/nfs/some/subpath".to_string(),
+        accessible: true,
+        free_space: 10,
+        unmapped_folders: None,
+      },
+    ];
+
+    let monitored_root_folders = extract_monitored_root_folders(&app, root_folders.clone());
+
+    assert_eq!(monitored_root_folders, root_folders);
+  }
+
+  #[test]
+  fn test_extract_monitored_root_folders_returns_all_when_monitored_storage_paths_is_none() {
+    let app = App::test_default();
+    let root_folders = vec![
+      RootFolder {
+        id: 1,
+        path: "/nfs".to_string(),
+        accessible: true,
+        free_space: 10,
+        unmapped_folders: None,
+      },
+      RootFolder {
+        id: 2,
+        path: "/nfs/some/subpath".to_string(),
+        accessible: true,
+        free_space: 10,
+        unmapped_folders: None,
+      },
+    ];
+
+    let monitored_root_folders = extract_monitored_root_folders(&app, root_folders.clone());
+
+    assert_eq!(monitored_root_folders, root_folders);
+  }
+
+  #[test]
+  fn test_extract_monitored_root_folders_exact_match_shows_no_brackets() {
+    let mut app = App::test_default();
+    app.server_tabs.tabs[0].config = Some(ServarrConfig {
+      monitored_storage_paths: Some(vec!["/nfs/tv".to_owned()]),
+      ..ServarrConfig::default()
+    });
+    let root_folders = vec![RootFolder {
+      id: 1,
+      path: "/nfs/tv".to_string(),
+      accessible: true,
+      free_space: 100,
+      unmapped_folders: None,
+    }];
+
+    let monitored_root_folders = extract_monitored_root_folders(&app, root_folders);
+
+    assert_eq!(monitored_root_folders.len(), 1);
+    assert_eq!(monitored_root_folders[0].path, "/nfs/tv");
+  }
+
+  #[test]
+  fn test_extract_monitored_disk_space_vec() {
+    let mut app = App::test_default();
+    app.server_tabs.tabs[0].config = Some(ServarrConfig {
+      monitored_storage_paths: Some(vec!["/data".to_owned(), "/downloads".to_owned()]),
+      ..ServarrConfig::default()
+    });
+    let disk_space = DiskSpace {
+      path: Some("/data".to_string()),
+      free_space: 10,
+      total_space: 1000,
+    };
+    let disk_space_2 = DiskSpace {
+      path: Some("/downloads".to_string()),
+      free_space: 100,
+      total_space: 10000,
+    };
+    let disk_space_with_empty_path = DiskSpace {
+      path: None,
+      free_space: 10,
+      total_space: 1000,
+    };
+    let disk_spaces = vec![
+      disk_space.clone(),
+      disk_space_with_empty_path.clone(),
+      DiskSpace {
+        path: Some("/downloads/".to_string()),
+        free_space: 100,
+        total_space: 10000,
+      },
+      disk_space_2.clone(),
+    ];
+
+    let monitored_disk_space = extract_monitored_disk_space_vec(&app, disk_spaces);
+
+    assert_eq!(
+      monitored_disk_space,
+      vec![disk_space, disk_space_with_empty_path, disk_space_2]
+    );
+  }
+
+  #[test]
+  fn test_extract_monitored_disk_space_vec_returns_all_when_monitored_storage_paths_is_empty() {
+    let mut app = App::test_default();
+    app.server_tabs.tabs[0].config = Some(ServarrConfig {
+      monitored_storage_paths: Some(Vec::new()),
+      ..ServarrConfig::default()
+    });
+    let disk_spaces = vec![
+      DiskSpace {
+        path: Some("/nfs".to_string()),
+        free_space: 10,
+        total_space: 1000,
+      },
+      DiskSpace {
+        path: None,
+        free_space: 10,
+        total_space: 1000,
+      },
+      DiskSpace {
+        path: Some("/nfs/some/subpath".to_string()),
+        free_space: 10,
+        total_space: 1000,
+      },
+    ];
+
+    let monitored_disk_space = extract_monitored_disk_space_vec(&app, disk_spaces.clone());
+
+    assert_eq!(monitored_disk_space, disk_spaces);
+  }
+
+  #[test]
+  fn test_extract_monitored_disk_space_vec_returns_all_when_monitored_storage_paths_is_none() {
+    let app = App::test_default();
+    let disk_spaces = vec![
+      DiskSpace {
+        path: Some("/nfs".to_string()),
+        free_space: 10,
+        total_space: 1000,
+      },
+      DiskSpace {
+        path: None,
+        free_space: 10,
+        total_space: 1000,
+      },
+      DiskSpace {
+        path: Some("/nfs/some/subpath".to_string()),
+        free_space: 10,
+        total_space: 1000,
+      },
+    ];
+
+    let monitored_disk_space = extract_monitored_disk_space_vec(&app, disk_spaces.clone());
+
+    assert_eq!(monitored_disk_space, disk_spaces);
+  }
+
   enum PeerStyle {
     Failure,
     Warning,