#290 forgot fs

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

diff --git a/widgets/temp.lua b/widgets/temp.lua
index 6831588f3e7714d330c55dba73412331d327c233..4d8a7271dbfd5719027a15664260ff6c359615be 100644 (file)
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -8,45 +8,36 @@
 
 local helpers      = require("lain.helpers")
 local wibox        = require("wibox")
 
 local helpers      = require("lain.helpers")
 local wibox        = require("wibox")

-

 local io           = { open = io.open }
 local tonumber     = tonumber
 local io           = { open = io.open }
 local tonumber     = tonumber

-

 local setmetatable = setmetatable
 
 -- coretemp
 -- lain.widgets.temp
 local setmetatable = setmetatable
 
 -- coretemp
 -- lain.widgets.temp

-local temp = {}
+local temp = helpers.make_widget_textbox()

 
 local function worker(args)
     local args     = args or {}
 
 local function worker(args)
     local args     = args or {}

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

     local tempfile = args.tempfile or "/sys/class/thermal/thermal_zone0/temp"
     local settings = args.settings or function() end
 
     local tempfile = args.tempfile or "/sys/class/thermal/thermal_zone0/temp"
     local settings = args.settings or function() end
 

-    temp.widget = wibox.widget.textbox('')
-    helpers.set_map("temp_last", 0)
-

     function update()
         local f = io.open(tempfile)
     function update()
         local f = io.open(tempfile)

-        if f ~= nil
-        then
+        if f then

             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()
         else
             coretemp_now = "N/A"
         end
 
             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()
         else
             coretemp_now = "N/A"
         end
 

-        if helpers.get_map("temp_last") ~= coretemp_now then
-            widget = temp.widget
-            settings()
-            helpers.set_map("temp_last", coretemp_now)
-        end
+        widget = temp.widget
+        settings()

     end
 
     helpers.newtimer("coretemp", timeout, update)
 
     end
 
     helpers.newtimer("coretemp", timeout, update)
 

-    return temp.widget
+    return temp

 end
 
 return setmetatable(temp, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable(temp, { __call = function(_, ...) return worker(...) end })