Merge pull request #25 from hirose31/fix/acpitemp

Also support new style acpi files: /sys/class/thermal/thermal_zone*/temp

Author: kazeburo

lib/CloudForecast/Data/Acpitemperature.pm

@@ -21,21 +21,42 @@ fetcher {
     my $temp;
 
     ### find temperature file
-    my @temp_files = glob '/proc/acpi/thermal_zone/*/temperature';
-    if (! @temp_files) {
+    my @temp_files;
+    my @temp_files_proc = glob '/proc/acpi/thermal_zone/*/temperature';
+    my @temp_files_sys  = glob '/sys/class/thermal/thermal_zone*/temp';
+
+    if (@temp_files_proc) {
+        @temp_files = @temp_files_proc;
+
+        if (scalar(@temp_files) > 1) {
+            CloudForecast::Log->warn("more then one temp files found. decide to use first file.");
+        }
+
+        $c->ledge_set('sysinfo', [ file => $temp_files[0] ]);
+
+        open my $tempf, '<', $temp_files[0] or die $!;
+        my $line = <$tempf>;    # <= "temperature:             57 C"
+        close $tempf;
+        ($temp) = (split(/\s*:\s*/, $line))[1] =~ /([\d.]+)/;
+    } elsif (@temp_files_sys) {
+        @temp_files = @temp_files_sys;
+
+        if (scalar(@temp_files) > 1) {
+            CloudForecast::Log->warn("more then one temp files found. decide to use first file.");
+        }
+
+        $c->ledge_set('sysinfo', [ file => $temp_files[0] ]);
+
+        open my $tempf, '<', $temp_files[0] or die $!;
+        my $line = <$tempf>;    # <= "69000"
+        close $tempf;
+        ($temp) = $line =~ /([\d.]+)/;
+        $temp = $temp / 1000;
+    } else {
         CloudForecast::Log->warn("cannot find temperature file.");
         return [undef];
-    } elsif (scalar(@temp_files) > 1) {
-        CloudForecast::Log->warn("more then one temp files found. decide to use first file.");
     }
 
-    $c->ledge_set('sysinfo', [ file => $temp_files[0] ]);
-
-    open my $tempf, '<', $temp_files[0] or die $!;
-    my $line = <$tempf>; # <= "temperature:             57 C"
-    close $tempf;
-    ($temp) = (split(/\s*:\s*/, $line))[1] =~ /([\d.]+)/;
-
     return [$temp];
 };