Merge branch 'patch-3' of https://github.com/andering/lain into andering-patch-3

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

diff --git a/widgets/net.lua b/widgets/net.lua
index af823a824e1eaa48e8e5bd05025365c7d46f261a..a4b1097b1b52616cbb02793de1c4c81dca1ed8be 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -8,8 +8,6 @@
 --]]
 
 local helpers      = require("lain.helpers")
 --]]
 
 local helpers      = require("lain.helpers")

-
-local notify_fg    = require("beautiful").fg_focus

 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 


@@ -28,11 +26,8 @@ local function worker(args)
     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")
     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
+        if ws  then return ws:match("(%w+):")
+        else return "network off" end

     end
 
     local args     = args or {}
     end
 
     local args     = args or {}


@@ -55,38 +50,33 @@ local function worker(args)
             iface = net.get_device()
         end
 
             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.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'

 
 

-        net_now.sent = (now_t - net.last_t) / timeout / units
-        net_now.sent = string.gsub(string.format('%.1f', net_now.sent), ",", ".")
+        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

 
 

-        net_now.received = (now_r - net.last_r) / timeout / units
-        net_now.received = string.gsub(string.format('%.1f', net_now.received), ",", ".")
+        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), ',', '.')

 
 

-        widget = net.widget
-        settings()
+            widget = net.widget
+            settings()

 
 

-        net.last_t = now_t
-        net.last_r = now_r
+            net.last_t = now_t
+            net.last_r = now_r
+        end

 
 

-        if net_now.carrier ~= "1" and notify == "on"
+        if not string.match(net_now.carrier, "1") and notify == "on"

         then
             if helpers.get_map(iface)
             then
                 naughty.notify({
                     title    = iface,
                     text     = "no carrier",
         then
             if helpers.get_map(iface)
             then
                 naughty.notify({
                     title    = iface,
                     text     = "no carrier",

-                    timeout  = 7,
-                    position = "top_left",

                     icon     = helpers.icons_dir .. "no_net.png",
                     icon     = helpers.icons_dir .. "no_net.png",

-                    fg       = notify_fg or "#FFFFFF",

                     screen   = screen
                 })
                 helpers.set_map(iface, false)
                     screen   = screen
                 })
                 helpers.set_map(iface, false)