]> git.madduck.net Git - etc/awesome.git/blobdiff - widget/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
Merge pull request #344 from 2009/patch-5
[etc/awesome.git] / widget / net.lua
diff --git a/widget/net.lua b/widget/net.lua
index a4b8c34b014bca2e31ce1bc5939acfc4a67d613a..f42ec25d01a52a0f37f24b495a1993f08fce4753 100644 (file)
--- a/widget/net.lua
+++ b/widget/net.lua
@@ -10,24 +10,19 @@
 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,
-                  match  = string.match }
+local string  = { format = string.format, match = string.match }
 
 -- Network infos
 -- lain.widget.net
 
 local function factory(args)
 
 -- Network infos
 -- lain.widget.net
 
 local function factory(args)
-    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
+    local net      = { widget = wibox.widget.textbox(), 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
 
     -- 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
@@ -42,20 +37,15 @@ local function factory(args)
 
     if #net.iface == 0 then net.get_device() end
 
 
     if #net.iface == 0 then net.get_device() end
 
-    function update()
+    function net.update()
         -- These are the totals over all specified interfaces
         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
         }
 
             devices  = {},
             -- Bytes since last iteration
             sent     = 0,
             received = 0
         }
 
-        -- Total bytes transfered
-        local total_t = 0
-        local total_r = 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 }
         for i, dev in ipairs(net.iface) do
             local dev_now    = {}
             local dev_before = net.devices[dev] or { last_t = 0, last_r = 0 }
@@ -68,53 +58,45 @@ local function factory(args)
             dev_now.sent     = (now_t - dev_before.last_t) / timeout / units
             dev_now.received = (now_r - dev_before.last_r) / timeout / units
 
             dev_now.sent     = (now_t - dev_before.last_t) / timeout / units
             dev_now.received = (now_r - dev_before.last_r) / timeout / units
 
-            net_now.sent     = net_now.sent     + dev_now.sent
+            net_now.sent     = net_now.sent + dev_now.sent
             net_now.received = net_now.received + dev_now.received
 
             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)
+            dev_now.sent     = string.format("%.1f", dev_now.sent)
+            dev_now.received = string.format("%.1f", dev_now.received)
 
             dev_now.last_t   = now_t
             dev_now.last_r   = now_r
 
 
             dev_now.last_t   = now_t
             dev_now.last_r   = now_r
 
-            -- This will become dev_before in the next update/iteration
             net.devices[dev] = dev_now
 
             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
             -- 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    = dev,
                     title    = dev,
-                    text     = "no carrier",
+                    text     = "No carrier",
                     icon     = helpers.icons_dir .. "no_net.png",
                     screen   = screen
                     icon     = helpers.icons_dir .. "no_net.png",
                     screen   = screen
-                })
+                }
                 helpers.set_map(dev, false)
             elseif string.match(dev_now.carrier, "1") then
                 helpers.set_map(dev, true)
             end
 
                 helpers.set_map(dev, false)
             elseif string.match(dev_now.carrier, "1") then
                 helpers.set_map(dev, true)
             end
 
-            net_now.carrier      = dev_now.carrier
-            net_now.state        = dev_now.state
+            net_now.carrier = dev_now.carrier
+            net_now.state = dev_now.state
             net_now.devices[dev] = dev_now
             net_now.devices[dev] = dev_now
-            -- new_now.sent and net_now.received will be the
-            -- totals across all specified devices
+            -- 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
+        net_now.sent = string.format("%.1f", net_now.sent)
+        net_now.received = string.format("%.1f", net_now.received)
 
         widget = net.widget
         settings()
     end
 
 
         widget = net.widget
         settings()
     end
 
-    helpers.newtimer("network", timeout, update)
+    helpers.newtimer("network", timeout, net.update)
 
     return net
 end
 
     return net
 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.