X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/38d65dcdfbf7a9f76384660919b87497b82ce56e..99fb25a3c7edca96e01de0629c8599a83ad87f9d:/widgets/bat.lua?ds=sidebyside

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 4a25d63..60bd71c 100644
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -21,9 +21,9 @@ local setmetatable = setmetatable
 
 -- Battery infos
 -- lain.widgets.bat
-local bat = {}
 
 local function worker(args)
+    local bat = {}
     local args = args or {}
     local timeout = args.timeout or 30
     local battery = args.battery or "BAT0"
@@ -75,7 +75,7 @@ local function worker(args)
 
             bat_now.status = first_line(bstr .. "/status") or "N/A"
 
-            rate  = tonumber(rate)
+            rate  = tonumber(rate) or 1
             ratev = tonumber(ratev)
             rem   = tonumber(rem)
             tot   = tonumber(tot)
@@ -96,16 +96,21 @@ local function worker(args)
             if min < 0 then min = 0 elseif min > 59 then min = 59 end
 
             bat_now.time = string.format("%02d:%02d", hrs, min)
-
-            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
-
+			
+			local perc = tonumber(first_line(bstr .. "/capacity"))			
+
+            if not perc then
+			   perc = (rem / tot) * 100
+			end
+			
+			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
@@ -118,27 +123,28 @@ local function worker(args)
         settings()
 
         -- notifications for low and critical states
-        if bat_now.status == "Discharging" and notify == "on"
+        if bat_now.status == "Discharging" and notify == "on" and bat_now.perc ~= nil
         then
-            if tonumber(bat_now.perc) <= 5
+            local nperc = tonumber(bat_now.perc) or 100
+            if nperc <= 5
             then
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,
-                    replaces_id = bat.id
+                    replaces_id = bat.id,
                 }).id
-            elseif tonumber(bat_now.perc) <= 15
+            elseif nperc <= 15
             then
                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,
-                    replaces_id = bat.id
+                    replaces_id = bat.id,
                 }).id
             end
         end
     end
 
-    newtimer("bat", timeout, update)
+    newtimer(battery, timeout, update)
 
-    return bat.widget
+    return setmetatable(bat, { __index = bat.widget })
 end
 
-return setmetatable(bat, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })