X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/912bd26ede8901c98fd8d7a35f8493ee448109ad..80075e34d5ba4186901d311c0f469aefe0449476:/widgets/bat.lua

diff --git a/widgets/bat.lua b/widgets/bat.lua
index d18af87..a6a8b4f 100644
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -7,7 +7,9 @@
                                                   
 --]]
 
-local helpers      = require("lain.helpers")
+local newtimer     = require("lain.helpers").newtimer
+local first_line   = require("lain.helpers").first_line
+
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
@@ -21,11 +23,12 @@ local setmetatable = setmetatable
 -- lain.widgets.bat
 
 local function worker(args)
-    local bat = {}
-    local args = args or {}
-    local timeout = args.timeout or 30
-    local battery = args.battery or "BAT0"
-    local notify = args.notify or "on"
+    local bat      = {}
+    local args     = args or {}
+    local timeout  = args.timeout or 30
+    local battery  = args.battery or "BAT0"
+    local ac       = args.ac or "AC0"
+    local notify   = args.notify or "on"
     local settings = args.settings or function() end
 
     bat.widget = wibox.widget.textbox('')
@@ -46,50 +49,40 @@ local function worker(args)
         bg = "#FFFFFF"
     }
 
-    helpers.set_map(battery .. "status", "N/A")
-    helpers.set_map(battery .. "perc", "N/A")
-    helpers.set_map(battery .. "time", "N/A")
-    helpers.set_map(battery .. "watt", "N/A")
-
     function update()
         bat_now = {
-            status = "Not present",
-            perc   = "N/A",
-            time   = "N/A",
-            watt   = "N/A"
+            status    = "Not present",
+            ac_status = "N/A",
+            perc      = "N/A",
+            time      = "N/A",
+            watt      = "N/A"
         }
 
-        local bstr  = "/sys/class/power_supply/" .. battery
-
-        local present = helpers.first_line(bstr .. "/present")
+        local bstr    = "/sys/class/power_supply/" .. battery
+        local present = first_line(bstr .. "/present")
 
         if present == "1"
         then
-            local rate  = helpers.first_line(bstr .. "/power_now") or
-                          helpers.first_line(bstr .. "/current_now")
-
-            local ratev = helpers.first_line(bstr .. "/voltage_now")
-
-            local rem   = helpers.first_line(bstr .. "/energy_now") or
-                          helpers.first_line(bstr .. "/charge_now")
+            local ratep    = tonumber(first_line(bstr .. "/power_now"))
+            local ratec    = tonumber(first_line(bstr .. "/current_now"))
+            local ratev    = tonumber(first_line(bstr .. "/voltage_now"))
 
-            local tot   = helpers.first_line(bstr .. "/energy_full") or
-                          helpers.first_line(bstr .. "/charge_full")
+            local rem      = tonumber(first_line(bstr .. "/energy_now") or
+                                      first_line(bstr .. "/charge_now"))
 
-            bat_now.status = helpers.first_line(bstr .. "/status") or "N/A"
+            local tot      = tonumber(first_line(bstr .. "/energy_full") or
+                                      first_line(bstr .. "/charge_full"))
 
-            rate  = tonumber(rate) or 1
-            ratev = tonumber(ratev)
-            rem   = tonumber(rem)
-            tot   = tonumber(tot)
+            bat_now.status = first_line(bstr .. "/status") or "N/A"
+            bat_now.ac_status = first_line(string.format("/sys/class/power_supply/%s/online", ac)) or "N/A"
 
             local time_rat = 0
             if bat_now.status == "Charging"
             then
-                time_rat = (tot - rem) / rate
+                time_rat = (tot - rem) / (ratep or ratec)
             elseif bat_now.status == "Discharging"
             then
-                time_rat = rem / rate
+                time_rat = rem / (ratep or ratec)
             end
 
             local hrs = math.floor(time_rat)
@@ -100,42 +93,28 @@ local function worker(args)
 
             bat_now.time = string.format("%02d:%02d", hrs, min)
 
-            bat_now.perc = helpers.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
-                bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
+            if ratep then
+                bat_now.watt = string.format("%.2fW", ratep)
             else
-                bat_now.watt = "N/A"
+                bat_now.watt = string.format("%.2fW", (ratev * ratec) / 1e12)
             end
         end
 
-        if bat_now.status ~= helpers.get_map(battery .. "status")
-           or bat_now.perc ~= helpers.get_map(battery .. "perc")
-           or bat_now.time ~= helpers.get_map(battery .. "time")
-           or bat_now.watt ~= helpers.get_map(battery .. "watt")
-        then
-            widget = bat.widget
-            settings()
-
-            helpers.set_map(battery .. "status", bat_now.status)
-            helpers.set_map(battery .. "perc", bat_now.perc)
-            helpers.set_map(battery .. "time", bat_now.time)
-            helpers.set_map(battery .. "watt", bat_now.watt)
-        end
+        widget = bat.widget
+        settings()
 
         -- notifications for low and critical states
-        if bat_now.status == "Discharging" and notify == "on" and bat_now.perc ~= nil
+        if bat_now.status == "Discharging" and notify == "on" and bat_now.perc
         then
             local nperc = tonumber(bat_now.perc) or 100
             if nperc <= 5
@@ -154,9 +133,9 @@ local function worker(args)
         end
     end
 
-    helpers.newtimer(battery, 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 })