From 5f880886ba1645de50c2cef29c67cde63c3b9652 Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Sun, 18 Apr 2021 22:34:46 +0800
Subject: [PATCH] feat: update libmacchina

---
 __misc/libmacchina/src/main.rs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/__misc/libmacchina/src/main.rs b/__misc/libmacchina/src/main.rs
index 27faa9e..f94ed35 100644
--- a/__misc/libmacchina/src/main.rs
+++ b/__misc/libmacchina/src/main.rs
@@ -1,8 +1,4 @@
-use libmacchina::traits::{
-    BatteryReadout, BatteryState,
-    GeneralReadout, KernelReadout,
-    MemoryReadout,
-};
+use libmacchina::traits::{BatteryReadout, BatteryState, GeneralReadout, KernelReadout, MemoryReadout, ShellFormat};
 
 fn main() {
     let battery_readout = libmacchina::BatteryReadout::new();
@@ -21,6 +17,17 @@ fn main() {
     println!("User name: {}", general_readout.username().unwrap());
     println!("IP: {}", general_readout.local_ip().unwrap());
     println!("Hostname: {}", general_readout.hostname().unwrap());
+    println!("CPU model name: {}", general_readout.cpu_model_name().unwrap());
+    println!("CPU phy cores: {}", general_readout.cpu_physical_cores().unwrap());
+    println!("CPU cores: {}", general_readout.cpu_cores().unwrap());
+    println!("CPU usage: {}", general_readout.cpu_usage().unwrap());
+    println!("Uptime: {}", general_readout.uptime().unwrap());
+    println!("OS name: {}", general_readout.os_name().unwrap());
+    println!("Machine: {}", general_readout.machine().unwrap());
+    println!("Window manager: {}", general_readout.window_manager().unwrap());
+    println!("Terminal: {}", general_readout.terminal().unwrap());
+    println!("Shell: {}", general_readout.shell(ShellFormat::Absolute).unwrap());
+    println!("Shell: {}", general_readout.shell(ShellFormat::Relative).unwrap());
 
     let kernel_readout = libmacchina::KernelReadout::new();
     println!("OS release: {}", kernel_readout.os_release().unwrap());