Merge pull request #110 from dnedbaylo/master

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

diff --git a/widgets/base.lua b/widgets/base.lua
index 198b6f71c124c0d141709f61e11bc1d5c3ac2f5c..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 newtimer     = require("lain.helpers").newtimer
 local wibox        = require("wibox")
 

-local io           = io
+local io           = { popen = io.popen }

 local setmetatable = setmetatable
 
 local setmetatable = setmetatable
 

--- Basic template for custom widgets 
+-- Basic template for custom widgets

 -- lain.widgets.base
 -- lain.widgets.base

-local base = {}

 
 local function worker(args)
 
 local function worker(args)

+    local base     = {}

     local args     = args or {}
     local timeout  = args.timeout or 5
     local cmd      = args.cmd or ""
     local args     = args or {}
     local timeout  = args.timeout or 5
     local cmd      = args.cmd or ""


@@ -26,15 +26,15 @@ local function worker(args)
 
     function base.update()
         local f = assert(io.popen(cmd))
 
     function base.update()
         local f = assert(io.popen(cmd))

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

         f:close()
         widget = base.widget
         settings()
     end
 
         f:close()
         widget = base.widget
         settings()
     end
 

-    newtimer(cmd, timeout, update)
+    newtimer(cmd, timeout, base.update)

 
     return setmetatable(base, { __index = base.widget })
 end
 
 
     return setmetatable(base, { __index = base.widget })
 end
 

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