From: Luke Bonham Date: Sun, 3 Jan 2016 10:18:28 +0000 (+0100) Subject: Merge pull request #160 from aajjbb/batwidget-percentage-fix X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/0f1fe46d18837f032cefcd43d511ed57575ec431?hp=7dd6443f0a87e0816f5b6323a23bf3e8ca364aee Merge pull request #160 from aajjbb/batwidget-percentage-fix battery widget percentage fix --- diff --git a/widgets/bat.lua b/widgets/bat.lua index 61828ec..60bd71c 100644 --- a/widgets/bat.lua +++ b/widgets/bat.lua @@ -96,20 +96,21 @@ local function worker(args) if min < 0 then min = 0 elseif min > 59 then min = 59 end bat_now.time = string.format("%02d:%02d", hrs, min) - - 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 - + + local perc = tonumber(first_line(bstr .. "/capacity")) + + if not perc then + perc = (rem / tot) * 100 + end + + 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) else