simplify disk os-specific code

src/app/data_harvester.rs

@@ -407,20 +407,7 @@ impl DataCollector {
     #[inline]
     fn update_disks(&mut self) {
         if self.widgets_to_harvest.use_disk {
-            cfg_if::cfg_if! {
-                if #[cfg(any(target_os = "freebsd", target_os = "linux", target_os = "macos"))] {
-                    let disk_filter = &self.filters.disk_filter;
-                    let mount_filter = &self.filters.mount_filter;
-                    self.data.disks = disks::get_disk_usage(disk_filter, mount_filter).ok();
-                } else {
-                    self.data.disks = Some(disks::get_disk_usage(
-                        &self.sys,
-                        &self.filters.disk_filter,
-                        &self.filters.mount_filter,
-                    ));
-                }
-            }
-
+            self.data.disks = disks::get_disk_usage(self).ok();
             self.data.io = disks::get_io_usage().ok();
         }
     }

src/app/data_harvester/disks/freebsd.rs

@@ -5,7 +5,8 @@ use std::io;
 use serde::Deserialize;
 
 use super::{keep_disk_entry, DiskHarvest, IoHarvest};
-use crate::{app::Filter, data_harvester::deserialize_xo, utils::error};
+
+use crate::{app::data_harvester::DataCollector, data_harvester::deserialize_xo, utils::error};
 
 #[derive(Deserialize, Debug, Default)]
 #[serde(rename_all = "kebab-case")]
@@ -35,9 +36,9 @@ pub fn get_io_usage() -> error::Result<IoHarvest> {
     Ok(io_harvest)
 }
 
-pub fn get_disk_usage(
-    disk_filter: &Option<Filter>, mount_filter: &Option<Filter>,
-) -> error::Result<Vec<DiskHarvest>> {
+pub fn get_disk_usage(collector: &DataCollector) -> error::Result<Vec<DiskHarvest>> {
+    let disk_filter = &collector.filters.disk_filter;
+    let mount_filter = &collector.filters.mount_filter;
     let vec_disks: Vec<DiskHarvest> = get_disk_info().map(|storage_system_information| {
         storage_system_information
             .filesystem

src/app/data_harvester/disks/other.rs

@@ -2,15 +2,16 @@
 
 use sysinfo::{DiskExt, System, SystemExt};
 
-use crate::app::filter::Filter;
+use crate::app::data_harvester::DataCollector;
 
 use super::{keep_disk_entry, DiskHarvest};
 
-pub(crate) fn get_disk_usage(
-    sys: &System, disk_filter: &Option<Filter>, mount_filter: &Option<Filter>,
-) -> Vec<DiskHarvest> {
-    let disks = sys.disks();
-    disks
+pub(crate) fn get_disk_usage(collector: &DataCollector) -> anyhow::Result<Vec<DiskHarvest>> {
+    let disks = collector.sys.disks();
+    let disk_filter = &collector.filters.disk_filter;
+    let mount_filter = &collector.filters.mount_filter;
+
+    Ok(disks
         .iter()
         .filter_map(|disk| {
             let name = {
@@ -48,5 +49,5 @@ pub(crate) fn get_disk_usage(
                 None
             }
         })
-        .collect()
+        .collect())
 }

src/app/data_harvester/disks/unix.rs

@@ -25,12 +25,12 @@ cfg_if::cfg_if! {
 }
 
 use super::{keep_disk_entry, DiskHarvest};
-use crate::app::Filter;
+use crate::app::data_harvester::DataCollector;
 
 /// Returns the disk usage of the mounted (and for now, physical) disks.
-pub fn get_disk_usage(
-    disk_filter: &Option<Filter>, mount_filter: &Option<Filter>,
-) -> anyhow::Result<Vec<DiskHarvest>> {
+pub fn get_disk_usage(collector: &DataCollector) -> anyhow::Result<Vec<DiskHarvest>> {
+    let disk_filter = &collector.filters.disk_filter;
+    let mount_filter = &collector.filters.mount_filter;
     let mut vec_disks: Vec<DiskHarvest> = Vec::new();
 
     for partition in physical_partitions()? {

src/app/data_harvester/disks/windows.rs

@@ -4,8 +4,8 @@ use itertools::Itertools;
 use sysinfo::{DiskExt, System, SystemExt};
 
 use super::{keep_disk_entry, DiskHarvest};
-use crate::app::data_harvester::disks::IoCounters;
-use crate::app::filter::Filter;
+
+use crate::app::data_harvester::{disks::IoCounters, DataCollector};
 
 mod bindings;
 use bindings::*;
@@ -26,11 +26,12 @@ pub(crate) fn io_stats() -> anyhow::Result<Vec<anyhow::Result<IoCounters>>> {
         .collect::<Vec<_>>())
 }
 
-pub(crate) fn get_disk_usage(
-    sys: &System, disk_filter: &Option<Filter>, mount_filter: &Option<Filter>,
-) -> Vec<DiskHarvest> {
-    let disks = sys.disks();
-    disks
+pub(crate) fn get_disk_usage(collector: &DataCollector) -> anyhow::Result<Vec<DiskHarvest>> {
+    let disks = collector.sys.disks();
+    let disk_filter = &collector.filters.disk_filter;
+    let mount_filter = &collector.filters.mount_filter;
+
+    Ok(disks
         .iter()
         .filter_map(|disk| {
             let name = {
@@ -71,5 +72,5 @@ pub(crate) fn get_disk_usage(
                 None
             }
         })
-        .collect()
+        .collect())
 }