Merge pull request #430 from trap000d/weather_widget

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

diff --git a/widget/temp.lua b/widget/temp.lua
index b66234603b82ce0576eebb58dff44c9606aa89a7..3c93252b113fc9bb3463342ab44e0c3205566210 100644 (file)
--- a/widget/temp.lua
+++ b/widget/temp.lua
@@ -1,31 +1,27 @@
-

 --[[
 --[[

-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2013, Luke Bonham                     
-                                                  
+
+     Licensed under GNU General Public License v2
+      * (c) 2013, Luca CPZ
+

 --]]
 
 --]]
 

-local helpers      = require("lain.helpers")
-local wibox        = require("wibox")
-local io           = { open = io.open }
-local tonumber     = tonumber
-local setmetatable = setmetatable
+local helpers  = require("lain.helpers")
+local wibox    = require("wibox")
+local open     = io.open
+local tonumber = tonumber

 
 -- coretemp
 -- lain.widget.temp
 
 -- coretemp
 -- lain.widget.temp

-local temp = {}

 
 

-local function worker(args)
+local function factory(args)
+    local temp     = { widget = wibox.widget.textbox() }

     local args     = args or {}
     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 args     = args or {}
     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 temp.update()
     function temp.update()

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

         if f then
             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()
         if f then
             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()


@@ -42,4 +38,4 @@ local function worker(args)
     return temp
 end
 
     return temp
 end
 

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