fixed formatting to be dynamic
This commit is contained in:
+10
-8
@@ -2,6 +2,7 @@ use crate::config::Config;
|
||||
use crate::modules::WaybarModule;
|
||||
use crate::output::WaybarOutput;
|
||||
use crate::state::SharedState;
|
||||
use crate::utils::{format_template, TokenValue};
|
||||
use anyhow::Result;
|
||||
|
||||
pub struct SysModule;
|
||||
@@ -30,14 +31,15 @@ impl WaybarModule for SysModule {
|
||||
format!("{}m", minutes)
|
||||
};
|
||||
|
||||
let text = config.sys.format
|
||||
.replace("{uptime}", &uptime_str)
|
||||
.replace("{load1:>4.2}", &format!("{:>4.2}", load1))
|
||||
.replace("{load5:>4.2}", &format!("{:>4.2}", load5))
|
||||
.replace("{load15:>4.2}", &format!("{:>4.2}", load15))
|
||||
.replace("{load1}", &format!("{:.2}", load1))
|
||||
.replace("{load5}", &format!("{:.2}", load5))
|
||||
.replace("{load15}", &format!("{:.2}", load15));
|
||||
let text = format_template(
|
||||
&config.sys.format,
|
||||
&[
|
||||
("uptime", TokenValue::String(&uptime_str)),
|
||||
("load1", TokenValue::Float(load1)),
|
||||
("load5", TokenValue::Float(load5)),
|
||||
("load15", TokenValue::Float(load15)),
|
||||
]
|
||||
);
|
||||
|
||||
Ok(WaybarOutput {
|
||||
text,
|
||||
|
||||
Reference in New Issue
Block a user