Merge pull request #30 from kamou/use_awful_tag_gettags_instead_of_tags

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

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 4a25d6315ced28c1d071408ccb5afd4f3ecd948b..485fd572aa61c3e2a3cb632f8c2eb781ce5c01e4 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -75,7 +75,7 @@ local function worker(args)
 
             bat_now.status = first_line(bstr .. "/status") or "N/A"
 
 
             bat_now.status = first_line(bstr .. "/status") or "N/A"
 

-            rate  = tonumber(rate)
+            rate  = tonumber(rate) or 1

             ratev = tonumber(ratev)
             rem   = tonumber(rem)
             tot   = tonumber(tot)
             ratev = tonumber(ratev)
             rem   = tonumber(rem)
             tot   = tonumber(tot)


@@ -97,13 +97,17 @@ local function worker(args)
 
             bat_now.time = string.format("%02d:%02d", hrs, min)
 
 
             bat_now.time = string.format("%02d:%02d", hrs, min)
 

-            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"
+            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

             end
 
             if rate ~= nil and ratev ~= nil then
             end
 
             if rate ~= nil and ratev ~= nil then


@@ -118,15 +122,16 @@ local function worker(args)
         settings()
 
         -- notifications for low and critical states
         settings()
 
         -- notifications for low and critical states

-        if bat_now.status == "Discharging" and notify == "on"
+        bat_now.perc = tonumber(bat_now.perc)
+        if bat_now.status == "Discharging" and notify == "on" and bat_now.perc ~= nil

         then
         then

-            if tonumber(bat_now.perc) <= 5
+            if bat_now.perc <= 5

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

-            elseif tonumber(bat_now.perc) <= 15
+            elseif bat_now.perc <= 15

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