]> 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:

Merge branch 'master' of github.com:trap000d/lain
[etc/awesome.git] / widgets / temp.lua
index b55d52f31c310eb99f2d4c902655c88a362f9136..1c7e86c92de8e3074eece379457d427ebb1093e0 100644 (file)
@@ -6,13 +6,10 @@
                                                   
 --]]
 
-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
@@ -21,15 +18,15 @@ local temp = {}
 
 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('')
+    temp.widget = wibox.widget.textbox()
 
-    function update()
-        local f = io.open("/sys/class/thermal/thermal_zone0/temp")
-        if f ~= nil
-        then
+    function temp.update()
+        local f = io.open(tempfile)
+        if f then
             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()
         else
@@ -40,8 +37,9 @@ local function worker(args)
         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 })