]> 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
added issue_template
[etc/awesome.git] / widgets / net.lua
diff --git a/widgets/net.lua b/widgets/net.lua
index 2bfd375c337deb3f7b97fb211425ad07a8b32ab8..ff1607517687226b8184c6e44c93f1d022cd82d3 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -8,96 +8,118 @@
 --]]
 
 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")
-
-local io           = { popen  = io.popen }
-local tostring     = tostring
+local shell        = require("awful.util").shell
 local string       = { format = string.format,
 local string       = { format = string.format,
-                       gsub   = string.gsub }
-
+                       match  = string.match }
 local setmetatable = setmetatable
 
 -- Network infos
 -- lain.widgets.net
 local setmetatable = setmetatable
 
 -- Network infos
 -- lain.widgets.net
-local net = {
-    last_t = 0,
-    last_r = 0
-}
-
-function net.get_device()
-    f = io.popen("ip link show | cut -d' ' -f2,9")
-    ws = f:read("*a")
-    f:close()
-    ws = ws:match("%w+: UP")
-    if ws ~= nil then
-        return ws:gsub(": UP", "")
-    else
-        return "network off"
-    end
-end
 
 local function worker(args)
 
 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 notify = args.notify or "on"
-    local settings = args.settings or function() end
-
-    net.widget = wibox.widget.textbox('')
+    local net = helpers.make_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 {}
+
+    function net.get_device()
+        helpers.async(string.format("%s -c 'ip link show'", shell, device_cmd), function(ws)
+            ws = ws:match("(%w+): <BROADCAST,MULTICAST,.-,UP,LOWER_UP>")
+            net.iface = ws and { ws } or {}
+        end)
+    end
 
 
-    helpers.set_map(iface, true)
+    if #net.iface == 0 then net.get_device() end
 
     function update()
 
     function update()
-        net_now = {}
+        -- 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
+        }
 
 
-        if iface == "" then iface = net.get_device() end
+        -- Total bytes transfered
+        local total_t = 0
+        local total_r = 0
 
 
-        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
+        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)
 
 
-        net_now.sent = tostring((now_t - net.last_t) / timeout / units)
-        net_now.sent = string.gsub(string.format('%.1f', net_now.sent), ",", ".")
+            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.received = tostring((now_r - net.last_r) / timeout / units)
-        net_now.received = string.gsub(string.format('%.1f', net_now.received), ",", ".")
+            dev_now.sent     = (now_t - dev_before.last_t) / timeout / units
+            dev_now.received = (now_r - dev_before.last_r) / timeout / units
 
 
-        widget = net.widget
-        settings()
+            net_now.sent     = net_now.sent     + dev_now.sent
+            net_now.received = net_now.received + dev_now.received
+
+            dev_now.sent     = string.format('%.1f', dev_now.sent)
+            dev_now.received = string.format('%.1f', dev_now.received)
 
 
-        net.last_t = now_t
-        net.last_r = now_r
+            dev_now.last_t   = now_t
+            dev_now.last_r   = now_r
 
 
-        if net_now.carrier ~= "1" and notify == "on"
-        then
-            if helpers.get_map(iface)
-            then
+            -- This will become dev_before in the next update/iteration
+            net.devices[dev] = dev_now
+
+            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",
                     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)
+                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)
+
+            -- Old api compatibility
+            net_now.carrier      = dev_now.carrier
+            net_now.state        = dev_now.state
+            -- And new api
+            net_now.devices[dev] = dev_now
+            -- With the new api new_now.sent and net_now.received will be the
+            -- totals across all specified devices
+        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
         end
+
+        widget = net.widget
+        settings()
     end
 
     end
 
-    helpers.newtimer(iface, timeout, update)
-    return net.widget
+    helpers.newtimer(net.iface, timeout, update)
+
+    return net
 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.