Merge pull request #153 from TheReverend403/master

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

diff --git a/widgets/net.lua b/widgets/net.lua
index 2bfd375c337deb3f7b97fb211425ad07a8b32ab8..af823a824e1eaa48e8e5bd05025365c7d46f261a 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -13,39 +13,35 @@ local notify_fg    = require("beautiful").fg_focus
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
-local io           = { popen  = io.popen }
-local tostring     = tostring
 local string       = { format = string.format,
-                       gsub   = string.gsub }
+                       gsub   = string.gsub,
+                       match  = string.match }
 
 local setmetatable = setmetatable
 
 -- Network infos
 -- lain.widgets.net
-local net = {
-    last_t = 0,
-    last_r = 0
-}
-
-function net.get_device()
-    f = io.popen("ip link show | cut -d' ' -f2,9")
-    ws = f:read("*a")
-    f:close()
-    ws = ws:match("%w+: UP")
-    if ws ~= nil then
-        return ws:gsub(": UP", "")
-    else
-        return "network off"
-    end
-end
 
 local function worker(args)
-    local args = args or {}
-    local timeout = args.timeout or 2
-    local iface = args.iface or net.get_device()
-    local units = args.units or 1024 --kb
-    local notify = args.notify or "on"
+    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 notify   = args.notify or "on"
+    local screen   = args.screen or 1
     local settings = args.settings or function() end
+    local iface    = args.iface or net.get_device()
 
     net.widget = wibox.widget.textbox('')
 
@@ -54,7 +50,10 @@ local function worker(args)
     function update()
         net_now = {}
 
-        if iface == "" then iface = net.get_device() end
+        if iface == "" or string.match(iface, "network off")
+        then
+            iface = net.get_device()
+        end
 
         net_now.carrier = helpers.first_line('/sys/class/net/' .. iface ..
                                            '/carrier') or "0"
@@ -65,10 +64,10 @@ local function worker(args)
         local now_r = helpers.first_line('/sys/class/net/' .. iface ..
                                            '/statistics/rx_bytes') or 0
 
-        net_now.sent = tostring((now_t - net.last_t) / timeout / units)
+        net_now.sent = (now_t - net.last_t) / timeout / units
         net_now.sent = string.gsub(string.format('%.1f', net_now.sent), ",", ".")
 
-        net_now.received = tostring((now_r - net.last_r) / timeout / units)
+        net_now.received = (now_r - net.last_r) / timeout / units
         net_now.received = string.gsub(string.format('%.1f', net_now.received), ",", ".")
 
         widget = net.widget
@@ -88,6 +87,7 @@ local function worker(args)
                     position = "top_left",
                     icon     = helpers.icons_dir .. "no_net.png",
                     fg       = notify_fg or "#FFFFFF",
+                    screen   = screen
                 })
                 helpers.set_map(iface, false)
             end
@@ -97,7 +97,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 })