Merge branch 'master' of github.com:trap000d/lain

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

diff --git a/widgets/temp.lua b/widgets/temp.lua
index 5b1ebf54b9a03d40664b5ba8e2c9c653550c025b..1c7e86c92de8e3074eece379457d427ebb1093e0 100644 (file)
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -6,36 +6,40 @@
                                                   
 --]]
 
-local newtimer     = require("lain.helpers").newtimer
-
+local helpers      = require("lain.helpers")
 local wibox        = require("wibox")
-
-local io           = io
+local io           = { open = io.open }
 local tonumber     = tonumber
-
 local setmetatable = setmetatable
 
 -- coretemp
 -- lain.widgets.temp
 local temp = {}
 
-function worker(args)
+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
 
-    widget = wibox.widget.textbox('')
+    temp.widget = wibox.widget.textbox()
+
+    function temp.update()
+        local f = io.open(tempfile)
+        if f then
+            coretemp_now = tonumber(f:read("*all")) / 1000
+            f:close()
+        else
+            coretemp_now = "N/A"
+        end
 
-    function update()
-        local f = io.open("/sys/class/thermal/thermal_zone0/temp")
-        coretemp_now = tonumber(f:read("*all")) / 1000
-        f:close()
+        widget = temp.widget
         settings()
     end
 
-    newtimer("coretemp", timeout, update)
+    helpers.newtimer("coretemp", timeout, temp.update)
 
-    return widget
+    return temp
 end
 
 return setmetatable(temp, { __call = function(_, ...) return worker(...) end })