Merge pull request #152 from sudo-nice/master

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

diff --git a/widgets/bat.lua b/widgets/bat.lua
index c14e94c1444e9e770c5b1effb89493bdccdec8a2..61828ecfe9cb98c164c6526becdd75b4db363cc7 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"


@@ -124,26 +124,26 @@ local function worker(args)
         -- notifications for low and critical states
         if bat_now.status == "Discharging" and notify == "on" and bat_now.perc ~= nil
         then
         -- notifications for low and critical states
         if bat_now.status == "Discharging" and notify == "on" and bat_now.perc ~= nil
         then

-            local nperc = tonumber(bat_now.perc)
+            local nperc = tonumber(bat_now.perc) or 100

             if nperc <= 5
             then
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,
             if nperc <= 5
             then
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,

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

                 }).id
             elseif nperc <= 15
             then
                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,
                 }).id
             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
 
                 }).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 })