wiki updated

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

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 572d099266ad2683bf6890f7e3682ef9546523ff..d55be1746def102d4e8db39a96fcc15b160204ab 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"


@@ -97,17 +97,14 @@ local function worker(args)
 
             bat_now.time = string.format("%02d:%02d", hrs, min)
 
 
             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
+            local perc = tonumber(first_line(bstr .. "/capacity")) or math.floor((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
             end
 
             if rate ~= nil and ratev ~= nil then


@@ -141,9 +138,9 @@ local function worker(args)
         end
     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 })