pogmommy/eww
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding more memory data to EWW_RAM as json fields

Browse source
This commit is contained in:
druskus20 2021-08-21 19:12:28 +02:00
parent 8234145bf2
commit 4c9315a016
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/eww/src/config/inbuilt.rs
View file

@ -26,7 +26,7 @@ pub fn get_inbuilt_vars() -> HashMap<VarName, ScriptVarDefinition> {
"EWW_TEMPS" => || Ok(DynVal::from(get_core_temperatures())), "EWW_TEMPS" => || Ok(DynVal::from(get_core_temperatures())),
// @desc EWW_RAM - The current RAM + Swap usage // @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["/"]}` // @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())), "EWW_DISK" => || Ok(DynVal::from(get_disks())),

12
crates/eww/src/config/system_stats.rs
View file

@ -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(); let mut c = SYSTEM.lock().unwrap();
c.refresh_memory(); 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 { pub fn get_core_temperatures() -> String {