Merge pull request #180 from stwa/patch-4

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

diff --git a/widgets/net.lua b/widgets/net.lua
index e086c4b9dd386341a8fc5be31d058f28183d3d90..a4b1097b1b52616cbb02793de1c4c81dca1ed8be 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -8,84 +8,76 @@
 --]]
 
 local helpers      = require("lain.helpers")
-
-local notify_fg    = require("beautiful").fg_focus
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
-local io           = io
-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("*all")
-    f:close()
-    ws = ws:match("%w+: UP")
-    if ws ~= nil then
-        return ws:gsub(": UP", "")
-    else
-        return ""
+
+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  then return ws:match("(%w+):")
+        else return "network off" end
     end
-end
 
-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 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()
 
-    widget = wibox.widget.textbox('')
+    net.widget = wibox.widget.textbox('')
 
     helpers.set_map(iface, true)
 
-    function update() 
-        if iface == "" then iface = net.get_device() end
+    function update()
+        net_now = {}
 
-        carrier = helpers.first_line('/sys/class/net/' .. iface ..
-                                           '/carrier') or "0"
-        state = helpers.first_line('/sys/class/net/' .. iface ..
-                                           '/operstate') or "down"
-        local now_t = helpers.first_line('/sys/class/net/' .. iface ..
-                                           '/statistics/tx_bytes') or 0
-        local now_r = helpers.first_line('/sys/class/net/' .. iface ..
-                                           '/statistics/rx_bytes') or 0
+        if iface == "" or string.match(iface, "network off")
+        then
+            iface = net.get_device()
+        end
 
-        sent = tostring((now_t - net.last_t) / timeout / units)
-        sent = string.gsub(string.format('%.1f', sent), ",", ".")
+        net_now.carrier  = helpers.first_line(string.format('/sys/class/net/%s/carrier', iface)) or '0'
+        net_now.state    = helpers.first_line(string.format('/sys/class/net/%s/operstate', iface)) or 'down'
 
-        received = tostring((now_r - net.last_r) / timeout / units)
-        received = string.gsub(string.format('%.1f', received), ",", ".")
+        local now_t      = helpers.first_line(string.format('/sys/class/net/%s/statistics/tx_bytes', iface)) or 0
+        local now_r      = helpers.first_line(string.format('/sys/class/net/%s/statistics/rx_bytes', iface)) or 0
 
-        settings()
+        if now_t ~= net.last_t or now_r ~= net.last_r then  
+            net_now.sent     = (now_t - net.last_t) / timeout / units
+            net_now.sent     = string.gsub(string.format('%.1f', net_now.sent), ',', '.')
+            net_now.received = (now_r - net.last_r) / timeout / units
+            net_now.received = string.gsub(string.format('%.1f', net_now.received), ',', '.')
 
-        net.last_t = now_t
-        net.last_r = now_r
+            widget = net.widget
+            settings()
+
+            net.last_t = now_t
+            net.last_r = now_r
+        end
 
-        if carrier ~= "1"
+        if not string.match(net_now.carrier, "1") and notify == "on"
         then
             if helpers.get_map(iface)
             then
-                n_title = iface
-                if n_title == "" then n_title = "network" end
                 naughty.notify({
-                    title    = n_title,
+                    title    = iface,
                     text     = "no carrier",
-                    timeout  = 7,
-                    position = "top_left",
                     icon     = helpers.icons_dir .. "no_net.png",
-                    fg       = notify_fg or "#FFFFFF"
+                    screen   = screen
                 })
                 helpers.set_map(iface, false)
             end
@@ -96,7 +88,7 @@ function worker(args)
 
     helpers.newtimer(iface, timeout, update)
 
-    return widget
+    return setmetatable(net, { __index = net.widget })
 end
 
-return setmetatable(net, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })