widgets: no global tables, but one instance per call; closes #336; closes #337

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

diff --git a/widget/sysload.lua b/widget/sysload.lua
index ada349c82bf5899ba969621283ae559a1a423129..d35868753135b02b9ad58e41de46d98363757c2f 100644 (file)
--- a/widget/sysload.lua
+++ b/widget/sysload.lua
@@ -7,29 +7,25 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local helpers      = require("lain.helpers")
-local wibox        = require("wibox")
-local io           = { open = io.open }
-local string       = { match  = string.match }
-local setmetatable = setmetatable
+local helpers     = require("lain.helpers")
+local wibox       = require("wibox")
+local open, match = io.open, string.match

 
 -- System load
 -- lain.widget.sysload
 
 -- System load
 -- lain.widget.sysload

-local sysload = {}

 
 

-local function worker(args)
+local function factory(args)
+    local sysload  = { widget = wibox.widget.textbox() }

     local args     = args or {}
     local timeout  = args.timeout or 2
     local settings = args.settings or function() end
 
     local args     = args or {}
     local timeout  = args.timeout or 2
     local settings = args.settings or function() end
 

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

     function sysload.update()
     function sysload.update()

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

         local ret = f:read("*all")
         f:close()
 
         local ret = f:read("*all")
         f:close()
 

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

 
         widget = sysload.widget
         settings()
 
         widget = sysload.widget
         settings()


@@ -40,4 +36,4 @@ local function worker(args)
     return sysload
 end
 
     return sysload
 end
 

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