From c8bbf5850c366c05d49351d52b8c04876e2c3c74 Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Wed, 4 Sep 2019 23:45:19 -0400 Subject: Set up more file hierarchy. --- src/main.rs | 47 +++++++++++++++++++++++------------------------ src/widgets/cpu.rs | 0 src/widgets/disks.rs | 0 src/widgets/mem.rs | 0 src/widgets/network.rs | 0 src/widgets/processes.rs | 0 src/widgets/temp.rs | 0 tests/basic_tests.rs | 0 8 files changed, 23 insertions(+), 24 deletions(-) create mode 100644 src/widgets/cpu.rs create mode 100644 src/widgets/disks.rs create mode 100644 src/widgets/mem.rs create mode 100644 src/widgets/network.rs create mode 100644 src/widgets/processes.rs create mode 100644 src/widgets/temp.rs create mode 100644 tests/basic_tests.rs diff --git a/src/main.rs b/src/main.rs index 626085db..c5c3165b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,3 @@ -use std::collections::BTreeMap; use sysinfo::{ProcessExt, ProcessStatus, RefreshKind, System, SystemExt}; // TODO: Fix this - CPU Up, and CPU Down! @@ -48,32 +47,32 @@ fn draw_sorted_processes(sorting_method: ProcessSorting, reverse_order: bool, sy let mut process_vector: Vec = process_hashmap.iter().map(|(_, process)| process.clone()).collect(); match sorting_method { - ProcessSorting::CPU => process_vector.sort_by(|a, b| { - let a_usage = a.cpu_usage(); - let b_usage = b.cpu_usage(); - - if a_usage > b_usage { - if reverse_order { - std::cmp::Ordering::Less - } else { - std::cmp::Ordering::Greater - } - } else if a_usage < b_usage { - if reverse_order { - std::cmp::Ordering::Greater - } else { - std::cmp::Ordering::Less - } + ProcessSorting::CPU => process_vector.sort_by(|a, b| { + let a_usage = a.cpu_usage(); + let b_usage = b.cpu_usage(); + + if a_usage > b_usage { + if reverse_order { + std::cmp::Ordering::Less + } else { + std::cmp::Ordering::Greater + } + } else if a_usage < b_usage { + if reverse_order { + std::cmp::Ordering::Greater } else { - std::cmp::Ordering::Equal + std::cmp::Ordering::Less } - }), - ProcessSorting::MEM => {} - ProcessSorting::PID => {} - ProcessSorting::Status => {} - } + } else { + std::cmp::Ordering::Equal + } + }), + ProcessSorting::MEM => {} + ProcessSorting::PID => {} + ProcessSorting::Status => {} + } - let mut formatted_vector : Vec = Vec::new(); + let mut formatted_vector: Vec = Vec::new(); for process in &mut process_vector { formatted_vector.push(ProcessInfo { cpu_usage: process.cpu_usage(), diff --git a/src/widgets/cpu.rs b/src/widgets/cpu.rs new file mode 100644 index 00000000..e69de29b diff --git a/src/widgets/disks.rs b/src/widgets/disks.rs new file mode 100644 index 00000000..e69de29b diff --git a/src/widgets/mem.rs b/src/widgets/mem.rs new file mode 100644 index 00000000..e69de29b diff --git a/src/widgets/network.rs b/src/widgets/network.rs new file mode 100644 index 00000000..e69de29b diff --git a/src/widgets/processes.rs b/src/widgets/processes.rs new file mode 100644 index 00000000..e69de29b diff --git a/src/widgets/temp.rs b/src/widgets/temp.rs new file mode 100644 index 00000000..e69de29b diff --git a/tests/basic_tests.rs b/tests/basic_tests.rs new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3