Merge pull request #138 from InfinityTotality/master

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

diff --git a/widgets/net.lua b/widgets/net.lua
index d1179a28445ad206d6b214cb07529a2d422d5cc9..a578ae4ca9cc405454c4cc57a6b23cd5a9be2a0e 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -13,10 +13,9 @@ local notify_fg    = require("beautiful").fg_focus
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 

-local io           = { popen  = io.popen }
-local tostring     = tostring

 local string       = { format = string.format,
 local string       = { format = string.format,

-                       gsub   = string.gsub }
+                       gsub   = string.gsub,
+                       match  = string.match }

 
 local setmetatable = setmetatable
 
 
 local setmetatable = setmetatable
 


@@ -28,9 +27,7 @@ local net = {
 }
 
 function net.get_device()
 }
 
 function net.get_device()

-    f = io.popen("ip link show | cut -d' ' -f2,9")
-    ws = f:read("*a")
-    f:close()
+    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+):")
     ws = ws:match("%w+: UP") or ws:match("ppp%w+: UNKNOWN")
     if ws ~= nil then
         return ws:match("(%w+):")


@@ -56,7 +53,10 @@ local function worker(args)
     function update()
         net_now = {}
 
     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"
 
         net_now.carrier = helpers.first_line('/sys/class/net/' .. iface ..
                                            '/carrier') or "0"


@@ -67,10 +67,10 @@ local function worker(args)
         local now_r = helpers.first_line('/sys/class/net/' .. iface ..
                                            '/statistics/rx_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 = (now_t - net.last_t) / timeout / units

         net_now.sent = string.gsub(string.format('%.1f', net_now.sent), ",", ".")
 
         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
         net_now.received = string.gsub(string.format('%.1f', net_now.received), ",", ".")
 
         widget = net.widget