widget.temp: autodetect tempfiles; closes #431

diff --git a/helpers.lua b/helpers.lua
index d3fa2597c22e8659c4674925c19d128ccec5fd23..d6f6b3c1fcf861c283fff9134a1b9587a40998cd 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -187,7 +187,7 @@ function helpers.trivial_partition_set(set)
     return ss
 end
 
--- creates the powerset of a given set
+-- create the powerset of a given set
 function helpers.powerset(s)
     if not s then return {} end
     local t = {{}}

diff --git a/widget/cpu.lua b/widget/cpu.lua
index 81638c280eda1c2539ef9923db8cd2bb76b8ce6e..f4cce734763b5238302c73879c1d37284bd89047 100644 (file)
--- a/widget/cpu.lua
+++ b/widget/cpu.lua
@@ -25,9 +25,7 @@ local function factory(args)
         -- Read the amount of time the CPUs have spent performing
         -- different kinds of work. Read the first line of /proc/stat
         -- which is the sum of all CPUs.
-        local times = helpers.lines_match("cpu","/proc/stat")
-
-        for index,time in pairs(times) do
+        for index,time in pairs(helpers.lines_match("cpu","/proc/stat")) do
             local coreid = index - 1
             local core   = cpu.core[coreid] or
                            { last_active = 0 , last_total = 0, usage = 0 }

diff --git a/widget/temp.lua b/widget/temp.lua
index 3c93252b113fc9bb3463342ab44e0c3205566210..513bd3849bb8226e6b382bb93433f72ec85bbea0 100644 (file)
--- a/widget/temp.lua
+++ b/widget/temp.lua
@@ -7,33 +7,34 @@
 
 local helpers  = require("lain.helpers")
 local wibox    = require("wibox")
-local open     = io.open
 local tonumber = tonumber
 
 -- coretemp
 -- lain.widget.temp
 
 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 temp         = { widget = wibox.widget.textbox() }
+    local args         = args or {}
+    local timeout      = args.timeout or 30
+    local settings     = args.settings or function() end
 
     function temp.update()
-        local f = open(tempfile)
-        if f then
-            coretemp_now = tonumber(f:read("*all")) / 1000
-            f:close()
-        else
-            coretemp_now = "N/A"
-        end
-
-        widget = temp.widget
-        settings()
+        helpers.async({"find", "/sys/devices", "-name", "temp"}, function(f)
+            temp_now = {}
+            local temp_value
+            for t in f:gmatch("[^\n]+") do
+                temp_value = helpers.first_line(t)
+                if temp_value then
+                    temp_now[tonumber(t:match("%d+"))] = temp_value / 1e3
+                end
+            end
+            coretemp_now = temp_now[0] or "N/A"
+            widget = temp.widget
+            settings()
+        end)
     end
 
-    helpers.newtimer("coretemp", timeout, temp.update)
+    helpers.newtimer("thermal", timeout, temp.update)
 
     return temp
 end

diff --git a/wiki b/wiki
index e5a195cfc013627f21d242fa5110b3added00eb2..aaeceb1598cbbc27b1ee79d9a8d483fd10a4187a 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit e5a195cfc013627f21d242fa5110b3added00eb2
+Subproject commit aaeceb1598cbbc27b1ee79d9a8d483fd10a4187a