readme updated

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

diff --git a/widgets/net.lua b/widgets/net.lua
index af97201143399d3e5c0408ab4b29b233658c017a..d859d911123ad9dc575ac77a7697739c01baea56 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -13,10 +13,10 @@ 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           = io
-local tostring     = tostring
+local io           = { popen  = io.popen }

 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
 


@@ -31,9 +31,9 @@ function net.get_device()
     f = io.popen("ip link show | cut -d' ' -f2,9")
     ws = f:read("*all")
     f:close()
     f = io.popen("ip link show | cut -d' ' -f2,9")
     ws = f:read("*all")
     f:close()

-    ws = ws:match("%w+: UP")
+    ws = ws:match("%w+: UP") or ws:match("ppp%w+: UNKNOWN")

     if ws ~= nil then
     if ws ~= nil then

-        return ws:gsub(": UP", "")
+        return ws:match("(%w+):")

     else
         return "network off"
     end
     else
         return "network off"
     end


@@ -42,10 +42,13 @@ end
 local function worker(args)
     local args = args or {}
     local timeout = args.timeout or 2
 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 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 settings = args.settings or function() end
 

+    iface = args.iface or net.get_device()
+

     net.widget = wibox.widget.textbox('')
 
     helpers.set_map(iface, true)
     net.widget = wibox.widget.textbox('')
 
     helpers.set_map(iface, true)


@@ -53,7 +56,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"


@@ -64,10 +70,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


@@ -76,7 +82,7 @@ local function worker(args)
         net.last_t = now_t
         net.last_r = now_r
 
         net.last_t = now_t
         net.last_r = now_r
 

-        if net_now.carrier ~= "1"
+        if net_now.carrier ~= "1" and notify == "on"

         then
             if helpers.get_map(iface)
             then
         then
             if helpers.get_map(iface)
             then


@@ -86,7 +92,8 @@ local function worker(args)
                     timeout  = 7,
                     position = "top_left",
                     icon     = helpers.icons_dir .. "no_net.png",
                     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
                 })
                 helpers.set_map(iface, false)
             end