NotAShelf/microfetch
1
1
Fork 0
mirror of https://github.com/NotAShelf/microfetch.git synced 2026-02-05 02:55:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: move sysinfo call into get_current

Browse source 
No longer used by anything but uptime.
This commit is contained in:
ErrorNoInternet 2024-08-15 12:50:32 +08:00
commit fb126fb125
No known key found for this signature in database
GPG key ID: 2486BFB7B1E6A4A3
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main.rs
View file

@ -9,22 +9,19 @@ use crate::desktop::get_desktop_info;
use crate::release::{get_os_pretty_name, get_system_info}; use crate::release::{get_os_pretty_name, get_system_info};
use crate::system::{get_memory_usage, get_root_disk_usage, get_shell, get_username_and_hostname}; use crate::system::{get_memory_usage, get_root_disk_usage, get_shell, get_username_and_hostname};
use crate::uptime::get_current; use crate::uptime::get_current;
use std::io;
use color_eyre::Report; use color_eyre::Report;
use nix::sys::sysinfo::sysinfo;
fn main() -> Result<(), Report> { fn main() -> Result<(), Report> {
color_eyre::install()?; color_eyre::install()?;
let info = sysinfo().map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
let fields = Fields { let fields = Fields {
user_info: get_username_and_hostname(), user_info: get_username_and_hostname(),
os_name: get_os_pretty_name()?, os_name: get_os_pretty_name()?,
kernel_version: get_system_info()?, kernel_version: get_system_info()?,
shell: get_shell(), shell: get_shell(),
desktop: get_desktop_info(), desktop: get_desktop_info(),
uptime: get_current(&info)?, uptime: get_current()?,
memory_usage: get_memory_usage()?, memory_usage: get_memory_usage()?,
storage: get_root_disk_usage()?, storage: get_root_disk_usage()?,
colors: print_dots(), colors: print_dots(),

5
src/uptime.rs
View file

@ -1,8 +1,9 @@
use color_eyre::Result; use color_eyre::Result;
use nix::sys::sysinfo::SysInfo; use nix::sys::sysinfo::sysinfo;
use std::io; use std::io;
pub fn get_current(info: &SysInfo) -> Result<String, io::Error> { pub fn get_current() -> Result<String, io::Error> {
let info = sysinfo().map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
let uptime_seconds = info.uptime().as_secs_f64(); let uptime_seconds = info.uptime().as_secs_f64();
let total_minutes = (uptime_seconds / 60.0).round() as u64; let total_minutes = (uptime_seconds / 60.0).round() as u64;