#293: eradicate proxy widget

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

diff --git a/widgets/abase.lua b/widgets/abase.lua
index 87af8725222f08f3241280021de928d6d17d3971..409495bf0bef528d8788109d1d88e310b683cdbb 100644 (file)
--- a/widgets/abase.lua
+++ b/widgets/abase.lua
@@ -6,41 +6,38 @@
                                                   
 --]]
 
-local helpers = require("lain.helpers")
-local async   = require("lain.asyncshell")
-local wibox   = require("wibox")
-
+local helpers      = require("lain.helpers")
+local wibox        = require("wibox")
 local setmetatable = setmetatable
 
--- Basic template for custom widgets
--- Asynchronous version
+-- Basic template for custom widgets (asynchronous version)
 -- lain.widgets.abase
 
 local function worker(args)
-    local abase    = {}
-    local args     = args or {}
-    local timeout  = args.timeout or 1
-    local cmd      = args.cmd or ""
-    local settings = args.settings or function() end
+    local abase     = { widget = wibox.widget.textbox() }
+    local args      = args or {}
+    local timeout   = args.timeout or 5
+    local nostart   = args.nostart or false
+    local stoppable = args.stoppable or false
+    local cmd       = args.cmd
+    local settings  = args.settings or function() end
 
-    abase.widget = wibox.widget.textbox('')
-    helpers.set_map(cmd, '')
+    abase.widget = wibox.widget.textbox()
 
     function abase.update()
-        async.request(cmd, function(f)
+        helpers.async(cmd, function(f)
             output = f
-
-            if helpers.get_map(cmd) ~= output then
+            if output ~= abase.prev then
                 widget = abase.widget
                 settings()
-                helpers.set_map(cmd, output)
+                abase.prev = output
             end
         end)
     end
 
-    helpers.newtimer(cmd, timeout, abase.update)
+    abase.timer = helpers.newtimer(cmd, timeout, abase.update, nostart, stoppable)
 
-    return setmetatable(abase, { __index = abase.widget })
+    return abase
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })