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 3d4ce9e41436c5f25da049ee5f9efa621c48b0aa..94ee58fa606e348357748de230b447a4bca19066 100644 (file)
--- a/widgets/base.lua
+++ b/widgets/base.lua
@@ -7,29 +7,29 @@
 --]]
 
 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 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 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 base.update()
 
     function base.update()

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

     end
 
     newtimer(cmd, timeout, base.update)
     end
 
     newtimer(cmd, timeout, base.update)


@@ -37,4 +37,4 @@ local function worker(args)
     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 })