From d34ef0dd0392674d1a7a8f098b9c57945e96683a Mon Sep 17 00:00:00 2001 From: mustafa salih Date: Tue, 22 Dec 2020 07:30:27 +0300 Subject: Added rsblocks.yml file and yaml parser to customize --- src/mem.rs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'src/mem.rs') diff --git a/src/mem.rs b/src/mem.rs index ac0f0ae..8245c29 100644 --- a/src/mem.rs +++ b/src/mem.rs @@ -1,7 +1,10 @@ use std::fs::File; use std::io::Read; + +use crate::load_config::Settings; + //MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable -pub fn mem() -> Result { +pub fn mem(setting: &Settings) -> Result { let mut buf = String::new(); File::open("/proc/meminfo")?.read_to_string(&mut buf)?; @@ -48,9 +51,17 @@ pub fn mem() -> Result { let mem_used = (mem_total + shmem - mem_free - mem_buffers - mem_cached - mem_srecl) / 1024; let result: String; if mem_used > 1000 { - result = format!(" ▦ {:.1}G │", mem_used as f32 / 1000.0); + result = format!( + " {} {:.1}G {}", + setting.memory.icon, + mem_used as f32 / 1000.0, + setting.seperator + ); } else { - result = format!(" ▦ {}M │", mem_used); + result = format!( + " {} {}M {}", + setting.memory.icon, mem_used, setting.seperator + ); } Ok(result) } -- cgit v1.2.3