mem: adjusted calculation; #271

[etc/awesome.git] / widgets / net.lua

diff --git a/widgets/net.lua b/widgets/net.lua
index 983ec7ae2e12813d9a508003844f45d6293fee52..81345fc3bcd19040c00990180608afd0db231087 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -12,6 +12,7 @@ local naughty      = require("naughty")
 local wibox        = require("wibox")
 local string       = { format = string.format,
                        match  = string.match }
 local wibox        = require("wibox")
 local string       = { format = string.format,
                        match  = string.match }

+local tostring     = tostring

 local setmetatable = setmetatable
 
 -- Network infos
 local setmetatable = setmetatable
 
 -- Network infos


@@ -31,11 +32,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,7 +118,7 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 

-    helpers.newtimer(net.iface, timeout, update)
+    helpers.newtimer("net-" .. tostring(net.iface), timeout, update)

 
     return net
 end
 
     return net
 end