Cleanup and standardization in centerfair

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

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 0bb5eff18534b5fd03646d76b6b3d968e1fcdbd2..626239b14c28d2b32b6f1a9fc29d739e9cff5543 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -15,6 +15,7 @@ local wibox        = require("wibox")
 
 local math         = { floor  = math.floor }
 local string       = { format = string.format }
 
 local math         = { floor  = math.floor }
 local string       = { format = string.format }

+local tonumber     = tonumber

 
 local setmetatable = setmetatable
 
 
 local setmetatable = setmetatable
 


@@ -26,10 +27,27 @@ local function worker(args)
     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"

+    local notify = args.notify or "on"

     local settings = args.settings or function() end
 
     bat.widget = wibox.widget.textbox('')
 
     local settings = args.settings or function() end
 
     bat.widget = wibox.widget.textbox('')
 

+    bat_notification_low_preset = {
+        title = "Battery low",
+        text = "Plug the cable!",
+        timeout = 15,
+        fg = "#202020",
+        bg = "#CDCDCD"
+    }
+
+    bat_notification_critical_preset = {
+        title = "Battery exhausted",
+        text = "Shutdown imminent",
+        timeout = 15,
+        fg = "#000000",
+        bg = "#FFFFFF"
+    }
+

     function update()
         bat_now = {
             status = "Not present",
     function update()
         bat_now = {
             status = "Not present",


@@ -57,6 +75,11 @@ 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) or 1
+            ratev = tonumber(ratev)
+            rem   = tonumber(rem)
+            tot   = tonumber(tot)
+

             local time_rat = 0
             if bat_now.status == "Charging"
             then
             local time_rat = 0
             if bat_now.status == "Charging"
             then


@@ -67,47 +90,58 @@ local function worker(args)
             end
 
             local hrs = math.floor(time_rat)
             end
 
             local hrs = math.floor(time_rat)

-            local min = (time_rat - hrs) * 60
+            if hrs < 0 then hrs = 0 elseif hrs > 23 then hrs = 23 end
+
+            local min = math.floor((time_rat - hrs) * 60)
+            if min < 0 then min = 0 elseif min > 59 then min = 59 end

 
             bat_now.time = string.format("%02d:%02d", hrs, min)
 
             bat_now.time = string.format("%02d:%02d", hrs, min)

-            bat_now.perc = (rem / tot) * 100
-            bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)

 
 

-            -- notifications for low and critical states
-            if bat_now.perc <= 5
+            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
+                bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
+            else
+                bat_now.watt = "N/A"
+            end
+
+        end
+
+        widget = bat.widget
+        settings()
+
+        -- 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) or 100
+            if nperc <= 5

             then
                 bat.id = naughty.notify({
             then
                 bat.id = naughty.notify({

-                    text = "shutdown imminent",
-                    title = "battery nearly exhausted",
-                    position = "top_right",
-                    timeout = 15,
-                    fg="#000000",
-                    bg="#ffffff",
-                    ontop = true,
-                    replaces_id = bat.id
+                    preset = bat_notification_critical_preset,
+                    replaces_id = bat.id,

                 }).id
                 }).id

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

             then
                 bat.id = naughty.notify({
             then
                 bat.id = naughty.notify({

-                    text = "plug the cable",
-                    title = "battery low",
-                    position = "top_right",
-                    timeout = 15,
-                    fg="#202020",
-                    bg="#cdcdcd",
-                    ontop = true,
-                    replaces_id = bat.id
+                    preset = bat_notification_low_preset,
+                    replaces_id = bat.id,

                 }).id
             end
                 }).id
             end

-
-            bat_now.perc = string.format("%d", bat_now.perc)

         end
         end

-
-        widget = bat.widget
-        settings()

     end
 
     end
 

-    newtimer("bat", timeout, update)
+    newtimer(battery, timeout, update)

 
     return bat.widget
 end
 
     return bat.widget
 end