Cleanup cpu_load_bar func. Using lib.

Cargo.toml

@@ -1,9 +1,10 @@
 [package]
 name = "tmux-helper"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Ultra Desu <ultradesu@hexor.ru>"]
 edition = "2018"
 
 [dependencies]
 sys-info = "*"
 dbus = "*"
+chrono = "*"

src/main.rs

@@ -1,16 +1,19 @@
+extern crate chrono;
 extern crate dbus;
+
 use crate::dbus::blocking::stdintf::org_freedesktop_dbus::Properties;
+use chrono::{DateTime, Local, Utc};
 use dbus::{arg, blocking::Connection};
-use std::{env, fs, time::Duration};
+use std::{env, time::Duration};
 use sys_info;
 
-const LOW: &str = "#[fg=colour2]";
+const LOW: &str = "#[fg=colour119]";
-const MID: &str = "#[fg=colour3]";
+const MID: &str = "#[fg=colour220]";
-const HIGH: &str = "#[fg=colour1]";
+const HIGH: &str = "#[fg=colour197]";
-const END: &str = "#[fg=colour7]";
+const END: &str = "#[fg=colour153]";
-const TRACK_NAME: &str = "#[fg=colour3]";
+const TRACK_NAME: &str = "#[fg=colour46]";
-const TRACK_ARTIST: &str = "#[fg=colour3]";
+const TRACK_ARTIST: &str = "#[fg=colour46]";
-const TRACK_TIME: &str = "#[bg=colour252 fg=colour235 bold]";
+const TRACK_TIME: &str = "#[fg=colour153]";
 
 #[derive(Debug, Clone)]
 struct TrackInfo {
@@ -21,10 +24,6 @@ struct TrackInfo {
     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) {
     let mut bar = "".to_string();
     let bar_sym = "▮".to_string();
@@ -56,18 +55,21 @@ fn mem_load_bar(bar_len: i32) {
     let len =
         ((memory.total - memory.avail) as f32 / (memory.total as f32) * bar_len as f32) as i32;
     to_bar(len, bar_len, 0.7, 0.9);
-    print!("{:.0} MiB", memory.avail / 1024);
+    print!("{:.0} MiB#[default]", memory.avail / 1024);
 }
 
 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);
-    print!("{:.2} LA1", one);
+    print!("{:.2} LA1#[default]", la_one);
 }
 
 fn get_player() -> Result<Vec<String>, Box<dyn std::error::Error>> {
@@ -153,9 +155,24 @@ fn format_time(sec: i64) -> String {
     result.to_string()
 }
 
+fn get_time(utc: bool, mut format: &str) {
+    // Format reference: https://docs.rs/chrono/0.4.10/chrono/format/strftime/index.html
+    if format.len() == 0 {
+        format = "%H:%M";
+    }
+    if utc {
+        let local_time = Local::now();
+        let utc_time = DateTime::<Utc>::from_utc(local_time.naive_utc(), Utc);
+        println!("{}", utc_time.format(format));
+    } else {
+        let local_time = Local::now();
+        println!("{}", local_time.format(format));
+    }
+}
+
 fn main() {
     let args: Vec<String> = env::args().collect();
-    let help_text: &str = "Available commands -mb, -cb";
+    let help_text: &str = "Available commands -mb, -cb, -tl <TIME FORMAT>, -tu <TIME FORMAT>, -p";
     match args.len() {
         1 => {
             panic!(help_text);
@@ -163,12 +180,34 @@ fn main() {
         2 => match args[1].as_ref() {
             "-cb" => cpu_load_bar(15),
             "-mb" => mem_load_bar(15),
+            "-tl" => get_time(false, ""),
+            "-tu" => get_time(true, ""),
             "-p" => match player_info(get_player().unwrap()) {
                 Ok(mut track_info) => {
                     let mut title_len = 30;
                     let mut artist_len = 30;
-                    let mut separator: String = " - ".to_string();
+                    let mut separator: String = " — ".to_string();
                     let max_shift = 6;
+                    if track_info.artist.chars().count() == 0 {
+                        separator = "".to_string();
+                        title_len += artist_len;
+                    }
+                    if artist_len + max_shift >= track_info.artist.chars().count() {
+                        artist_len = track_info.artist.chars().count()
+                    }
+                    if track_info.artist.len() > artist_len {
+                        let mut artist: String = String::new();
+                        let mut counter = 0;
+                        for ch in track_info.artist.chars() {
+                            if counter == artist_len {
+                                artist.push_str("..");
+                                break;
+                            }
+                            artist.push(ch);
+                            counter += 1;
+                        }
+                        track_info.artist = artist;
+                    }
                     if title_len + max_shift >= track_info.title.chars().count() {
                         title_len = track_info.title.chars().count()
                     }
@@ -177,33 +216,16 @@ fn main() {
                         let mut counter = 0;
                         for ch in track_info.title.chars() {
                             if counter == title_len {
+                                title.push_str("..");
                                 break;
                             }
                             title.push(ch);
                             counter += 1;
                         }
-                        title.push_str("..");
                         track_info.title = title;
                     }
-                    if artist_len + max_shift >= track_info.artist.chars().count() {
-                        artist_len = track_info.artist.chars().count()
-                    }
-                    if track_info.artist.chars().count() == 0 {separator = "".to_string()}
-                    if track_info.artist.len() > artist_len {
-                        let mut artist: String = String::new();
-                        let mut counter = 0;
-                        for ch in track_info.artist.chars() {
-                            if counter == artist_len {
-                                break;
-                            }
-                            artist.push(ch);
-                            counter += 1;
-                        }
-                        artist.push_str("..");
-                        track_info.artist = artist;
-                    }
                     println!(
-                        "#[none]#[bold]{}{}{}#[none]{}{}{}{} {}[{}/{}] {} {}",
+                        "#[none]#[bold]{}{}{}#[none]{}{}{}{} {}[{}/{}] {} {}#[default]",
                         TRACK_NAME,
                         track_info.title,
                         END,
@@ -222,6 +244,11 @@ fn main() {
             },
             _ => panic!(help_text),
         },
+        3 => match args[1].as_ref() {
+            "-tl" => get_time(false, args[2].as_ref()),
+            "-tu" => get_time(true, args[2].as_ref()),
+            _ => panic!(help_text),
+        },
         _ => {
             panic!(help_text);
         }