Merge pull request #2 from copycat-killer/master

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

diff --git a/widgets/temp.lua b/widgets/temp.lua
index 4ae1c04ed574a4ffd64f7566155cd8cf22015f0a..1c7e86c92de8e3074eece379457d427ebb1093e0 100644 (file)
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -6,13 +6,10 @@
                                                   
 --]]
 
                                                   
 --]]
 

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


@@ -21,17 +18,16 @@ 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 tempfile = args.tempfile or "/sys/class/thermal/thermal_zone0/temp"
     local settings = args.settings or function() end
 

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

 
 

-    function update()
+    function temp.update()

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

-        if f ~= nil
-        then
-            coretemp_now = tonumber(f:read("*a")) / 1000
+        if f then
+            coretemp_now = tonumber(f:read("*all")) / 1000

             f:close()
         else
             coretemp_now = "N/A"
             f:close()
         else
             coretemp_now = "N/A"


@@ -41,8 +37,9 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 

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

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