From: copycat-killer Date: Sun, 3 Jan 2016 10:35:10 +0000 (+0100) Subject: clean failed rebase and repatch #160 2 X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/e966fd310ef6754b40b85a9fa22609bf64e65189?ds=sidebyside;hp=-c clean failed rebase and repatch #160 2 --- e966fd310ef6754b40b85a9fa22609bf64e65189 diff --git a/widgets/bat.lua b/widgets/bat.lua index 60bd71c..1730494 100644 --- a/widgets/bat.lua +++ b/widgets/bat.lua @@ -96,21 +96,18 @@ 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) - - 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 - + + local perc = first_line(bstr .. "/capacity") or (rem / tot) * 100 + + 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 + if rate ~= nil and ratev ~= nil then bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12) else