#290 forgot fs

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

diff --git a/widgets/temp.lua b/widgets/temp.lua
index b55d52f31c310eb99f2d4c902655c88a362f9136..4d8a7271dbfd5719027a15664260ff6c359615be 100644 (file)
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -6,30 +6,25 @@
                                                   
 --]]
 
                                                   
 --]]
 

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

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

-
-local io           = io
+local io           = { open = io.open }

 local tonumber     = tonumber
 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 5
+    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 settings = args.settings or function() end
 

-    temp.widget = wibox.widget.textbox('')
-

     function update()
     function update()

-        local f = io.open("/sys/class/thermal/thermal_zone0/temp")
-        if f ~= nil
-        then
+        local f = io.open(tempfile)
+        if f then

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


@@ -40,8 +35,9 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 

-    newtimer("coretemp", timeout, update)
-    return temp.widget
+    helpers.newtimer("coretemp", timeout, update)
+
+    return temp

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