summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClementTsang <clementjhtsang@gmail.com>2019-09-04 23:45:19 -0400
committerClementTsang <clementjhtsang@gmail.com>2019-09-04 23:45:19 -0400
commitc8bbf5850c366c05d49351d52b8c04876e2c3c74 (patch)
tree7890572042b5f9916a6834a485f810a7fffb2ec0
parent2c53ab09a9b92682ce4191321f8a46620e6241b4 (diff)
Set up more file hierarchy.
-rw-r--r--src/main.rs47
-rw-r--r--src/widgets/cpu.rs0
-rw-r--r--src/widgets/disks.rs0
-rw-r--r--src/widgets/mem.rs0
-rw-r--r--src/widgets/network.rs0
-rw-r--r--src/widgets/processes.rs0
-rw-r--r--src/widgets/temp.rs0
-rw-r--r--tests/basic_tests.rs0
8 files changed, 23 insertions, 24 deletions
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<sysinfo::Process> = 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<ProcessInfo> = Vec::new();
+ let mut formatted_vector: Vec<ProcessInfo> = 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
--- /dev/null
+++ b/src/widgets/cpu.rs
diff --git a/src/widgets/disks.rs b/src/widgets/disks.rs
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/widgets/disks.rs
diff --git a/src/widgets/mem.rs b/src/widgets/mem.rs
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/widgets/mem.rs
diff --git a/src/widgets/network.rs b/src/widgets/network.rs
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/widgets/network.rs
diff --git a/src/widgets/processes.rs b/src/widgets/processes.rs
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/widgets/processes.rs
diff --git a/src/widgets/temp.rs b/src/widgets/temp.rs
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/widgets/temp.rs
diff --git a/tests/basic_tests.rs b/tests/basic_tests.rs
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/basic_tests.rs