Fix bug where net widget would not get the device name

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

diff --git a/widgets/base.lua b/widgets/base.lua
index 0431d03a8891f15696ff674aa47e501cf7a86b2a..94ee58fa606e348357748de230b447a4bca19066 100644 (file)
--- a/widgets/base.lua
+++ b/widgets/base.lua
@@ -7,31 +7,34 @@
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
 --]]
 
 local newtimer     = require("lain.helpers").newtimer

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

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

-
-local io           = io

 local setmetatable = setmetatable
 
 local setmetatable = setmetatable
 

--- Basic template for simple 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 settings = args.settings or function() end
 
     local args     = args or {}
     local timeout  = args.timeout or 5
     local cmd      = args.cmd or ""
     local settings = args.settings or function() end
 

-    base.widget = wibox.widget.textbox('')
+    base.widget = wibox.widget.textbox()

 
 

-    function update()
-        output = io.popen(cmd):read("*all")
-        widget = base.widget
-        settings()
+    function base.update()
+        output = read_pipe(cmd)
+        if output ~= base.prev then
+            widget = base.widget
+            settings()
+            base.prev = output
+        end

     end
 
     end
 

-    newtimer(cmd, timeout, update)
-    return base.widget
+    newtimer(cmd, timeout, base.update)
+
+    return setmetatable(base, { __index = base.widget })

 end
 
 end
 

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