hoist out get_disk_usage

ClementTsang · ClementTsang · Apr 10, 2023 · Mar 9, 2023 · Mar 11, 2023 · Mar 14, 2023
commit 7f0c6697afe4b70b71d3c2bbea53a64111a09239
diff --git a/src/app/data_harvester/disks.rs b/src/app/data_harvester/disks.rs
@@ -11,15 +11,12 @@ cfg_if::cfg_if! {
     } else if #[cfg(target_os = "windows")] {
         mod windows;
         pub use self::windows::*;
-
-        mod system;
-        pub use self::system::get_io_usage;
     } else if #[cfg(target_os = "linux")] {
-        mod system;
-        pub use self::system::*;
+        mod unix;
+        pub use self::unix::*;
     } else if #[cfg(target_os = "macos")] {
-        mod system;
-        pub use self::system::*;
+        mod unix;
+        pub use self::unix::*;
     }
     // TODO: Add dummy impls here for other OSes?
 }
@@ -43,6 +40,25 @@ pub struct IoData {
 
 pub type IoHarvest = HashMap<String, Option<IoData>>;
 
+/// Returns the I/O usage of certain mount points.
+pub fn get_io_usage() -> anyhow::Result<IoHarvest> {
+    let mut io_hash: HashMap<String, Option<IoData>> = HashMap::new();
+
+    for io in io_stats()?.into_iter().flatten() {
+        let mount_point = io.device_name().to_string_lossy();
+
+        io_hash.insert(
+            mount_point.to_string(),
+            Some(IoData {
+                read_bytes: io.read_bytes(),
+                write_bytes: io.write_bytes(),
+            }),
+        );
+    }
+
+    Ok(io_hash)
+}
+
 /// Whether to keep the current disk entry given the filters, disk name, and disk mount.
 /// Precedence ordering in the case where name and mount filters disagree, "allow"
 /// takes precedence over "deny".

diff --git a/src/app/data_harvester/disks/system/macos/mod.rs b/src/app/data_harvester/disks/system/macos/mod.rs
diff --git a/src/app/data_harvester/disks/system.rs → src/app/data_harvester/disks/unix.rs b/src/app/data_harvester/disks/system.rs → src/app/data_harvester/disks/unix.rs
@@ -1,7 +1,6 @@
 //! Disk stats for Unix-like systems that aren't supported through other means.
 
 mod file_systems;
-use std::collections::HashMap;
 
 use file_systems::*;
 
@@ -11,44 +10,22 @@ use usage::*;
 cfg_if::cfg_if! {
     if #[cfg(target_os = "linux")] {
         mod linux;
-        use linux::*;
+        pub use linux::*;
     } else if #[cfg(target_os = "macos")] {
-        mod unix;
-        use unix::*;
+        mod other;
+        use other::*;
 
         mod macos;
-        use macos::*;
-    } else if #[cfg(target_os = "windows")] {
-        mod windows;
-        use windows::*;
+        pub use macos::*;
     } else {
-        mod unix;
-        use unix::*;
+        mod other;
+        use other::*;
     }
 }
 
-use super::{keep_disk_entry, DiskHarvest, IoData, IoHarvest};
+use super::{keep_disk_entry, DiskHarvest};
 use crate::app::Filter;
 
-/// Returns the I/O usage of certain mount points.
-pub fn get_io_usage() -> anyhow::Result<IoHarvest> {
-    let mut io_hash: HashMap<String, Option<IoData>> = HashMap::new();
-
-    for io in io_stats()?.into_iter().flatten() {
-        let mount_point = io.device_name().to_string_lossy();
-
-        io_hash.insert(
-            mount_point.to_string(),
-            Some(IoData {
-                read_bytes: io.read_bytes(),
-                write_bytes: io.write_bytes(),
-            }),
-        );
-    }
-
-    Ok(io_hash)
-}
-
 /// 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>,

diff --git a/...ta_harvester/disks/system/file_systems.rs → ...data_harvester/disks/unix/file_systems.rs b/...ta_harvester/disks/system/file_systems.rs → ...data_harvester/disks/unix/file_systems.rs
diff --git a/...rvester/disks/system/linux/io_counters.rs → ...harvester/disks/unix/linux/io_counters.rs b/...rvester/disks/system/linux/io_counters.rs → ...harvester/disks/unix/linux/io_counters.rs
diff --git a/.../data_harvester/disks/system/linux/mod.rs → ...pp/data_harvester/disks/unix/linux/mod.rs b/.../data_harvester/disks/system/linux/mod.rs → ...pp/data_harvester/disks/unix/linux/mod.rs
@@ -2,4 +2,4 @@ mod partition;
 pub(crate) use partition::*;
 
 mod io_counters;
-pub(crate) use io_counters::*;
+pub use io_counters::*;
diff --git a/...harvester/disks/system/linux/partition.rs → ...a_harvester/disks/unix/linux/partition.rs b/...harvester/disks/system/linux/partition.rs → ...a_harvester/disks/unix/linux/partition.rs
@@ -12,7 +12,7 @@ use std::{
 
 use anyhow::bail;
 
-use crate::app::data_harvester::disks::system::{FileSystem, Usage};
+use crate::app::data_harvester::disks::unix::{FileSystem, Usage};
 
 /// Representation of partition details. Based on [`heim`](https://github.com/heim-rs/heim/tree/master).
 pub(crate) struct Partition {

diff --git a/...rvester/disks/system/macos/io_counters.rs → ...harvester/disks/unix/macos/io_counters.rs b/...rvester/disks/system/macos/io_counters.rs → ...harvester/disks/unix/macos/io_counters.rs
diff --git a/...ta_harvester/disks/system/macos/io_kit.rs → ...data_harvester/disks/unix/macos/io_kit.rs b/...ta_harvester/disks/system/macos/io_kit.rs → ...data_harvester/disks/unix/macos/io_kit.rs
diff --git a/...ter/disks/system/macos/io_kit/bindings.rs → ...ester/disks/unix/macos/io_kit/bindings.rs b/...ter/disks/system/macos/io_kit/bindings.rs → ...ester/disks/unix/macos/io_kit/bindings.rs
diff --git a/...ter/disks/system/macos/io_kit/io_disks.rs → ...ester/disks/unix/macos/io_kit/io_disks.rs b/...ter/disks/system/macos/io_kit/io_disks.rs → ...ester/disks/unix/macos/io_kit/io_disks.rs
diff --git a/.../disks/system/macos/io_kit/io_iterator.rs → ...er/disks/unix/macos/io_kit/io_iterator.rs b/.../disks/system/macos/io_kit/io_iterator.rs → ...er/disks/unix/macos/io_kit/io_iterator.rs
diff --git a/...er/disks/system/macos/io_kit/io_object.rs → ...ster/disks/unix/macos/io_kit/io_object.rs b/...er/disks/system/macos/io_kit/io_object.rs → ...ster/disks/unix/macos/io_kit/io_object.rs
diff --git a/src/app/data_harvester/disks/unix/macos/mod.rs b/src/app/data_harvester/disks/unix/macos/mod.rs
@@ -0,0 +1,4 @@
+mod io_counters;
+pub use io_counters::*;
+
+mod io_kit;
diff --git a/...a_harvester/disks/system/unix/bindings.rs → ...ta_harvester/disks/unix/other/bindings.rs b/...a_harvester/disks/system/unix/bindings.rs → ...ta_harvester/disks/unix/other/bindings.rs
diff --git a/...p/data_harvester/disks/system/unix/mod.rs → ...pp/data_harvester/disks/unix/other/mod.rs b/...p/data_harvester/disks/system/unix/mod.rs → ...pp/data_harvester/disks/unix/other/mod.rs
diff --git a/..._harvester/disks/system/unix/partition.rs → ...a_harvester/disks/unix/other/partition.rs b/..._harvester/disks/system/unix/partition.rs → ...a_harvester/disks/unix/other/partition.rs
diff --git a/src/app/data_harvester/disks/system/usage.rs → src/app/data_harvester/disks/unix/usage.rs b/src/app/data_harvester/disks/system/usage.rs → src/app/data_harvester/disks/unix/usage.rs