From 4c9315a016329fc0c1ca8416ec0e586f780841dc Mon Sep 17 00:00:00 2001
From: druskus20 <druskus20@gmail.com>
Date: Sat, 21 Aug 2021 19:12:28 +0200
Subject: [PATCH] Adding more memory data to EWW_RAM as json fields

---
 crates/eww/src/config/inbuilt.rs      |  2 +-
 crates/eww/src/config/system_stats.rs | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/crates/eww/src/config/inbuilt.rs b/crates/eww/src/config/inbuilt.rs
index 343ac1f..c1cfcbb 100644
--- a/crates/eww/src/config/inbuilt.rs
+++ b/crates/eww/src/config/inbuilt.rs
@@ -26,7 +26,7 @@ pub fn get_inbuilt_vars() -> HashMap<VarName, ScriptVarDefinition> {
         "EWW_TEMPS" => || Ok(DynVal::from(get_core_temperatures())),
 
         // @desc EWW_RAM - The current RAM + Swap usage
-        "EWW_RAM" => || Ok(DynVal::from(format!("{:.2}", get_ram()))),
+        "EWW_RAM" => || Ok(DynVal::from(get_ram())),
 
         // @desc EWW_DISK - Information on on all mounted partitions (Might report inaccurately on some filesystems, like btrfs)\nExample: `{EWW_DISK["/"]}`
         "EWW_DISK" => || Ok(DynVal::from(get_disks())),
diff --git a/crates/eww/src/config/system_stats.rs b/crates/eww/src/config/system_stats.rs
index a0d7b63..f500904 100644
--- a/crates/eww/src/config/system_stats.rs
+++ b/crates/eww/src/config/system_stats.rs
@@ -26,10 +26,18 @@ pub fn get_disks() -> String {
     )
 }
 
-pub fn get_ram() -> f32 {
+pub fn get_ram() -> String {
     let mut c = SYSTEM.lock().unwrap();
     c.refresh_memory();
-    (c.get_used_memory() as f32 + c.get_used_swap() as f32) / 1_000_000f32
+    format!(
+        r#"{{"total_mem": {}, "free_mem": {}, "total_swap": {}, "free_swap": {}, "available_mem": {}, "used_mem": {}}}"#,
+        c.get_total_memory(),
+        c.get_free_memory(),
+        c.get_total_swap(),
+        c.get_free_swap(),
+        c.get_available_memory(),
+        c.get_used_memory(),
+    )
 }
 
 pub fn get_core_temperatures() -> String {