Merge branch 'patch-3' of https://github.com/andering/lain into andering-patch-3

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

diff --git a/widgets/temp.lua b/widgets/temp.lua
index b57c477929b1e0315b03b0ba4181671aa4278289..a857e71e3de7f80167df6c67817c9f24d9290b8f 100644 (file)
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -10,7 +10,7 @@ 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 setmetatable = setmetatable
 local tonumber     = tonumber
 
 local setmetatable = setmetatable


@@ -21,20 +21,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
 
     temp.widget = wibox.widget.textbox('')
 
     function update()
     local settings = args.settings or function() end
 
     temp.widget = wibox.widget.textbox('')
 
     function update()

-        local f = io.open("/sys/class/thermal/thermal_zone0/temp")
-        coretemp_now = tonumber(f:read("*all")) / 1000
-        f:close()
+        local f = io.open(tempfile)
+        if f ~= nil
+        then
+            coretemp_now = tonumber(f:read("*all")) / 1000
+            f:close()
+        else
+            coretemp_now = "N/A"
+        end
+

         widget = temp.widget
         settings()
     end
 
     newtimer("coretemp", timeout, update)
         widget = temp.widget
         settings()
     end
 
     newtimer("coretemp", timeout, update)

+

     return temp.widget
 end
 
     return temp.widget
 end