merge and resolve conflicts from #134; #114

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

diff --git a/widgets/base.lua b/widgets/base.lua
index 198b6f71c124c0d141709f61e11bc1d5c3ac2f5c..88478b0512df99887d318bc26237b7c0a099d02e 100644 (file)
--- a/widgets/base.lua
+++ b/widgets/base.lua
@@ -6,35 +6,37 @@
                                                   
 --]]
 
-local newtimer     = require("lain.helpers").newtimer
+local helpers      = require("lain.helpers")
 local wibox        = require("wibox")
 
-local io           = io
 local setmetatable = setmetatable
 
--- Basic template for custom 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 timeout  = args.timeout or 1
     local cmd      = args.cmd or ""
     local settings = args.settings or function() end
 
     base.widget = wibox.widget.textbox('')
+    helpers.set_map(cmd, '')
 
     function base.update()
-        local f = assert(io.popen(cmd))
-        output = f:read("*all")
-        f:close()
-        widget = base.widget
-        settings()
+        output = helpers.read_pipe(cmd)
+
+        if helpers.get_map(cmd) ~= output then
+            widget = base.widget
+            settings()
+            helpers.set_map(cmd, output)
+        end
     end
 
-    newtimer(cmd, timeout, update)
+    helpers.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 })