X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/fe8e24e5f589f10ab44c87f21a6fb4c450ae4507..d9877c4bedca550478507f268f43e137e4454c24:/widgets/net.lua diff --git a/widgets/net.lua b/widgets/net.lua index da2130f..0b19f0b 100644 --- a/widgets/net.lua +++ b/widgets/net.lua @@ -10,83 +10,114 @@ local helpers = require("lain.helpers") local naughty = require("naughty") local wibox = require("wibox") - local string = { format = string.format, - gsub = string.gsub, match = string.match } - local setmetatable = setmetatable -- Network infos -- lain.widgets.net local function worker(args) - local net = { last_t = 0, last_r = 0 } + local net = helpers.make_widget_textbox() + net.last_t = 0 + net.last_r = 0 + net.devices = {} + + local args = args or {} + local timeout = args.timeout or 2 + local units = args.units or 1024 --kb + local notify = args.notify or "on" + local screen = args.screen or 1 + local settings = args.settings or function() end + + -- Compatibility with old API where iface was a string corresponding to 1 interface + net.iface = (args.iface and (type(args.iface) == "string" and {args.iface}) or + (type(args.iface) == "table" and args.iface)) or {} function net.get_device() - local ws = helpers.read_pipe("ip link show | cut -d' ' -f2,9") - ws = ws:match("%w+: UP") or ws:match("ppp%w+: UNKNOWN") - if ws then return ws:match("(%w+):") - else return "network off" end + helpers.async(string.format("ip link show", device_cmd), function(ws) + ws = ws:match("(%w+): ") + net.iface = ws and { ws } or {} + end) end - local args = args or {} - local timeout = args.timeout or 2 - local units = args.units or 1024 --kb - local notify = args.notify or "on" - local screen = args.screen or 1 - local settings = args.settings or function() end - local iface = args.iface or net.get_device() + if #net.iface == 0 then net.get_device() end - net.widget = wibox.widget.textbox('') + function update() + -- These are the totals over all specified interfaces + net_now = { + -- New api - Current state of requested devices + devices = {}, + -- Bytes since last iteration + sent = 0, + received = 0 + } - helpers.set_map(iface, true) + -- Total bytes transfered + local total_t = 0 + local total_r = 0 - function update() - net_now = {} + for i, dev in ipairs(net.iface) do + local dev_now = {} + local dev_before = net.devices[dev] or { last_t = 0, last_r = 0 } + local now_t = tonumber(helpers.first_line(string.format("/sys/class/net/%s/statistics/tx_bytes", dev)) or 0) + local now_r = tonumber(helpers.first_line(string.format("/sys/class/net/%s/statistics/rx_bytes", dev)) or 0) - if iface == "" or string.match(iface, "network off") - then - iface = net.get_device() - end + dev_now.carrier = helpers.first_line(string.format("/sys/class/net/%s/carrier", dev)) or "0" + dev_now.state = helpers.first_line(string.format("/sys/class/net/%s/operstate", dev)) or "down" - net_now.carrier = helpers.first_line(string.format('/sys/class/net/%s/carrier', iface)) or '0' - net_now.state = helpers.first_line(string.format('/sys/class/net/%s/operstate', iface)) or 'down' + dev_now.sent = (now_t - dev_before.last_t) / timeout / units + dev_now.received = (now_r - dev_before.last_r) / timeout / units - local now_t = helpers.first_line(string.format('/sys/class/net/%s/statistics/tx_bytes', iface)) or 0 - local now_r = helpers.first_line(string.format('/sys/class/net/%s/statistics/rx_bytes', iface)) or 0 + net_now.sent = net_now.sent + dev_now.sent + net_now.received = net_now.received + dev_now.received - if now_t ~= net.last_t or now_r ~= net.last_r then - net_now.sent = (now_t - net.last_t) / timeout / units - net_now.sent = string.gsub(string.format('%.1f', net_now.sent), ',', '.') - net_now.received = (now_r - net.last_r) / timeout / units - net_now.received = string.gsub(string.format('%.1f', net_now.received), ',', '.') + dev_now.sent = string.format('%.1f', dev_now.sent) + dev_now.received = string.format('%.1f', dev_now.received) - widget = net.widget - settings() + dev_now.last_t = now_t + dev_now.last_r = now_r - net.last_t = now_t - net.last_r = now_r - end + -- This will become dev_before in the next update/iteration + net.devices[dev] = dev_now - if not string.match(net_now.carrier, "1") and notify == "on" - then - if helpers.get_map(iface) - then + total_t = total_t + now_t + total_r = total_r + now_r + + -- Notify only once when connection is loss + if string.match(dev_now.carrier, "0") and notify == "on" and helpers.get_map(dev) then naughty.notify({ - title = iface, + title = dev, text = "no carrier", icon = helpers.icons_dir .. "no_net.png", screen = screen }) - helpers.set_map(iface, false) + helpers.set_map(dev, false) + elseif string.match(dev_now.carrier, "1") then + helpers.set_map(dev, true) end - else - helpers.set_map(iface, true) + + -- Old api compatibility + net_now.carrier = dev_now.carrier + net_now.state = dev_now.state + -- And new api + net_now.devices[dev] = dev_now + -- With the new api new_now.sent and net_now.received will be the + -- totals across all specified devices end + + if total_t ~= net.last_t or total_r ~= net.last_r then + net_now.sent = string.format('%.1f', net_now.sent) + net_now.received = string.format('%.1f', net_now.received) + net.last_t = total_t + net.last_r = total_r + end + + widget = net.widget + settings() end - helpers.newtimer(iface, timeout, update) + helpers.newtimer("network", timeout, update) return setmetatable(net, { __index = net.widget }) end