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

refactor: remove some redundant error types (#4)

Browse source
This commit is contained in:
Sora 2024-08-13 22:59:11 +02:00 • committed by GitHub
commit ae76a0cbe1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 35 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/system.rs
View file

@ -7,19 +7,19 @@ use std::io::{self};
use crate::colors::{CYAN, GREEN, RED, RESET, YELLOW};
pub fn get_username_and_hostname() -> Result<String, io::Error> {
let username = env::var("USER").unwrap_or_else(|_| "unknown_user".to_string());
let hostname = nix::unistd::gethostname()?;
pub fn get_username_and_hostname() -> String {
let username = env::var("USER").unwrap_or("unknown_user".to_string());
let hostname = nix::unistd::gethostname().unwrap_or("unknown_host".to_string().into());
let hostname = hostname.to_string_lossy();
Ok(format!("{YELLOW}{username}{RED}@{GREEN}{hostname}"))
format!("{YELLOW}{username}{RED}@{GREEN}{hostname}")
}
pub fn get_shell() -> Result<String, io::Error> {
let shell_path = env::var("SHELL").unwrap_or_else(|_| "unknown_shell".to_string());
pub fn get_shell() -> String {
let shell_path = env::var("SHELL").unwrap_or("unknown_shell".to_string());
let shell_name = shell_path.rsplit('/').next().unwrap_or("unknown_shell");
Ok(shell_name.to_string())
shell_name.to_string()
}
pub fn get_root_disk_usage() -> Result<String, io::Error> {