From: Luke Bonham Date: Thu, 31 Mar 2016 09:44:33 +0000 (+0200) Subject: Merge branch 'patch-3' of https://github.com/andering/lain into andering-patch-3 X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/63455361db71b0dde286f85331c6c69f00a3fba7?hp=fcbb371e56561c94cde3e8c52a725524c70fb1d1 Merge branch 'patch-3' of https://github.com/andering/lain into andering-patch-3 --- 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 173601a..ca0ceed 100644 --- a/widgets/weather.lua +++ b/widgets/weather.lua @@ -33,18 +33,23 @@ local function worker(args) local APPID = args.APPID or "3e321f9414eaedbfab34983bda77a66e" -- lain default local timeout = args.timeout or 900 -- 15 min local timeout_forecast = args.timeout or 86400 -- 24 hrs - local current_call = "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'" - local forecast_call = "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s&APPID=%s'" + local current_call = args.current_call or "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'" + local forecast_call = args.forecast_call or "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s&APPID=%s'" local city_id = args.city_id or 0 -- placeholder local units = args.units or "metric" local lang = args.lang or "en" - local cnt = args.cnt or 7 + local cnt = args.cnt or 5 local date_cmd = args.date_cmd or "date -u -d @%d +'%%a %%d'" local icons_path = args.icons_path or lain_icons .. "openweathermap/" local notification_preset = args.notification_preset or {} local notification_text_fun = args.notification_text_fun or - function (day, desc, tmin, tmax) - return string.format("%s: %s, %d - %d ", day, desc, tmin, tmax) + function (wn) + local day = string.gsub(read_pipe(string.format(date_cmd, wn["dt"])), "\n", "") + local tmin = math.floor(wn["temp"]["min"]) + local tmax = math.floor(wn["temp"]["max"]) + local desc = wn["weather"][1]["description"] + + return string.format("%s: %s, %d - %d ", day, desc, tmin, tmax) end local weather_na_markup = args.weather_na_markup or " N/A " local followmouse = args.followmouse or false @@ -61,9 +66,12 @@ 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 - or "Waiting for the server to respond...", + text = weather.notification_text, icon = weather.icon_path, timeout = t_out, preset = notification_preset @@ -71,7 +79,7 @@ local function worker(args) end function weather.hide() - if weather.notification ~= nil then + if weather.notification then naughty.destroy(weather.notification) weather.notification = nil end @@ -92,24 +100,16 @@ local function worker(args) local pos, err weather_now, pos, err = json.decode(f, 1, nil) - if not err and weather_now ~= nil and tonumber(weather_now["cod"]) == 200 then + if not err and weather_now and tonumber(weather_now["cod"]) == 200 then weather.notification_text = '' for i = 1, weather_now["cnt"] do - local day = string.gsub(read_pipe(string.format(date_cmd, weather_now["list"][i]["dt"])), "\n", "") - - local tmin = math.floor(weather_now["list"][i]["temp"]["min"]) - local tmax = math.floor(weather_now["list"][i]["temp"]["max"]) - local desc = weather_now["list"][i]["weather"][1]["description"] - weather.notification_text = weather.notification_text .. - notification_text_fun(day, desc, tmin, tmax) + notification_text_fun(weather_now["list"][i]) if i < weather_now["cnt"] then weather.notification_text = weather.notification_text .. "\n" end end - else - weather.notification_text = "API/connection error or bad/not set city ID" end end) end @@ -120,7 +120,7 @@ local function worker(args) local pos, err weather_now, pos, err = json.decode(f, 1, nil) - if not err and weather_now ~= nil and tonumber(weather_now["cod"]) == 200 then + if not err and weather_now and tonumber(weather_now["cod"]) == 200 then weather.icon_path = icons_path .. weather_now["weather"][1]["icon"] .. ".png" widget = weather.widget settings() diff --git a/wiki b/wiki index bc955e7..facf745 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit bc955e7cd731f672831e6f9013037cccf38b6c9b +Subproject commit facf7454fae759f2ae19d48f81807aa3ff91c19f