Merge pull request #296 from 2009/patch-2

[etc/awesome.git] / widgets / sysload.lua

diff --git a/widgets/sysload.lua b/widgets/sysload.lua
index b10c5e2300ec5737a97f5484610dc4e61944517e..df9dbea06bfeb265febeab5ba015cce3c15833c9 100644 (file)
--- a/widgets/sysload.lua
+++ b/widgets/sysload.lua
@@ -7,13 +7,10 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local newtimer     = require("lain.helpers").newtimer
-
+local helpers      = require("lain.helpers")

 local wibox        = require("wibox")
 local wibox        = require("wibox")

-

 local io           = { open = io.open }
 local string       = { match  = string.match }
 local io           = { open = io.open }
 local string       = { match  = string.match }

-

 local setmetatable = setmetatable
 
 -- System load
 local setmetatable = setmetatable
 
 -- System load


@@ -21,15 +18,15 @@ local setmetatable = setmetatable
 local sysload = {}
 
 local function worker(args)
 local sysload = {}
 
 local function worker(args)

-    local args = args or {}
-    local timeout = args.timeout or 2
+    local args     = args or {}
+    local timeout  = args.timeout or 2

     local settings = args.settings or function() end
 
     local settings = args.settings or function() end
 

-    sysload.widget = wibox.widget.textbox('')
+    sysload.widget = wibox.widget.textbox()

 
 

-    function update()
+    function sysload.update()

         local f = io.open("/proc/loadavg")
         local f = io.open("/proc/loadavg")

-        local ret = f:read("*a")
+        local ret = f:read("*all")

         f:close()
 
         load_1, load_5, load_15 = string.match(ret, "([^%s]+) ([^%s]+) ([^%s]+)")
         f:close()
 
         load_1, load_5, load_15 = string.match(ret, "([^%s]+) ([^%s]+) ([^%s]+)")


@@ -38,8 +35,9 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 

-    newtimer("sysload", timeout, update)
-    return sysload.widget
+    helpers.newtimer("sysload", timeout, sysload.update)
+
+    return sysload

 end
 
 return setmetatable(sysload, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable(sysload, { __call = function(_, ...) return worker(...) end })