Merge pull request #44 from MustafaSalih1993/dev

removed some doublicated code

1 files changed, 7 insertions, 8 deletions

diff --git a/src/utils/uptime.rs b/src/utils/uptime.rs
index b5de930..140c4c4 100644
--- a/src/utils/uptime.rs
+++ b/src/utils/uptime.rs
@@ -1,12 +1,11 @@
 use crate::config::CONFIG;
-use std::fs::File;
-use std::io::Read;
+use crate::types::ThreadsData;
+use std::fs::read_to_string;
 
-pub fn get_uptime() -> Result<String, std::io::Error> {
-    let mut buf = String::new();
-    match File::open("/proc/uptime") {
-        Ok(mut file) => file.read_to_string(&mut buf)?,
-        _ => return Ok("cant find uptime file!".to_string()),
+pub fn get_uptime() -> ThreadsData {
+    let buf = match read_to_string("/proc/uptime") {
+        Ok(data) => data,
+        _ => return ThreadsData::Uptime("cant find uptime file!".to_string()),
     };
 
     let buf: f32 = buf.split(' ').collect::<Vec<&str>>()[0].parse().unwrap();
@@ -21,5 +20,5 @@ pub fn get_uptime() -> Result<String, std::io::Error> {
         format!("{} min", minutes)
     };
     let result = format!("  {}  {}  {}", CONFIG.uptime.icon, uptime, CONFIG.seperator);
-    Ok(result)
+    ThreadsData::Uptime(result)
 }