]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/net.lua

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:

cal: terminal-colors.d independent highlight matching pattern
[etc/awesome.git] / widgets / net.lua
index 983ec7ae2e12813d9a508003844f45d6293fee52..0b19f0b73656d3b2a361aace32a94e38af646352 100644 (file)
@@ -31,11 +31,12 @@ local function worker(args)
     local settings   = args.settings or function() end
 
     -- Compatibility with old API where iface was a string corresponding to 1 interface
     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 {}
+    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()
         helpers.async(string.format("ip link show", device_cmd), function(ws)
 
     function net.get_device()
         helpers.async(string.format("ip link show", device_cmd), function(ws)
-            ws = ws:match("(%w+): <BROADCAST,MULTICAST,.-,UP,LOWER_UP>")
+            ws = ws:match("(%w+): <BROADCAST,MULTICAST,.-UP,LOWER_UP>")
             net.iface = ws and { ws } or {}
         end)
     end
             net.iface = ws and { ws } or {}
         end)
     end
@@ -116,9 +117,9 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 
-    helpers.newtimer(net.iface, timeout, update)
+    helpers.newtimer("network", timeout, update)
 
 
-    return net
+    return setmetatable(net, { __index = net.widget })
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })