add windows implementation

ClementTsang · ClementTsang · Apr 10, 2023 · Mar 9, 2023 · Mar 11, 2023 · Mar 14, 2023
commit 0765343879de4ee1903abcef30f27d4686b66ea1
diff --git a/Cargo.toml b/Cargo.toml
@@ -116,6 +116,10 @@ mach2 = "0.4.1"
 [target.'cfg(target_os = "windows")'.dependencies]
 windows = { version = "0.48.0", features = [
     "Win32_Foundation",
+    "Win32_Security",
+    "Win32_Storage_FileSystem",
+    "Win32_System_IO",
+    "Win32_System_Ioctl",
     "Win32_System_ProcessStatus",
     "Win32_System_Threading",
 ] }

diff --git a/src/app/data_farmer.rs b/src/app/data_farmer.rs
@@ -16,8 +16,6 @@
 use std::{collections::BTreeMap, time::Instant, vec::Vec};
 
 use fxhash::FxHashMap;
-use once_cell::sync::Lazy;
-use regex::Regex;
 
 #[cfg(feature = "battery")]
 use crate::data_harvester::batteries;
@@ -317,23 +315,43 @@ impl DataCollection {
         &mut self, disks: Vec<disks::DiskHarvest>, io: disks::IoHarvest, harvested_time: Instant,
     ) {
         // TODO: [PO] To implement
-
         let time_since_last_harvest = harvested_time
             .duration_since(self.current_instant)
             .as_secs_f64();
 
         for (itx, device) in disks.iter().enumerate() {
-            if let Some(trim) = device.name.split('/').last() {
-                let io_device = if cfg!(target_os = "macos") {
-                    // Must trim one level further for macOS!
-                    static DISK_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"disk\d+").unwrap());
-                    if let Some(disk_trim) = DISK_REGEX.find(trim) {
-                        io.get(disk_trim.as_str())
+            let checked_name = {
+                cfg_if::cfg_if! {
+                    if #[cfg(target_os = "windows")] {
+                        match &device.volume_name {
+                            Some(volume_name) => Some(volume_name.as_str()),
+                            None => device.name.split('/').last(),
+                        }
                     } else {
-                        None
+                        device.name.split('/').last()
+                    }
+                }
+            };
+
+            if let Some(checked_name) = checked_name {
+                let io_device = {
+                    cfg_if::cfg_if! {
+                        if #[cfg(target_os = "macos")] {
+                            use once_cell::sync::Lazy;
+                            use regex::Regex;
+
+                            // Must trim one level further for macOS!
+                            static DISK_REGEX: Lazy<Regex> =
+                                Lazy::new(|| Regex::new(r"disk\d+").unwrap());
+                            if let Some(disk_trim) = DISK_REGEX.find(trim) {
+                                io.get(disk_trim.as_str())
+                            } else {
+                                None
+                            }
+                        } else {
+                            io.get(checked_name)
+                        }
                     }
-                } else {
-                    io.get(trim)
                 };
 
                 if let Some(io_device) = io_device {

diff --git a/src/app/data_harvester.rs b/src/app/data_harvester.rs
@@ -171,15 +171,24 @@ impl DataCollector {
             }
         }
 
+        // Sysinfo-related list refreshing.
         if self.widgets_to_harvest.use_net {
             self.sys.refresh_networks_list();
         }
+
         if self.widgets_to_harvest.use_temp {
             self.sys.refresh_components_list();
         }
+
         #[cfg(target_os = "windows")]
-        if self.widgets_to_harvest.use_proc {
-            self.sys.refresh_users_list();
+        {
+            if self.widgets_to_harvest.use_proc {
+                self.sys.refresh_users_list();
+            }
+
+            if self.widgets_to_harvest.use_disk {
+                self.sys.refresh_disks_list();
+            }
         }
 
         self.update_data();
@@ -261,6 +270,9 @@ impl DataCollector {
 
         #[cfg(target_os = "windows")]
         if self.widgets_to_harvest.use_disk {
+            if refresh_start.duration_since(self.last_collection_time) > LIST_REFRESH_TIME {
+                self.sys.refresh_disks_list();
+            }
             self.sys.refresh_disks();
         }
     }

diff --git a/src/app/data_harvester/disks.rs b/src/app/data_harvester/disks.rs
@@ -27,6 +27,10 @@ pub struct DiskHarvest {
     pub name: String,
     pub mount_point: String,
 
+    /// Windows also contains an additional volume name field.
+    #[cfg(target_os = "windows")]
+    pub volume_name: Option<String>,
+
     // TODO: Maybe unify all these?
     pub free_space: Option<u64>,
     pub used_space: Option<u64>,

diff --git a/src/app/data_harvester/disks/unix/linux/partition.rs b/src/app/data_harvester/disks/unix/linux/partition.rs
@@ -49,7 +49,7 @@ impl Partition {
                 if path.is_absolute() {
                     path.into_os_string()
                         .into_string()
-                        .unwrap_or_else(|_| "Name unavailable".to_string())
+                        .unwrap_or_else(|_| "Name Unavailable".to_string())
                 } else {
                     let mut combined_path = std::path::PathBuf::new();
                     combined_path.push(device);
@@ -61,7 +61,7 @@ impl Partition {
                         canon_path
                             .into_os_string()
                             .into_string()
-                            .unwrap_or_else(|_| "Name unavailable".to_string())
+                            .unwrap_or_else(|_| "Name Unavailable".to_string())
                     } else {
                         device.to_owned()
                     }
@@ -70,7 +70,7 @@ impl Partition {
                 device.to_owned()
             }
         } else {
-            "Name unavailable".to_string()
+            "Name Unavailable".to_string()
         }
     }
 

diff --git a/src/app/data_harvester/disks/windows.rs b/src/app/data_harvester/disks/windows.rs
@@ -1,5 +1,6 @@
 //! Disk stats via sysinfo.
 
+use itertools::Itertools;
 use sysinfo::{DiskExt, System, SystemExt};
 
 use super::{keep_disk_entry, DiskHarvest};
@@ -11,7 +12,18 @@ use bindings::*;
 
 /// Returns I/O stats.
 pub(crate) fn io_stats() -> anyhow::Result<Vec<anyhow::Result<IoCounters>>> {
-    Ok(vec![])
+    let volume_io = all_volume_io()?;
+
+    Ok(volume_io
+        .into_iter()
+        .map_ok(|(performance, volume_name)| {
+            let name = volume_name;
+            let read_bytes = performance.BytesRead as u64;
+            let write_bytes = performance.BytesWritten as u64;
+
+            IoCounters::new(name, read_bytes, write_bytes)
+        })
+        .collect::<Vec<_>>())
 }
 
 pub(crate) fn get_disk_usage(
@@ -25,11 +37,11 @@ pub(crate) fn get_disk_usage(
                 let name = disk.name();
 
                 if name.is_empty() {
-                    "Name unavailable".to_string()
+                    "No Name".to_string()
                 } else {
                     name.to_os_string()
                         .into_string()
-                        .unwrap_or_else(|_| "Name unavailable".to_string())
+                        .unwrap_or_else(|_| "Name Unavailable".to_string())
                 }
             };
 
@@ -38,7 +50,9 @@ pub(crate) fn get_disk_usage(
                 .as_os_str()
                 .to_os_string()
                 .into_string()
-                .unwrap_or_else(|_| "Mount unavailable".to_string());
+                .unwrap_or_else(|_| "Mount Unavailable".to_string());
+
+            let volume_name = volume_name_from_mount(&mount_point).ok();
 
             if keep_disk_entry(&name, &mount_point, disk_filter, mount_filter) {
                 let free_space = disk.available_space();
@@ -48,6 +62,7 @@ pub(crate) fn get_disk_usage(
                 Some(DiskHarvest {
                     name,
                     mount_point,
+                    volume_name,
                     free_space: Some(free_space),
                     used_space: Some(used_space),
                     total_space: Some(total_space),