diff options
author | Mustafa Salih <37256744+MustafaSalih1993@users.noreply.github.com> | 2021-01-16 09:28:13 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-16 09:28:13 +0300 |
commit | 7b59d5922266ed0793a2892464ef43cf23ec119c (patch) | |
tree | 434dbeded52ced22d6f6f064f7f7f16f7f5bbbf0 /src/utils | |
parent | e38859e0f0106b60f2dd6d2f8260ea16e5417a96 (diff) | |
parent | 4f83d10cf86bcc4c2364e7f5f24be34712242b04 (diff) |
Merge pull request #36 from MustafaSalih1993/dev
added some checks
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/battery.rs | 3 | ||||
-rw-r--r-- | src/utils/disk.rs | 1 | ||||
-rw-r--r-- | src/utils/uptime.rs | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/utils/battery.rs b/src/utils/battery.rs index b831773..a38d3b4 100644 --- a/src/utils/battery.rs +++ b/src/utils/battery.rs @@ -16,7 +16,6 @@ pub fn get_battery(config: &Config) -> Result<String, Error> { let mut buf = String::new(); - // FIXME: ugly error handling AGAIN fixing later, im lazy match File::open(&battery_full_cap_file) { Ok(mut file) => file.read_to_string(&mut buf)?, Err(_) => return Ok(String::from("check your battery source name")), @@ -24,7 +23,7 @@ pub fn get_battery(config: &Config) -> Result<String, Error> { let full_design = buf.trim().parse::<u32>().unwrap(); buf.clear(); - // NOTE: no need to error check if passed the above match + // No need to error check if passed the above match File::open(&battery_charge_now_file)?.read_to_string(&mut buf)?; let charge_now = buf.trim().parse::<u32>().unwrap(); diff --git a/src/utils/disk.rs b/src/utils/disk.rs index 82785b4..2aa7b63 100644 --- a/src/utils/disk.rs +++ b/src/utils/disk.rs @@ -1,6 +1,5 @@ use crate::types::Config; -// getting disk usage pub fn get_disk(config: &Config) -> String { const GB: u64 = (1024 * 1024) * 1024; let statvfs = nix::sys::statvfs::statvfs("/").unwrap(); diff --git a/src/utils/uptime.rs b/src/utils/uptime.rs index 027827a..90f52a7 100644 --- a/src/utils/uptime.rs +++ b/src/utils/uptime.rs @@ -4,7 +4,10 @@ use std::io::Read; pub fn get_uptime(config: &Config) -> Result<String, std::io::Error> { let mut buf = String::new(); - File::open("/proc/uptime")?.read_to_string(&mut buf)?; + match File::open("/proc/uptime") { + Ok(mut file) => file.read_to_string(&mut buf)?, + _ => return Ok("cant find uptime file!".to_string()), + }; let buf: f32 = buf.split(' ').collect::<Vec<&str>>()[0].parse().unwrap(); |