diff options
author | mustafa salih <mustafasalih1991@gmail.com> | 2021-02-03 03:42:05 +0300 |
---|---|---|
committer | mustafa salih <mustafasalih1991@gmail.com> | 2021-02-03 03:42:05 +0300 |
commit | 0359a01cc89b1bbcf0bd08799d2c8dfd09f609d0 (patch) | |
tree | bb25b89e1f1186d2f06a7b1ad12bbf26c6d23cac /src/utils/cpu.rs | |
parent | 303808ea191f4c8d047c14a77a1bd322d4dcc081 (diff) |
removed some doublicated code
Diffstat (limited to 'src/utils/cpu.rs')
-rw-r--r-- | src/utils/cpu.rs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/utils/cpu.rs b/src/utils/cpu.rs index f8ae595..2047a07 100644 --- a/src/utils/cpu.rs +++ b/src/utils/cpu.rs @@ -1,11 +1,14 @@ use crate::config::CONFIG; -use std::fs::File; -use std::io::Read; +use crate::types::ThreadsData; +use std::fs::read_to_string; // getting cpu temperature -pub fn get_cpu_temp() -> Result<String, std::io::Error> { - let mut buf = String::new(); - File::open("/sys/class/thermal/thermal_zone0/temp")?.read_to_string(&mut buf)?; +pub fn get_cpu_temp() -> ThreadsData { + let buf = match read_to_string("/sys/class/thermal/thermal_zone0/temp") { + Ok(data) => data, + _ => return ThreadsData::CpuTemp(String::from("Error reading temp")), + }; + let value = buf.trim().parse::<f32>().unwrap(); let result = format!( @@ -14,5 +17,5 @@ pub fn get_cpu_temp() -> Result<String, std::io::Error> { value / 1000.0, CONFIG.seperator ); - Ok(result) + ThreadsData::CpuTemp(result) } |