#91 pull + clean useless lines

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

diff --git a/widgets/base.lua b/widgets/base.lua
index 0431d03a8891f15696ff674aa47e501cf7a86b2a..39b0863e4dfbf8ba1b01ea751d9520d1b2977330 100644 (file)
--- a/widgets/base.lua
+++ b/widgets/base.lua
@@ -9,14 +9,14 @@
 local newtimer     = require("lain.helpers").newtimer
 local wibox        = require("wibox")
 
-local io           = io
+local io           = { popen = io.popen }
 local setmetatable = setmetatable
 
--- Basic template for simple widgets 
+-- Basic template for custom widgets
 -- lain.widgets.base
-local base = {}
 
 local function worker(args)
+    local base     = {}
     local args     = args or {}
     local timeout  = args.timeout or 5
     local cmd      = args.cmd or ""
@@ -24,14 +24,17 @@ local function worker(args)
 
     base.widget = wibox.widget.textbox('')
 
-    function update()
-        output = io.popen(cmd):read("*all")
+    function base.update()
+        local f = assert(io.popen(cmd))
+        output = f:read("*a")
+        f:close()
         widget = base.widget
         settings()
     end
 
-    newtimer(cmd, timeout, update)
-    return base.widget
+    newtimer(cmd, timeout, base.update)
+
+    return setmetatable(base, { __index = base.widget })
 end
 
-return setmetatable(base, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })