Merge pull request #161 from aajjbb/batwidget-percentage-fix2

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

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 4a25d6315ced28c1d071408ccb5afd4f3ecd948b..aa0ce6152b7c443ef874e6a8874e5c43e74a9a0e 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -21,9 +21,9 @@ local setmetatable = setmetatable
 
 -- Battery infos
 -- lain.widgets.bat
 
 -- Battery infos
 -- lain.widgets.bat

-local bat = {}

 
 local function worker(args)
 
 local function worker(args)

+    local bat = {}

     local args = args or {}
     local timeout = args.timeout or 30
     local battery = args.battery or "BAT0"
     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"
 
 
             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)
             ratev = tonumber(ratev)
             rem   = tonumber(rem)
             tot   = tonumber(tot)


@@ -97,8 +97,9 @@ local function worker(args)
 
             bat_now.time = string.format("%02d:%02d", hrs, min)
 
 
             bat_now.time = string.format("%02d:%02d", hrs, min)
 

-            local perc = (rem / tot) * 100
-            if perc <= 100 then
+            local perc = tonumber(first_line(bstr .. "/capacity")) or (rem / tot) * 100
+
+                       if perc <= 100 then

                 bat_now.perc = string.format("%d", perc)
             elseif perc > 100 then
                 bat_now.perc = "100"
                 bat_now.perc = string.format("%d", perc)
             elseif perc > 100 then
                 bat_now.perc = "100"


@@ -118,27 +119,28 @@ local function worker(args)
         settings()
 
         -- notifications for low and critical states
         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
         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,
             then
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,

-                    replaces_id = bat.id
+                    replaces_id = bat.id,

                 }).id
                 }).id

-            elseif tonumber(bat_now.perc) <= 15
+            elseif nperc <= 15

             then
                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,
             then
                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,

-                    replaces_id = bat.id
+                    replaces_id = bat.id,

                 }).id
             end
         end
     end
 
                 }).id
             end
         end
     end
 

-    newtimer("bat", timeout, update)
+    newtimer(battery, timeout, update)

 
 

-    return bat.widget
+    return setmetatable(bat, { __index = bat.widget })

 end
 
 end
 

-return setmetatable(bat, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })