Merge branch 'master' of https://github.com/copycat-killer/lain

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

diff --git a/widgets/base.lua b/widgets/base.lua
index 88478b0512df99887d318bc26237b7c0a099d02e..2f377f78bb4ccd552bf01f5299476719f21e2d53 100644 (file)
--- a/widgets/base.lua
+++ b/widgets/base.lua
@@ -6,7 +6,9 @@
                                                   
 --]]
 
                                                   
 --]]
 

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

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


@@ -17,24 +19,19 @@ local setmetatable = setmetatable
 local function worker(args)
     local base     = {}
     local args     = args or {}
 local function worker(args)
     local base     = {}
     local args     = args or {}

-    local timeout  = args.timeout or 1
+    local timeout  = args.timeout or 5

     local cmd      = args.cmd or ""
     local settings = args.settings or function() end
 
     base.widget = wibox.widget.textbox('')
     local cmd      = args.cmd or ""
     local settings = args.settings or function() end
 
     base.widget = wibox.widget.textbox('')

-    helpers.set_map(cmd, '')

 
     function base.update()
 
     function base.update()

-        output = helpers.read_pipe(cmd)
-
-        if helpers.get_map(cmd) ~= output then
-            widget = base.widget
-            settings()
-            helpers.set_map(cmd, output)
-        end
+        output = read_pipe(cmd)
+        widget = base.widget
+        settings()

     end
 
     end
 

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

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