yawn: localizations and icons updated

[etc/awesome.git] / widgets / bat.lua

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 0bb5eff18534b5fd03646d76b6b3d968e1fcdbd2..2906de2703db2ca154b138c130bcf11169bde35e 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -15,6 +15,7 @@ local wibox        = require("wibox")
 
 local math         = { floor  = math.floor }
 local string       = { format = string.format }
 
 local math         = { floor  = math.floor }
 local string       = { format = string.format }

+local tonumber     = tonumber

 
 local setmetatable = setmetatable
 
 
 local setmetatable = setmetatable
 


@@ -57,6 +58,11 @@ local function worker(args)
 
             bat_now.status = first_line(bstr .. "/status") or "N/A"
 
 
             bat_now.status = first_line(bstr .. "/status") or "N/A"
 

+            rate  = tonumber(rate)
+            ratev = tonumber(ratev)
+            rem   = tonumber(rem)
+            tot   = tonumber(tot)
+

             local time_rat = 0
             if bat_now.status == "Charging"
             then
             local time_rat = 0
             if bat_now.status == "Charging"
             then


@@ -67,40 +73,57 @@ local function worker(args)
             end
 
             local hrs = math.floor(time_rat)
             end
 
             local hrs = math.floor(time_rat)

-            local min = (time_rat - hrs) * 60
+            if hrs < 0 then hrs = 0 elseif hrs > 23 then hrs = 23 end
+
+            local min = math.floor((time_rat - hrs) * 60)
+            if min < 0 then min = 0 elseif min > 59 then min = 59 end

 
             bat_now.time = string.format("%02d:%02d", hrs, min)
 
             bat_now.time = string.format("%02d:%02d", hrs, min)

-            bat_now.perc = (rem / tot) * 100
-            bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
+
+            local perc = (rem / tot) * 100
+            if perc <= 100 then
+                bat_now.perc = string.format("%d", perc)
+            elseif perc > 100 then
+                bat_now.perc = "100"
+            elseif perc < 0 then
+                bat_now.perc = "0"
+            end
+
+            if rate ~= nil and ratev ~= nil then
+                bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
+            else
+                bat_now.watt = "N/A"
+            end

 
             -- notifications for low and critical states
 
             -- notifications for low and critical states

-            if bat_now.perc <= 5
+            if bat_now.status == "Discharging"

             then
             then

-                bat.id = naughty.notify({
-                    text = "shutdown imminent",
-                    title = "battery nearly exhausted",
-                    position = "top_right",
-                    timeout = 15,
-                    fg="#000000",
-                    bg="#ffffff",
-                    ontop = true,
-                    replaces_id = bat.id
-                }).id
-            elseif bat_now.perc <= 15
-            then
-                bat.id = naughty.notify({
-                    text = "plug the cable",
-                    title = "battery low",
-                    position = "top_right",
-                    timeout = 15,
-                    fg="#202020",
-                    bg="#cdcdcd",
-                    ontop = true,
-                    replaces_id = bat.id
-                }).id
+                if tonumber(bat_now.perc) <= 5
+                then
+                    bat.id = naughty.notify({
+                        text = "shutdown imminent",
+                        title = "battery nearly exhausted",
+                        position = "top_right",
+                        timeout = 15,
+                        fg="#000000",
+                        bg="#ffffff",
+                        ontop = true,
+                        replaces_id = bat.id
+                    }).id
+                elseif tonumber(bat_now.perc) <= 15
+                then
+                    bat.id = naughty.notify({
+                        text = "plug the cable",
+                        title = "battery low",
+                        position = "top_right",
+                        timeout = 15,
+                        fg="#202020",
+                        bg="#cdcdcd",
+                        ontop = true,
+                        replaces_id = bat.id
+                    }).id
+                end

             end
             end

-
-            bat_now.perc = string.format("%d", bat_now.perc)

         end
 
         widget = bat.widget
         end
 
         widget = bat.widget