]> 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
maildir: turned into an abase example
[etc/awesome.git] / widgets / net.lua
diff --git a/widgets/net.lua b/widgets/net.lua
index da2130f8e11ea031a9dae902cda4da8b90cca7f9..223f3aff15f409e8518727c54a7d4475ce5d9a65 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -10,85 +10,114 @@
 local helpers      = require("lain.helpers")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 local helpers      = require("lain.helpers")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
-
 local string       = { format = string.format,
 local string       = { format = string.format,
-                       gsub   = string.gsub,
                        match  = string.match }
                        match  = string.match }
-
 local setmetatable = setmetatable
 
 -- Network infos
 -- lain.widgets.net
 
 local function worker(args)
 local setmetatable = setmetatable
 
 -- Network infos
 -- lain.widgets.net
 
 local function worker(args)
-    local net = { last_t = 0, last_r = 0 }
+    local net = { widget = wibox.widget.textbox() }
+    net.last_t = 0
+    net.last_r = 0
+    net.devices = {}
+
+    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
+
+    -- Compatibility with old API where iface was a string corresponding to 1 interface
+    net.iface = (args.iface and (type(args.iface) == "string" and {args.iface}) or
+                (type(args.iface) == "table" and args.iface)) or {}
 
     function 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
+        helpers.async(string.format("ip link show", device_cmd), function(ws)
+            ws = ws:match("(%w+): <BROADCAST,MULTICAST,.-UP,LOWER_UP>")
+            net.iface = ws and { ws } or {}
+        end)
     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()
+    if #net.iface == 0 then net.get_device() end
 
 
-    net.widget = wibox.widget.textbox('')
+    function update()
+        -- These are the totals over all specified interfaces
+        net_now = {
+            -- New api - Current state of requested devices
+            devices  = {},
+            -- Bytes since last iteration
+            sent     = 0,
+            received = 0
+        }
 
 
-    helpers.set_map(iface, true)
+        -- Total bytes transfered
+        local total_t = 0
+        local total_r = 0
 
 
-    function update()
-        net_now = {}
+        for i, dev in ipairs(net.iface) do
+            local dev_now    = {}
+            local dev_before = net.devices[dev] or { last_t = 0, last_r = 0 }
+            local now_t      = tonumber(helpers.first_line(string.format("/sys/class/net/%s/statistics/tx_bytes", dev)) or 0)
+            local now_r      = tonumber(helpers.first_line(string.format("/sys/class/net/%s/statistics/rx_bytes", dev)) or 0)
 
 
-        if iface == "" or string.match(iface, "network off")
-        then
-            iface = net.get_device()
-        end
+            dev_now.carrier  = helpers.first_line(string.format("/sys/class/net/%s/carrier", dev)) or "0"
+            dev_now.state    = helpers.first_line(string.format("/sys/class/net/%s/operstate", dev)) 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'
+            dev_now.sent     = (now_t - dev_before.last_t) / timeout / units
+            dev_now.received = (now_r - dev_before.last_r) / timeout / units
 
 
-        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.sent     = net_now.sent     + dev_now.sent
+            net_now.received = net_now.received + dev_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), ',', '.')
+            dev_now.sent     = string.format('%.1f', dev_now.sent)
+            dev_now.received = string.format('%.1f', dev_now.received)
 
 
-            widget = net.widget
-            settings()
+            dev_now.last_t   = now_t
+            dev_now.last_r   = now_r
 
 
-            net.last_t = now_t
-            net.last_r = now_r
-        end
+            -- This will become dev_before in the next update/iteration
+            net.devices[dev] = dev_now
 
 
-        if not string.match(net_now.carrier, "1") and notify == "on"
-        then
-            if helpers.get_map(iface)
-            then
+            total_t  = total_t + now_t
+            total_r  = total_r + now_r
+
+            -- Notify only once when connection is loss
+            if string.match(dev_now.carrier, "0") and notify == "on" and helpers.get_map(dev) then
                 naughty.notify({
                 naughty.notify({
-                    title    = iface,
+                    title    = dev,
                     text     = "no carrier",
                     icon     = helpers.icons_dir .. "no_net.png",
                     screen   = screen
                 })
                     text     = "no carrier",
                     icon     = helpers.icons_dir .. "no_net.png",
                     screen   = screen
                 })
-                helpers.set_map(iface, false)
+                helpers.set_map(dev, false)
+            elseif string.match(dev_now.carrier, "1") then
+                helpers.set_map(dev, true)
             end
             end
-        else
-            helpers.set_map(iface, true)
+
+            net_now.carrier      = dev_now.carrier
+            net_now.state        = dev_now.state
+            net_now.devices[dev] = dev_now
+            -- new_now.sent and net_now.received will be the
+            -- totals across all specified devices
         end
         end
+
+        if total_t ~= net.last_t or total_r ~= net.last_r then
+            net_now.sent     = string.format('%.1f', net_now.sent)
+            net_now.received = string.format('%.1f', net_now.received)
+            net.last_t       = total_t
+            net.last_r       = total_r
+        end
+
+        widget = net.widget
+        settings()
     end
 
     end
 
-    helpers.newtimer(iface, timeout, update)
+    helpers.newtimer("network", timeout, update)
 
 
-    return setmetatable(net, { __index = net.widget })
+    return net
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })
 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.