closes #318

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

diff --git a/widget/net.lua b/widget/net.lua
index c6ebaca9d5a9616b9da71e5fb4d489a04bddb206..7e511a394b88868655504999c816dff18326e733 100644 (file)
--- a/widget/net.lua
+++ b/widget/net.lua
@@ -7,28 +7,23 @@
                                                   
 --]]
 
-local helpers      = require("lain.helpers")
-local naughty      = require("naughty")
-local wibox        = require("wibox")
-local string       = { format = string.format,
-                       match  = string.match }
-local setmetatable = setmetatable
+local helpers = require("lain.helpers")
+local naughty = require("naughty")
+local wibox   = require("wibox")
+local string  = { format = string.format, match = string.match }
 
 -- Network infos
 -- lain.widget.net
 
-local function worker(args)
-    local net = { widget = wibox.widget.textbox() }
-    net.last_t = 0
-    net.last_r = 0
-    net.devices = {}
+local function factory(args)
+    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
+    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
@@ -43,20 +38,15 @@ local function worker(args)
 
     if #net.iface == 0 then net.get_device() end
 
-    function update()
+    function net.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
         }
 
-        -- 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 }
@@ -69,55 +59,47 @@ local function worker(args)
             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
 
-            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
 
-            -- 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    = dev,
-                    text     = "no carrier",
+                    text     = "No carrier",
                     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
 
-            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
-            -- 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
 
-        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
 
-    helpers.newtimer("network", timeout, update)
+    helpers.newtimer("network", timeout, net.update)
 
     return net
 end
 
-return setmetatable({}, { __call = function(_, ...) return worker(...) end })
+return factory