]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

#150 fix; wiki updated
authorcopycat-killer <dada@archlinux.info>
Wed, 11 Nov 2015 17:25:51 +0000 (18:25 +0100)
committercopycat-killer <dada@archlinux.info>
Wed, 11 Nov 2015 17:25:51 +0000 (18:25 +0100)
widgets/net.lua

index a578ae4ca9cc405454c4cc57a6b23cd5a9be2a0e..702937cc7938850f4bcc4fe8fb8503ac305c2a91 100644 (file)
@@ -21,22 +21,20 @@ local setmetatable = setmetatable
 
 -- Network infos
 -- lain.widgets.net
 
 -- 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 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
     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)
     end
 
     helpers.newtimer(iface, timeout, update)
-    return net.widget
+
+    return setmetatable(net, { __index = net.widget })
 end
 
 end
 
-return setmetatable(net, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })