1 files changed, 18 insertions, 12 deletions

diff --git a/main.rs b/main.rs
index d6bf3d9..b2f73ad 100644
--- a/main.rs
+++ b/main.rs
@@ -2,6 +2,8 @@ use std::{
     collections::HashMap, env, fs::File, io::Read, process::Command, thread::sleep, time::Duration,
 };
 
+static SLEEP: u64 = 1;
+
 fn main() {
     let mut args = env::args();
 
@@ -18,13 +20,6 @@ fn main() {
     let cap_path = format!("{bat_path}/capacity");
     let status_path = format!("{bat_path}/status");
 
-    // 2: Sleep
-    let sleep_secs = args
-        .next()
-        .expect("Invalid sleep duration")
-        .parse::<u64>()
-        .expect("Invalid sleep value");
-
     let mut warnings: HashMap<u8, String> = HashMap::new();
     for arg in args {
         let (lvl, value) = arg.split_at(1);
@@ -40,18 +35,25 @@ fn main() {
 
     let mut cap_cache = String::new();
     loop {
+        sleep(Duration::from_secs(SLEEP));
         let cur_cap = read_file(&cap_path);
         if cur_cap != cap_cache {
             cap_cache.clone_from(&cur_cap);
-            if &read_file(&status_path) == "Charging" { continue; };
+            let bat_status = &read_file(&status_path);
+            if bat_status == "Charging" { 
+                continue;
+            };
+            if cur_cap == "100" && (bat_status == "Discharging" || bat_status == "Not charging") {
+                notify("n", None);
+                continue;
+            }
             let val = cur_cap
                 .parse::<u8>()
                 .expect("Couldn't parse capacity value");
             if let Some(lvl) = warnings.get(&val) {
-                notify(lvl, val);
+                notify(lvl, Some(val));
             };
         }
-        sleep(Duration::from_secs(sleep_secs));
     }
 }
 
@@ -62,14 +64,18 @@ fn read_file(path: &str) -> String {
     buf.trim().to_string()
 }
 
-fn notify(lvl: &str, remaining: u8) {
+fn notify(lvl: &str, remaining: Option<u8>) {
     let urgency = match lvl {
         "l" => "low",
         "n" => "normal",
         "c" => "critical",
         _ => unreachable!(),
     };
-    let notif = format!("Remaining battery capacity: {remaining}");
+    let notif = if let Some(remaining) = remaining {
+        &format!("Remaining battery capacity: {remaining}")
+    } else {
+        "Battery is full"
+    };
     Command::new("notify-send")
         .arg("--app-name=esbnd")
         .arg("--category=device")