NotAShelf/microfetch
1
1
Fork 0
mirror of https://github.com/NotAShelf/microfetch.git synced 2025-12-13 00:03:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

get rid of color_eyre

Browse source 
Should never have added it. Annoyingly long compile times for no reason...
This commit is contained in:
raf 2025-01-26 00:52:22 +03:00
commit 592fb58474
No known key found for this signature in database
GPG key ID: EED98D11B85A2819
6 changed files with 21 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/system.rs
View file

@ -1,5 +1,4 @@
use crate::colors::COLORS;
use color_eyre::Result;
use nix::sys::{statvfs::statvfs, utsname::UtsName};
use std::{
env,
@ -8,7 +7,7 @@ use std::{
};
pub fn get_username_and_hostname(utsname: &UtsName) -> String {
let username = env::var("USER").unwrap_or("unknown_user".to_string());
let username = env::var("USER").unwrap_or_else(|_| "unknown_user".to_string());
let hostname = utsname
.nodename()
.to_str()
@ -24,7 +23,7 @@ pub fn get_username_and_hostname(utsname: &UtsName) -> String {
}
pub fn get_shell() -> String {
let shell_path = env::var("SHELL").unwrap_or("unknown_shell".to_string());
let shell_path = env::var("SHELL").unwrap_or_else(|_| "unknown_shell".to_string());
let shell_name = shell_path.rsplit('/').next().unwrap_or("unknown_shell");
shell_name.to_string()
}
@ -34,11 +33,14 @@ pub fn get_root_disk_usage() -> Result<String, io::Error> {
let block_size = vfs.block_size() as u64;
let total_blocks = vfs.blocks();
let available_blocks = vfs.blocks_available();
let total_size = block_size * total_blocks;
let used_size = total_size - (block_size * available_blocks);
let total_size = total_size as f64 / (1024.0 * 1024.0 * 1024.0);
let used_size = used_size as f64 / (1024.0 * 1024.0 * 1024.0);
let usage = (used_size / total_size) * 100.0;
Ok(format!(
"{used_size:.2} GiB / {total_size:.2} GiB ({cyan}{usage:.0}%{reset})",
cyan = COLORS.cyan,
@ -52,7 +54,9 @@ pub fn get_memory_usage() -> Result<String, io::Error> {
let mut total_memory_kb = 0.0;
let mut available_memory_kb = 0.0;
let mut meminfo = String::with_capacity(2048);
File::open("/proc/meminfo")?.read_to_string(&mut meminfo)?;
for line in meminfo.lines() {
let mut split = line.split_whitespace();
match split.next().unwrap_or_default() {
@ -65,14 +69,17 @@ pub fn get_memory_usage() -> Result<String, io::Error> {
_ => (),
}
}
let total_memory_gb = total_memory_kb / 1024.0 / 1024.0;
let available_memory_gb = available_memory_kb / 1024.0 / 1024.0;
let used_memory_gb = total_memory_gb - available_memory_gb;
Ok((used_memory_gb, total_memory_gb))
}
let (used_memory, total_memory) = parse_memory_info()?;
let percentage_used = (used_memory / total_memory * 100.0).round() as u64;
Ok(format!(
"{used_memory:.2} GiB / {total_memory:.2} GiB ({cyan}{percentage_used}%{reset})",
cyan = COLORS.cyan,