From: copycat-killer Date: Wed, 30 Mar 2016 14:34:41 +0000 (+0200) Subject: #182 and #184 implemented without tabs; wiki updated X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/14cab4ebc3fd8b0e121c41653a55e516a977591a?ds=sidebyside;hp=-c #182 and #184 implemented without tabs; wiki updated --- 14cab4ebc3fd8b0e121c41653a55e516a977591a diff --git a/helpers.lua b/helpers.lua index 137bd6a..8fb794c 100644 --- a/helpers.lua +++ b/helpers.lua @@ -49,13 +49,25 @@ end -- list/table if the file does not exist function helpers.lines_from(file) if not helpers.file_exists(file) then return {} end - lines = {} + local lines = {} for line in io.lines(file) do lines[#lines + 1] = line end return lines end +-- match all lines from a file, returns an empty +-- list/table if the file or match does not exist +function helpers.lines_match(regexp, file) + local lines = {} + for index,line in pairs(helpers.lines_from(file)) do + if string.match(line, regexp) then + lines[index] = line + end + end + return lines +end + -- get first line of a file, return nil if -- the file does not exist function helpers.first_line(file) diff --git a/widgets/cpu.lua b/widgets/cpu.lua index 6019f32..737b6fa 100644 --- a/widgets/cpu.lua +++ b/widgets/cpu.lua @@ -7,7 +7,7 @@ --]] -local first_line = require("lain.helpers").first_line +local lines_match = require("lain.helpers").lines_match local newtimer = require("lain.helpers").newtimer local wibox = require("wibox") @@ -21,55 +21,67 @@ local setmetatable = setmetatable -- CPU usage -- lain.widgets.cpu -local cpu = { last_total = 0, last_active = 0 } +local cpu = { core = {} } local function worker(args) local args = args or {} - local timeout = args.timeout or 2 - local settings = args.settings or function() end + local timeout = args.timeout or 2 + local settings = args.settings or function() end - cpu.widget = wibox.widget.textbox('') + cpu.widget = wibox.widget.textbox('') - function update() + function update() -- Read the amount of time the CPUs have spent performing - -- different kinds of work. Read the first line of /proc/stat - -- which is the sum of all CPUs. - local times = first_line("/proc/stat") - local at = 1 - local idle = 0 - local total = 0 - for field in string.gmatch(times, "[%s]+([^%s]+)") + -- different kinds of work. Read the first line of /proc/stat + -- which is the sum of all CPUs. + local times = lines_match("cpu","/proc/stat") + + for index,time in pairs(times) do - -- 4 = idle, 5 = ioWait. Essentially, the CPUs have done - -- nothing during these times. - if at == 4 or at == 5 - then - idle = idle + field + local coreid = index - 1 + local core = cpu.core[coreid] or + { last_active = 0 , last_total = 0, usage = 0 } + local at = 1 + local idle = 0 + local total = 0 + + for field in string.gmatch(time, "[%s]+([^%s]+)") + do + -- 4 = idle, 5 = ioWait. Essentially, the CPUs have done + -- nothing during these times. + if at == 4 or at == 5 then + idle = idle + field + end + total = total + field + at = at + 1 + end + + local active = total - idle + + if core.last_active ~= active or core.last_total ~= total then + -- Read current data and calculate relative values. + local dactive = active - core.last_active + local dtotal = total - core.last_total + + local usage = math.ceil((dactive / dtotal) * 100) + + core.last_active = active + core.last_total = total + core.usage = usage + + -- Save current data for the next run. + cpu.core[coreid] = core; end - total = total + field - at = at + 1 - end - local active = total - idle - - if cpu.last_active ~= active or cpu.last_total ~= total then - -- Read current data and calculate relative values. - local dactive = active - cpu.last_active - local dtotal = total - cpu.last_total - - cpu_now = {} - cpu_now.usage = tostring(math.ceil((dactive / dtotal) * 100)) - - widget = cpu.widget - settings() - - -- Save current data for the next run. - cpu.last_active = active - cpu.last_total = total end + + widget = cpu.widget + cpu_now = cpu.core + cpu_now.usage = cpu_now[0].usage + + settings() end newtimer("cpu", timeout, update) - return cpu.widget end diff --git a/widgets/weather.lua b/widgets/weather.lua index 3f9253f..ca0ceed 100644 --- a/widgets/weather.lua +++ b/widgets/weather.lua @@ -66,6 +66,10 @@ local function worker(args) notification_preset.screen = mouse.screen end + if not weather.notification_text then + weather.forecast_update() + end + weather.notification = naughty.notify({ text = weather.notification_text, icon = weather.icon_path, @@ -106,8 +110,6 @@ local function worker(args) weather.notification_text = weather.notification_text .. "\n" end end - else - weather.notification_text = 0 end end) end