Llewellyn/starship
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/starship.git synced 2024-11-24 21:57:41 +00:00
Code Issues Releases Activity

fix(memory_usage): remove duplicate % handling (#3193)

Browse Source
This commit is contained in:
David Knaack 2021-11-01 22:19:27 +01:00 committed by GitHub
parent c1f2d345aa
commit 4ee1bdc2a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/memory_usage.rs
View File

@ -1,6 +1,6 @@
use byte_unit::{Byte, ByteUnit}; use byte_unit::{Byte, ByteUnit};
use super::{Context, Module, RootModuleConfig, Shell}; use super::{Context, Module, RootModuleConfig};
use crate::configs::memory_usage::MemoryConfig; use crate::configs::memory_usage::MemoryConfig;
use crate::formatter::StringFormatter; use crate::formatter::StringFormatter;
@ -12,8 +12,8 @@ fn format_kib(n_kib: u64) -> String {
display_bytes display_bytes
} }
fn format_pct(pct_number: f64, pct_sign: &str) -> String { fn format_pct(pct_number: f64) -> String {
format!("{:.0}{}", pct_number, pct_sign) format!("{:.0}%", pct_number)
} }
fn format_usage_total(usage: u64, total: u64) -> String { fn format_usage_total(usage: u64, total: u64) -> String {
@ -25,13 +25,6 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let mut module = context.new_module("memory_usage"); let mut module = context.new_module("memory_usage");
let config = MemoryConfig::try_load(module.config); let config = MemoryConfig::try_load(module.config);
// TODO: Update when v1.0 printing refactor is implemented to only
// print escapes in a prompt context.
let pct_sign = match context.shell {
Shell::Zsh => "%%", // % is an escape in zsh, see PROMPT in `man zshmisc`
_ => "%",
};
// As we default to disabled=true, we have to check here after loading our config module, // As we default to disabled=true, we have to check here after loading our config module,
// before it was only checking against whatever is in the config starship.toml // before it was only checking against whatever is in the config starship.toml
if config.disabled { if config.disabled {
@ -54,7 +47,7 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let used_memory_kib = system.total.saturating_sub(avail_memory_kib); let used_memory_kib = system.total.saturating_sub(avail_memory_kib);
let total_memory_kib = system.total; let total_memory_kib = system.total;
let ram_used = (used_memory_kib as f64 / total_memory_kib as f64) * 100.; let ram_used = (used_memory_kib as f64 / total_memory_kib as f64) * 100.;
let ram_pct = format_pct(ram_used, pct_sign); let ram_pct = format_pct(ram_used);
let threshold = config.threshold; let threshold = config.threshold;
if ram_used.round() < threshold as f64 { if ram_used.round() < threshold as f64 {
@ -65,7 +58,7 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let total_swap_kib = system.swap_total; let total_swap_kib = system.swap_total;
let used_swap_kib = system.swap_total.saturating_sub(system.swap_free); let used_swap_kib = system.swap_total.saturating_sub(system.swap_free);
let percent_swap_used = (used_swap_kib as f64 / total_swap_kib as f64) * 100.; let percent_swap_used = (used_swap_kib as f64 / total_swap_kib as f64) * 100.;
let swap_pct = format_pct(percent_swap_used, pct_sign); let swap_pct = format_pct(percent_swap_used);
let swap = format_usage_total(used_swap_kib, total_swap_kib); let swap = format_usage_total(used_swap_kib, total_swap_kib);
let parsed = StringFormatter::new(config.format).and_then(|formatter| { let parsed = StringFormatter::new(config.format).and_then(|formatter| {