Merge pull request #284 from BarbUk/master

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

diff --git a/widgets/temp.lua b/widgets/temp.lua
index e5681389faffcad70a828b17665be2c3bb2ca9e8..e769b25e979f10cae428e5b83b0a2c4dba3da550 100644 (file)
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -7,12 +7,9 @@
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
 --]]
 
 local newtimer     = require("lain.helpers").newtimer

-

 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
 local setmetatable = setmetatable
 
 -- coretemp


@@ -21,22 +18,28 @@ local temp = {}
 
 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('')
+    temp.widget = wibox.widget.textbox()
+
+    function 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 temp.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
 
         widget = temp.widget
         settings()
     end
 

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

 
 

-    return temp.widget
+    return setmetatable(temp, { __index = temp.widget })

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