X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/0ef82f83e0baaa2936b6204a24ee3b3b638fd409..377b316f5d179d03378d9fa69b246f441d54fb5e:/widgets/mem.lua diff --git a/widgets/mem.lua b/widgets/mem.lua index f014149..986fa76 100644 --- a/widgets/mem.lua +++ b/widgets/mem.lua @@ -1,12 +1,10 @@ --[[ - - Licensed under GNU General Public License v2 - * (c) 2013, Luke Bonham - * (c) 2010-2012, Peter Hofmann - * (c) 2010, Adrian C. - * (c) 2009, Lucas de Vries - + + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham + * (c) 2010-2012, Peter Hofmann + --]] local newtimer = require("lain.helpers").newtimer @@ -32,30 +30,30 @@ local function worker(args) mem.widget = wibox.widget.textbox('') - function mem.update() - mem = {} + function update() + mem_now = {} for line in io.lines("/proc/meminfo") do for k, v in string.gmatch(line, "([%a]+):[%s]+([%d]+).+") do - if k == "MemTotal" then mem.total = math.floor(v / 1024) - elseif k == "MemFree" then mem.free = math.floor(v / 1024) - elseif k == "Buffers" then mem.buf = math.floor(v / 1024) - elseif k == "Cached" then mem.cache = math.floor(v / 1024) - elseif k == "SwapTotal" then mem.swap = math.floor(v / 1024) - elseif k == "SwapFree" then mem.swapf = math.floor(v / 1024) + if k == "MemTotal" then mem_now.total = math.floor(v / 1024) + elseif k == "MemFree" then mem_now.free = math.floor(v / 1024) + elseif k == "Buffers" then mem_now.buf = math.floor(v / 1024) + elseif k == "Cached" then mem_now.cache = math.floor(v / 1024) + elseif k == "SwapTotal" then mem_now.swap = math.floor(v / 1024) + elseif k == "SwapFree" then mem_now.swapf = math.floor(v / 1024) end end end - used = mem.total - (mem.free + mem.buf + mem.cache) - swapused = mem.swap - mem.swapf + mem_now.used = mem_now.total - (mem_now.free + mem_now.buf + mem_now.cache) + mem_now.swapused = mem_now.swap - mem_now.swapf widget = mem.widget settings() end - newtimer("mem", timeout, mem.update) + newtimer("mem", timeout, update) return mem.widget end