From: Luca Capezzuto <luca.capezzuto@soton.ac.uk>
Date: Wed, 29 May 2019 14:28:38 +0000 (+0100)
Subject: widget.temp: re-add tempfile argument (#432), but keep retrieving all temperature... 
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/f1964b40e49dff92abdff97b7bd0408435ed589f?ds=inline;hp=-c

widget.temp: re-add tempfile argument (#432), but keep retrieving all temperature info (#431); closes #432
---

f1964b40e49dff92abdff97b7bd0408435ed589f
diff --git a/widget/temp.lua b/widget/temp.lua
index 513bd38..e909b32 100644
--- a/widget/temp.lua
+++ b/widget/temp.lua
@@ -9,26 +9,28 @@ local helpers  = require("lain.helpers")
 local wibox    = require("wibox")
 local tonumber = tonumber
 
--- coretemp
+-- {thermal,core} temperature info
 -- lain.widget.temp
 
 local function factory(args)
-    local temp         = { widget = wibox.widget.textbox() }
-    local args         = args or {}
-    local timeout      = args.timeout or 30
-    local settings     = args.settings or function() end
+    local temp     = { widget = wibox.widget.textbox() }
+    local args     = args or {}
+    local timeout  = args.timeout or 30
+    local tempfile = args.tempfile or "/sys/devices/virtual/thermal/thermal_zone0/temp"
+    local settings = args.settings or function() end
 
     function temp.update()
-        helpers.async({"find", "/sys/devices", "-name", "temp"}, function(f)
+        helpers.async({"find", "/sys/devices", "-type", "f", "-name", "*temp*"}, function(f)
             temp_now = {}
-            local temp_value
+            local temp_fl, 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
+                temp_fl = helpers.first_line(t)
+                if temp_fl then
+                    temp_value = tonumber(temp_fl)
+                    temp_now[t] = temp_value and temp_value/1e3 or temp_fl
                 end
             end
-            coretemp_now = temp_now[0] or "N/A"
+            coretemp_now = temp_now[tempfile] or "N/A"
             widget = temp.widget
             settings()
         end)
diff --git a/wiki b/wiki
index aaeceb1..d7fd4db 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit aaeceb1598cbbc27b1ee79d9a8d483fd10a4187a
+Subproject commit d7fd4db9122b26e8e8408f3515a0cb1cdb8b03e6