merge and resolve conflicts from #134; #114

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

diff --git a/widgets/net.lua b/widgets/net.lua
index af97201143399d3e5c0408ab4b29b233658c017a..983da41da0655e5a45ef366833045cda12d0fc80 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -13,27 +13,21 @@ 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
-}
+local net = {}
 
 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")
+    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:gsub(": UP", "")
+        return ws:match("(%w+):")
     else
         return "network off"
     end
@@ -41,42 +35,57 @@ end
 
 local function worker(args)
     local args = args or {}
-    local timeout = args.timeout or 2
-    local iface = args.iface or net.get_device()
+    local timeout = args.timeout or 1
     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
 
+    iface = args.iface or net.get_device()
+
     net.widget = wibox.widget.textbox('')
 
     helpers.set_map(iface, true)
+    helpers.set_map("net_t", 0)
+    helpers.set_map("net_r", 0)
 
     function update()
-        net_now = {}
+        net_now = {
+            sent     = "0.0",
+            received = "0.0"
+        }
 
-        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"
-        net_now.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
 
-        net_now.sent = tostring((now_t - net.last_t) / timeout / units)
-        net_now.sent = string.gsub(string.format('%.1f', net_now.sent), ",", ".")
+        if now_t ~= helpers.get_map("net_t")
+           or now_r ~= helpers.get_map("net_r") then
+            net_now.carrier = helpers.first_line('/sys/class/net/' .. iface ..
+                                           '/carrier') or "0"
+            net_now.state = helpers.first_line('/sys/class/net/' .. iface ..
+                                           '/operstate') or "down"
 
-        net_now.received = tostring((now_r - net.last_r) / timeout / units)
-        net_now.received = string.gsub(string.format('%.1f', net_now.received), ",", ".")
+            net_now.sent = (now_t - net.last_t) / timeout / units
+            net_now.sent = string.gsub(string.format('%.1f', net_now.sent), ",", ".")
 
-        widget = net.widget
-        settings()
+            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()
 
-        if net_now.carrier ~= "1"
+            helpers.set_map("net_t", now_t)
+            helpers.set_map("net_r", now_r)
+        end
+
+        if net_now.carrier ~= "1" and notify == "on"
         then
             if helpers.get_map(iface)
             then
@@ -86,7 +95,8 @@ local function worker(args)
                     timeout  = 7,
                     position = "top_left",
                     icon     = helpers.icons_dir .. "no_net.png",
-                    fg       = notify_fg or "#FFFFFF"
+                    fg       = notify_fg or "#FFFFFF",
+                    screen   = screen
                 })
                 helpers.set_map(iface, false)
             end
@@ -95,7 +105,8 @@ local function worker(args)
         end
     end
 
-    helpers.newtimer(iface, timeout, update)
+    helpers.newtimer(iface, timeout, update, false)
+
     return net.widget
 end