From d659c34974ee8e2c136bbac2424c5d95b889492d Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Wed, 11 Nov 2015 18:25:51 +0100 Subject: [PATCH] #150 fix; wiki updated --- widgets/net.lua | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/widgets/net.lua b/widgets/net.lua index a578ae4..702937c 100644 --- a/widgets/net.lua +++ b/widgets/net.lua @@ -21,22 +21,20 @@ local setmetatable = setmetatable -- Network infos -- lain.widgets.net -local net = { - last_t = 0, - last_r = 0 -} - -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 ~= nil then - return ws:match("(%w+):") - else - return "network off" - end -end local function worker(args) + local net = { last_t = 0, last_r = 0 } + + 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 ~= nil then + return ws:match("(%w+):") + else + return "network off" + end + end + local args = args or {} local timeout = args.timeout or 2 local units = args.units or 1024 --kb @@ -100,7 +98,8 @@ local function worker(args) end helpers.newtimer(iface, timeout, update) - return net.widget + + return setmetatable(net, { __index = net.widget }) end -return setmetatable(net, { __call = function(_, ...) return worker(...) end }) +return setmetatable({}, { __call = function(_, ...) return worker(...) end }) -- 2.39.5