]> 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 #298
[etc/awesome.git] / widgets / temp.lua
index 67c94560b9a58e67fa15ef340c8862f4b473e020..1c7e86c92de8e3074eece379457d427ebb1093e0 100644 (file)
@@ -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           = { open = io.open }
 local tonumber     = tonumber
 local io           = { open = io.open }
 local tonumber     = tonumber
-
 local setmetatable = setmetatable
 
 -- coretemp
 local setmetatable = setmetatable
 
 -- coretemp
@@ -25,12 +22,11 @@ local function worker(args)
     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
+        if f then
             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()
         else
             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()
         else
@@ -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 })