bug: fix issues with macos and windows during refactor

src/app.rs

@@ -11,7 +11,7 @@ use unicode_width::{UnicodeWidthChar, UnicodeWidthStr};
 use typed_builder::*;
 
 use data_farmer::*;
-use data_harvester::{processes, temperature};
+use data_harvester::temperature;
 use layout_manager::*;
 pub use states::*;
 
@@ -132,7 +132,7 @@ pub struct App {
 
     #[cfg(target_family = "unix")]
     #[builder(default, setter(skip))]
-    pub user_table: processes::UserTable,
+    pub user_table: data_harvester::processes::UserTable,
 
     pub cpu_state: CpuState,
     pub mem_state: MemState,

src/app/data_harvester/processes/macos.rs

@@ -86,6 +86,10 @@ pub fn get_process_data(
         };
 
         let disk_usage = process_val.disk_usage();
+        let process_state = {
+            let ps = process_val.status();
+            (ps.to_string(), convert_process_status_to_char(ps))
+        };
         process_vector.push(ProcessHarvest {
             pid: process_val.pid().as_u32() as _,
             parent_pid: process_val.parent().map(|p| p.as_u32() as _),
@@ -102,16 +106,15 @@ pub fn get_process_data(
             write_bytes_per_sec: disk_usage.written_bytes,
             total_read_bytes: disk_usage.total_read_bytes,
             total_write_bytes: disk_usage.total_written_bytes,
-            process_state: process_val.status().to_string(),
-            process_state_char: convert_process_status_to_char(process_val.status()),
+            process_state,
             uid: process_val.uid,
         });
     }
 
     let unknown_state = ProcessStatus::Unknown(0).to_string();
     let cpu_usage_unknown_pids: Vec<i32> = process_vector
         .iter()
-        .filter(|process| process.process_state == unknown_state)
+        .filter(|process| process.process_state.0 == unknown_state)
         .map(|process| process.pid)
         .collect();
     let cpu_usages = get_macos_process_cpu_usage(&cpu_usage_unknown_pids)?;

src/app/data_harvester/processes/mod.rs

@@ -23,8 +23,6 @@ cfg_if::cfg_if! {
     }
 }
 
-use std::borrow::Cow;
-
 use crate::Pid;
 
 #[derive(Debug, Clone, Default)]
@@ -71,7 +69,7 @@ pub struct ProcessHarvest {
 
     /// This is the process' user. This is only used on Unix platforms.
     #[cfg(target_family = "unix")]
-    pub user: Cow<'static, str>,
+    pub user: std::borrow::Cow<'static, str>,
     // TODO: Additional fields
     // pub rss_kb: u64,
     // pub virt_kb: u64,

src/app/data_harvester/processes/windows.rs

@@ -55,6 +55,7 @@ pub fn get_process_data(
         };
 
         let disk_usage = process_val.disk_usage();
+        let process_state = (process_val.status().to_string(), 'R');
         process_vector.push(ProcessHarvest {
             pid: process_val.pid().as_u32() as _,
             parent_pid: process_val.parent().map(|p| p.as_u32() as _),
@@ -71,8 +72,7 @@ pub fn get_process_data(
             write_bytes_per_sec: disk_usage.written_bytes,
             total_read_bytes: disk_usage.total_read_bytes,
             total_write_bytes: disk_usage.total_written_bytes,
-            process_state: process_val.status().to_string(),
-            process_state_char: 'R',
+            process_state,
         });
     }
 

src/app/widgets/process_widget.rs

@@ -235,11 +235,14 @@ impl ProcWidgetColumn {
                 }
             }
             ProcWidgetColumn::User => {
-                data.sort_by_cached_key(|p| p.name.to_lowercase());
-                if sort_descending {
-                    data.sort_by_cached_key(|p| Reverse(p.user.to_lowercase()));
-                } else {
-                    data.sort_by_cached_key(|p| p.user.to_lowercase());
+                #[cfg(target_family = "unix")]
+                {
+                    data.sort_by_cached_key(|p| p.name.to_lowercase());
+                    if sort_descending {
+                        data.sort_by_cached_key(|p| Reverse(p.user.to_lowercase()));
+                    } else {
+                        data.sort_by_cached_key(|p| p.user.to_lowercase());
+                    }
                 }
             }
         }