]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/temp.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Fix regression in net.lua widget
[etc/awesome.git] / widgets / temp.lua
index 5b1ebf54b9a03d40664b5ba8e2c9c653550c025b..cdf30021bf42a4030d3695a3b785ee23f08e6c9d 100644 (file)
@@ -7,35 +7,39 @@
 --]]
 
 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
 -- lain.widgets.temp
 local temp = {}
 
 local setmetatable = setmetatable
 
 -- coretemp
 -- lain.widgets.temp
 local temp = {}
 
-function worker(args)
+local function worker(args)
     local args     = args or {}
     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
 
-    widget = wibox.widget.textbox('')
+    temp.widget = wibox.widget.textbox()
 
     function update()
 
     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 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)
 
         settings()
     end
 
     newtimer("coretemp", timeout, update)
 
-    return widget
+    return temp.widget
 end
 
 return setmetatable(temp, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable(temp, { __call = function(_, ...) return worker(...) end })