cal: terminal-colors.d independent highlight matching pattern

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

diff --git a/widgets/net.lua b/widgets/net.lua
index 83ac6bf7791bba27ca30760d5f50f1c697aff0ad..0b19f0b73656d3b2a361aace32a94e38af646352 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -10,12 +10,8 @@
 local helpers      = require("lain.helpers")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 local helpers      = require("lain.helpers")
 local naughty      = require("naughty")
 local wibox        = require("wibox")

-
-local shell        = require("awful.util").shell
-

 local string       = { format = string.format,
                        match  = string.match }
 local string       = { format = string.format,
                        match  = string.match }

-

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


@@ -35,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()
 
     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>")
+        helpers.async(string.format("ip link show", device_cmd), function(ws)
+            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


@@ -120,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 })