Merge pull request #160 from aajjbb/batwidget-percentage-fix

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

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 572d099266ad2683bf6890f7e3682ef9546523ff..60bd71cd581c56965621b7fbc43c4366ead168b9 100644 (file)
--- 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"
@@ -96,20 +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)
-
-            bat_now.perc = first_line(bstr .. "/capacity")
-
-            if not bat_now.perc then
-                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
-            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
@@ -141,9 +142,9 @@ local function worker(args)
         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 })