]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/net.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
calendar: fix indentation
[etc/awesome.git] / widgets / net.lua
diff --git a/widgets/net.lua b/widgets/net.lua
index 983da41da0655e5a45ef366833045cda12d0fc80..da2130f8e11ea031a9dae902cda4da8b90cca7f9 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")
 
@@ -21,81 +19,64 @@ local setmetatable = setmetatable
 
 -- Network infos
 -- lain.widgets.net
 
 -- Network infos
 -- lain.widgets.net
-local net = {}
-
-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
-end
 
 local function worker(args)
 
 local function worker(args)
-    local args = args or {}
-    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
+    local net = { last_t = 0, last_r = 0 }
 
 
-    iface = args.iface or net.get_device()
+    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
+
+    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()
 
     net.widget = wibox.widget.textbox('')
 
     helpers.set_map(iface, true)
 
     net.widget = wibox.widget.textbox('')
 
     helpers.set_map(iface, true)
-    helpers.set_map("net_t", 0)
-    helpers.set_map("net_r", 0)
 
     function update()
 
     function update()
-        net_now = {
-            sent     = "0.0",
-            received = "0.0"
-        }
+        net_now = {}
 
         if iface == "" or string.match(iface, "network off")
         then
             iface = net.get_device()
         end
 
 
         if iface == "" or string.match(iface, "network off")
         then
             iface = net.get_device()
         end
 
-        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 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.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
 
 
+        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 = (now_r - net.last_r) / timeout / units
-            net_now.received = string.gsub(string.format('%.1f', net_now.received), ",", ".")
+            net_now.received = string.gsub(string.format('%.1f', net_now.received), ',', '.')
 
             widget = net.widget
             settings()
 
 
             widget = net.widget
             settings()
 
-            helpers.set_map("net_t", now_t)
-            helpers.set_map("net_r", now_r)
+            net.last_t = now_t
+            net.last_r = now_r
         end
 
         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)
@@ -105,9 +86,9 @@ local function worker(args)
         end
     end
 
         end
     end
 
-    helpers.newtimer(iface, timeout, update, false)
+    helpers.newtimer(iface, timeout, update)
 
 
-    return net.widget
+    return setmetatable(net, { __index = net.widget })
 end
 
 end
 
-return setmetatable(net, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.