ab/tmux-helper
1
0
Fork 0
mirror of https://github.com/house-of-vanity/tmux-helper.git synced 2026-02-04 09:47:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup cpu_load_bar func. Using lib.

Browse Source
This commit is contained in:
AB
2020-04-11 16:35:55 +03:00
parent 8e569078de
commit b1e418a633
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main.rs
View File

@@ -4,7 +4,7 @@ extern crate dbus;
use crate::dbus::blocking::stdintf::org_freedesktop_dbus::Properties; use crate::dbus::blocking::stdintf::org_freedesktop_dbus::Properties;
use chrono::{DateTime, Local, Utc}; use chrono::{DateTime, Local, Utc};
use dbus::{arg, blocking::Connection}; use dbus::{arg, blocking::Connection};
use std::{env, fs, time::Duration}; use std::{env, time::Duration};
use sys_info; use sys_info;
const LOW: &str = "#[fg=colour119]"; const LOW: &str = "#[fg=colour119]";
@@ -24,10 +24,6 @@ struct TrackInfo {
status: String, status: String,
} }
fn read_file(file_path: &str) -> String {
fs::read_to_string(file_path).expect("Cant read file.")
}
fn to_bar(value: i32, max: i32, low: f32, mid: f32) { fn to_bar(value: i32, max: i32, low: f32, mid: f32) {
let mut bar = "".to_string(); let mut bar = "".to_string();
let bar_sym = "▮".to_string(); let bar_sym = "▮".to_string();
@@ -63,14 +59,17 @@ fn mem_load_bar(bar_len: i32) {
} }
fn cpu_load_bar(bar_len: i32) { fn cpu_load_bar(bar_len: i32) {
let load = read_file("/proc/loadavg"); let cpu_count = match sys_info::cpu_num() {
let load_data = load.split_whitespace().collect::<Vec<&str>>(); Ok(c) => c,
let _cpu_count = read_file("/proc/cpuinfo"); Err(e) => panic!("{:?}", e),
let cpu_count = _cpu_count.matches("model name").count(); };
let one: f32 = load_data[0].parse().unwrap(); let la_one: f32 = match sys_info::loadavg() {
let len: f32 = one as f32 / cpu_count as f32 * bar_len as f32; Ok(l) => l.one as f32,
Err(e) => panic!("{:?}", e),
};
let len: f32 = la_one as f32 / cpu_count as f32 * bar_len as f32;
to_bar(len as i32, bar_len, 0.3, 0.7); to_bar(len as i32, bar_len, 0.3, 0.7);
print!("{:.2} LA1#[default]", one); print!("{:.2} LA1#[default]", la_one);
} }
fn get_player() -> Result<Vec<String>, Box<dyn std::error::Error>> { fn get_player() -> Result<Vec<String>, Box<dyn std::error::Error>> {