renaming rockspec file and adding optional dependencies as regular dependencies

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

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 0da970887357a08fe21edebd0eb5845014d00608..991885a7aab82d0830c1062289594ed5de8a5afe 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -13,10 +13,14 @@ local first_line   = require("lain.helpers").first_line
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 

-local math         = { floor  = math.floor, min = math.min }
+local math         = { abs    = math.abs,
+                       floor  = math.floor,
+                       log10  = math.log10,
+                       min    = math.min }

 local string       = { format = string.format }
 local string       = { format = string.format }

-local tonumber     = tonumber

 
 

+local type         = type
+local tonumber     = tonumber

 local setmetatable = setmetatable
 
 -- Battery infos
 local setmetatable = setmetatable
 
 -- Battery infos


@@ -50,7 +54,7 @@ local function worker(args)
     }
 
     bat_now = {
     }
 
     bat_now = {

-        status    = "Not present",
+        status    = "N/A",

         ac_status = "N/A",
         perc      = "N/A",
         time      = "N/A",
         ac_status = "N/A",
         perc      = "N/A",
         time      = "N/A",


@@ -58,28 +62,30 @@ local function worker(args)
     }
 
     bat_now.n_status = {}
     }
 
     bat_now.n_status = {}

+    bat_now.n_perc   = {}

     for i = 1, #batteries do
     for i = 1, #batteries do

-        bat_now.n_status[i] = "Not present"
+        bat_now.n_status[i] = "N/A"
+        bat_now.n_perc[i] = 0

     end
 
     function update()
         local sum_rate_current = 0
         local sum_rate_voltage = 0
     end
 
     function update()
         local sum_rate_current = 0
         local sum_rate_voltage = 0

-        local sum_rate_power = 0
-        local sum_energy_now = 0
-        local sum_energy_full = 0
-        local sum_energy_percentage = 0
+        local sum_rate_power   = 0
+        local sum_rate_energy  = 0
+        local sum_energy_now   = 0
+        local sum_energy_full  = 0
+        local pspath           = "/sys/class/power_supply/"

 
         for i, battery in ipairs(batteries) do
 
         for i, battery in ipairs(batteries) do

-            local bstr    = "/sys/class/power_supply/" .. battery
+            local bstr    = pspath .. battery

             local present = first_line(bstr .. "/present")
 
             local present = first_line(bstr .. "/present")
 

-            if present == "1"
-            then
+            if tonumber(present) == 1 then

                 -- current_now(I)[uA], voltage_now(U)[uV], power_now(P)[uW]
                 -- current_now(I)[uA], voltage_now(U)[uV], power_now(P)[uW]

-                local rate_current      = tonumber(first_line(bstr .. "/current_now"))
-                local rate_voltage      = tonumber(first_line(bstr .. "/voltage_now"))
-                local rate_power        = tonumber(first_line(bstr .. "/power_now"))
+                local rate_current = tonumber(first_line(bstr .. "/current_now"))
+                local rate_voltage = tonumber(first_line(bstr .. "/voltage_now"))
+                local rate_power   = tonumber(first_line(bstr .. "/power_now"))

 
                 -- energy_now(P)[uWh], charge_now(I)[uAh]
                 local energy_now        = tonumber(first_line(bstr .. "/energy_now") or
 
                 -- energy_now(P)[uWh], charge_now(I)[uAh]
                 local energy_now        = tonumber(first_line(bstr .. "/energy_now") or


@@ -93,50 +99,64 @@ local function worker(args)
                                           math.floor((energy_now / energy_full) * 100)
 
                 bat_now.n_status[i] = first_line(bstr .. "/status") or "N/A"
                                           math.floor((energy_now / energy_full) * 100)
 
                 bat_now.n_status[i] = first_line(bstr .. "/status") or "N/A"

-
-                sum_rate_current      = sum_rate_current + (rate_current or 0)
-                sum_rate_voltage      = sum_rate_voltage + rate_voltage
-                sum_rate_power        = sum_rate_power + (rate_power or ((rate_voltage * rate_current) / 1e6))
-                sum_energy_now        = sum_energy_now + energy_now
-                sum_energy_full       = sum_energy_full + energy_full
-                sum_energy_percentage = sum_energy_percentage + energy_percentage
+                bat_now.n_perc[i]   = energy_percentage or bat_now.n_perc[i]
+
+                sum_rate_current = sum_rate_current + (rate_current or 0)
+                sum_rate_voltage = sum_rate_voltage + (rate_voltage or 0)
+                sum_rate_power   = sum_rate_power + (rate_power or 0)
+                sum_rate_energy  = sum_rate_energy + (rate_power or (((rate_voltage or 0) * (rate_current or 0)) / 1e6))
+                sum_energy_now   = sum_energy_now + (energy_now or 0)
+                sum_energy_full  = sum_energy_full + (energy_full or 0)

             end
         end
 
         bat_now.status = bat_now.n_status[1]
             end
         end
 
         bat_now.status = bat_now.n_status[1]

-        bat_now.ac_status = first_line(string.format("/sys/class/power_supply/%s/online", ac)) or "N/A"
-
-        -- update {perc,time,watt} iff battery not full and rate > 0
-        if bat_now.status ~= "Full" and (sum_rate_current > 0 or sum_rate_power > 0)
-        then
-            local rate_time = 0
-
-            if bat_now.status == "Charging" then
-                rate_time = (sum_energy_full - sum_energy_now) / (sum_rate_power or sum_rate_current)
-            elseif bat_now.status == "Discharging" then
-                rate_time = sum_energy_now / (sum_rate_power or sum_rate_current)
+        bat_now.ac_status = tonumber(first_line(string.format("%s%s/online", pspath, ac))) or "N/A"
+
+        if bat_now.status ~= "N/A" then
+            -- update {perc,time,watt} iff battery not full and rate > 0
+            if bat_now.status ~= "Full" and (sum_rate_power > 0 or sum_rate_current > 0) then
+                local rate_time = 0
+                local div = (sum_rate_power > 0 and sum_rate_power) or sum_rate_current
+
+                if bat_now.status == "Charging" then
+                    rate_time = (sum_energy_full - sum_energy_now) / div
+                else -- Discharging
+                    rate_time = sum_energy_now / div
+                end
+
+                if 0 < rate_time and rate_time < 0.01 then -- check for magnitude discrepancies (#199)
+                    rate_time_magnitude = math.abs(math.floor(math.log10(rate_time)))
+                    rate_time = rate_time * 10^(rate_time_magnitude - 2)
+                end
+
+                local hours   = math.floor(rate_time)
+                local minutes = math.floor((rate_time - hours) * 60)
+                bat_now.perc  = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100))
+                bat_now.time  = string.format("%02d:%02d", hours, minutes)
+                bat_now.watt  = tonumber(string.format("%.2f", sum_rate_energy / 1e6))
+            elseif bat_now.status ~= "Full" and sum_rate_power == 0 and bat_now.ac_status == 1 then
+                                                               bat_now.perc  = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100))
+                                                               bat_now.time  = "00:00"
+                                                               bat_now.watt  = 0
+            elseif bat_now.status == "Full" then
+                bat_now.perc  = 100
+                bat_now.time  = "00:00"
+                bat_now.watt  = 0

             end
             end

-
-            local hours   = math.floor(rate_time)
-            local minutes = math.floor((rate_time - hours) * 60)
-            local watt    = sum_rate_power / 1e6
-
-            bat_now.perc  = tonumber(string.format("%d", math.min(100, sum_energy_percentage / #batteries)))
-            bat_now.time  = string.format("%02d:%02d", hours, minutes)
-            bat_now.watt  = tonumber(string.format("%.2fW", watt))

         end
 
         widget = bat.widget
         settings()
 
         -- notifications for low and critical states
         end
 
         widget = bat.widget
         settings()
 
         -- notifications for low and critical states

-        if notify == "on" and bat_now.perc and bat_now.status == "Discharging" then
-            if perc <= 5 then
+        if notify == "on" and type(bat_now.perc) == "number" and bat_now.status == "Discharging" then
+            if bat_now.perc <= 5 then

                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,
                     replaces_id = bat.id
                 }).id
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,
                     replaces_id = bat.id
                 }).id

-            elseif perc <= 15 then
+            elseif bat_now.perc <= 15 then

                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,
                     replaces_id = bat.id
                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,
                     replaces_id = bat.id