From 905118f61269457afb235a3157a01d3bf2037abb Mon Sep 17 00:00:00 2001
From: druskus20 <druskus20@gmail.com>
Date: Tue, 24 Aug 2021 13:39:04 +0200
Subject: [PATCH] Added % used ram to EWW_RAM

---
 crates/eww/src/config/system_stats.rs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/crates/eww/src/config/system_stats.rs b/crates/eww/src/config/system_stats.rs
index 1c92c1d..d22de91 100644
--- a/crates/eww/src/config/system_stats.rs
+++ b/crates/eww/src/config/system_stats.rs
@@ -34,14 +34,18 @@ pub fn get_disks() -> String {
 pub fn get_ram() -> String {
     let mut c = SYSTEM.lock().unwrap();
     c.refresh_memory();
+
+    let total_memory = c.get_total_memory();
+    let used_memory = c.get_used_memory();
     format!(
-        r#"{{"total_mem": {}, "free_mem": {}, "total_swap": {}, "free_swap": {}, "available_mem": {}, "used_mem": {}}}"#,
-        c.get_total_memory(),
+        r#"{{"total_mem": {}, "free_mem": {}, "total_swap": {}, "free_swap": {}, "available_mem": {}, "used_mem": {}, "used_mem_perc": {}}}"#,
+        total_memory,
         c.get_free_memory(),
         c.get_total_swap(),
         c.get_free_swap(),
         c.get_available_memory(),
-        c.get_used_memory(),
+        used_memory,
+        used_memory / total_memory,
     )
 }
 
@@ -66,7 +70,12 @@ pub fn get_cpus() -> String {
         r#"{{ "cores": [{}], "avg": {} }}"#,
         processors
             .iter()
-            .map(|a| format!(r#"{{"core": "{}", "freq": {}, "usage": {}}}"#, a.get_name(), a.get_frequency(), a.get_cpu_usage()))
+            .map(|a| format!(
+                r#"{{"core": "{}", "freq": {}, "usage": {:.0}}}"#,
+                a.get_name(),
+                a.get_frequency(),
+                a.get_cpu_usage()
+            ))
             .join(","),
         processors.iter().map(|a| a.get_cpu_usage()).avg()
     )