local naughty = require("naughty")
local wibox = require("wibox")
+local shell = require("awful.util").shell
+
local string = { format = string.format,
- gsub = string.gsub,
match = string.match }
local setmetatable = setmetatable
-- lain.widgets.net
local function worker(args)
- local net = { last_t = 0, last_r = 0 }
-
- function net.get_first_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 {} 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_first_device()
-
- net.widget = wibox.widget.textbox('')
+ 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
- if type(iface) == "string" then
- iftable = {iface}
- else
- iftable = iface
- end
+ net.iface = (args.iface and type(args.iface) == "string" and {args.iface}) or {}
- -- Mark all devices as initially online/active
- for i, dev in ipairs(iftable) do
- helpers.set_map(dev, true)
+ function net.get_device()
+ helpers.async(string.format("%s -c 'ip link show'", shell, device_cmd), function(ws)
+ ws = ws:match("(%w+): <BROADCAST,MULTICAST,.-,UP,LOWER_UP>")
+ net.iface = ws and { ws } or {}
+ end)
end
+ if #net.iface == 0 then net.get_device() end
+
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
}
local total_t = 0
local total_r = 0
- for i, dev in ipairs(iftable) do
- local dev_now = {}
- local dev_before = net_now[dev] or net
+ 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)
- 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'
+ 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"
- 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)
+ dev_now.sent = (now_t - dev_before.last_t) / timeout / units
+ dev_now.received = (now_r - dev_before.last_r) / timeout / units
- if now_t ~= dev_before.last_t or now_r ~= dev_before.last_r then
- dev_now.sent = (now_t - (dev_before.last_t or 0)) / timeout / units
- net_now.sent = net_now.sent + dev_now.sent
- dev_now.sent = string.gsub(string.format('%.1f', dev_now.sent), ',', '.')
- dev_now.received = (now_r - (dev_before.last_r or 0)) / timeout / units
- net_now.received = net_now.received + dev_now.received
- dev_now.received = string.gsub(string.format('%.1f', dev_now.received), ',', '.')
- end
+ net_now.sent = net_now.sent + dev_now.sent
+ net_now.received = net_now.received + dev_now.received
+
+ dev_now.sent = string.format('%.1f', dev_now.sent)
+ dev_now.received = string.format('%.1f', dev_now.received)
+
+ dev_now.last_t = now_t
+ dev_now.last_r = now_r
+
+ -- This will become dev_before in the next update/iteration
+ net.devices[dev] = dev_now
total_t = total_t + now_t
total_r = total_r + now_r
- net_now[dev] = dev_now
-
+ -- 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 = dev,
screen = screen
})
helpers.set_map(dev, false)
- else
+ elseif string.match(dev_now.carrier, "1") then
helpers.set_map(dev, true)
end
+
+ -- 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.gsub(string.format('%.1f', net_now.sent), ',', '.')
- net_now.received = string.gsub(string.format('%.1f', net_now.received), ',', '.')
-
- widget = net.widget
- settings()
-
- net.last_t = total_t
- net.last_r = total_r
+ 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(net.iface, timeout, update)
- return setmetatable(net, { __index = net.widget })
+ return net
end
return setmetatable({}, { __call = function(_, ...) return worker(...) end })
projects / etc / awesome.git / blobdiff