Merge pull request #418 from cool-cool-sweat/full_notify

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

diff --git a/widget/bat.lua b/widget/bat.lua
index 03f9a0c8ef8aad935522fd85e7aae8e9c70baf73..3cb801c8ef93eeda994dedcfe960171979e513dc 100644 (file)
--- a/widget/bat.lua
+++ b/widget/bat.lua
@@ -6,47 +6,48 @@
 
 --]]
 
-local helpers    = require("lain.helpers")
-local fs         = require("gears.filesystem")
-local naughty    = require("naughty")
-local wibox      = require("wibox")
-local math       = math
-local string     = string
-local ipairs     = ipairs
-local tonumber   = tonumber
+local helpers  = require("lain.helpers")
+local fs       = require("gears.filesystem")
+local naughty  = require("naughty")
+local wibox    = require("wibox")
+local math     = math
+local string   = string
+local ipairs   = ipairs
+local tonumber = tonumber
 
 -- Battery infos
 -- lain.widget.bat
 
 local function factory(args)
-    local bat       = { widget = wibox.widget.textbox() }
-    local args      = args or {}
-    local timeout   = args.timeout or 30
-    local notify    = args.notify or "on"
-    local n_perc    = args.n_perc or { 5, 15 }
-    local pspath    = args.pspath or "/sys/class/power_supply/"
-    local settings  = args.settings or function() end
+    local pspath = args.pspath or "/sys/class/power_supply/"
 
     if not fs.is_dir(pspath) then
         naughty.notify { text = "lain.widget.bat: invalid power supply path", timeout = 0 }
         return
     end
 
-    bat.batteries = args.batteries or (args.battery and {args.battery}) or {}
-    bat.ac        = args.ac or "AC0"
+    local bat         = { widget = wibox.widget.textbox() }
+    local args        = args or {}
+    local timeout     = args.timeout or 30
+    local notify      = args.notify or "on"
+    local full_notify = args.full_notify or notify
+    local n_perc      = args.n_perc or { 5, 15 }
+    local batteries   = args.batteries or (args.battery and {args.battery}) or {}
+    local ac          = args.ac or "AC0"
+    local settings    = args.settings or function() end
 
     function bat.get_batteries()
         helpers.line_callback("ls -1 " .. pspath, function(line)
             local bstr =  string.match(line, "BAT%w+")
             if bstr then
-                bat.batteries[#bat.batteries + 1] = bstr
+                batteries[#batteries + 1] = bstr
             else
-                bat.ac = string.match(line, "AC%w+") or "AC0"
+                ac = string.match(line, "A%w+") or "AC0"
             end
         end)
     end
 
-    if #bat.batteries == 0 then bat.get_batteries() end
+    if #batteries == 0 then bat.get_batteries() end
 
     bat_notification_critical_preset = {
         title   = "Battery exhausted",
@@ -82,7 +83,7 @@ local function factory(args)
 
     bat_now.n_status = {}
     bat_now.n_perc   = {}
-    for i = 1, #bat.batteries do
+    for i = 1, #batteries do
         bat_now.n_status[i] = "N/A"
         bat_now.n_perc[i] = 0
     end
@@ -98,7 +99,7 @@ local function factory(args)
         local sum_energy_now   = 0
         local sum_energy_full  = 0
 
-        for i, battery in ipairs(bat.batteries) do
+        for i, battery in ipairs(batteries) do
             local bstr    = pspath .. battery
             local present = helpers.first_line(bstr .. "/present")
 
@@ -198,7 +199,7 @@ local function factory(args)
                     }).id
                 end
                 fullnotification = false
-            elseif bat_now.status == "Full" and not fullnotification then
+            elseif bat_now.status == "Full" and full_notify == "on" and not fullnotification then
                 bat.id = naughty.notify({
                     preset = bat_notification_charged_preset,
                     replaces_id = bat.id