mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpuTemperature() fix (BSD), code cleanup

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2020-05-21 10:23:42 +02:00
parent 99dfcef035
commit 06ab7dd26c
7 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -30,6 +30,7 @@ For major (breaking) changes - version 3 and 2 see end of page.
| Version | Date | Comment |
| -------------- | -------------- | -------- |
| 4.26.4 | 2020-05-21 | `cpuTemperature()` fix (BSD), code cleanup |
| 4.26.3 | 2020-05-20 | updated documentation (macOS temperature) |
| 4.26.2 | 2020-05-19 | `processes()` memory leak fix |
| 4.26.1 | 2020-05-13 | code cleanup |

2
README.md
View File

@ -276,7 +276,7 @@ I also created a nice little command line tool called [mmon][mmon-github-url] (
| | ...[0].currentResY | X | | X | X | | current pixel vertical |
| | ...[0].positionX | | | | X | | display position X |
| | ...[0].positionY | | | | X | | display position Y |
| | ...[0].currentRefreshRate | X | | X | X | | current pixel vertical |
| | ...[0].currentRefreshRate | X | | X | X | | current screen refresh rate |
#### 7. Operating System

2
docs/graphics.html
View File

@ -293,7 +293,7 @@
<td></td>
<td>X</td>
<td></td>
<td>current refresh rate</td>
<td>current screen refresh rate</td>
</tr>
<tr class="example">
<td></td>

5
docs/history.html
View File

@ -83,6 +83,11 @@
</tr>
</thead>
<tbody>
<tr>
<th scope="row">4.26.4</th>
<td>2020-05-21</td>
<td><span class="code">cpuTemperature()</span> fix (BSD), code cleanup</td>
</tr>
<tr>
<th scope="row">4.26.3</th>
<td>2020-05-20</td>

2
docs/index.html
View File

@ -168,7 +168,7 @@
<img class="logo" src="assets/logo.png">
<div class="title">systeminformation</div>
<div class="subtitle"><span id="typed"></span></div>
<div class="version">Current Version: <span id="version">4.26.3</span></div>
<div class="version">Current Version: <span id="version">4.26.4</span></div>
<button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button>
</div>
<div class="down">

2
lib/cpu.js
View File

@ -848,7 +848,7 @@ function cpuTemperature(callback) {
let sum = 0;
lines.forEach(function (line) {
const parts = line.split(':');
if (parts.length > 0) {
if (parts.length > 1) {
const temp = parseFloat(parts[1].replace(',', '.'));
if (temp > result.max) result.max = temp;
sum = sum + temp;

40
lib/util.js
View File

@ -487,26 +487,26 @@ function countLines(lines, startingWith) {
function sanitizeShellString(str) {
let result = str;
result = result.replace(/>/g, "");
result = result.replace(/</g, "");
result = result.replace(/\*/g, "");
result = result.replace(/\?/g, "");
result = result.replace(/\[/g, "");
result = result.replace(/\]/g, "");
result = result.replace(/\|/g, "");
result = result.replace(/\`/g, "");
result = result.replace(/$/g, "");
result = result.replace(/;/g, "");
result = result.replace(/&/g, "");
result = result.replace(/\)/g, "");
result = result.replace(/\(/g, "");
result = result.replace(/\$/g, "");
result = result.replace(/#/g, "");
result = result.replace(/\\/g, "");
result = result.replace(/\t/g, "");
result = result.replace(/\n/g, "");
result = result.replace(/\"/g, "");
return result
result = result.replace(/>/g, '');
result = result.replace(/</g, '');
result = result.replace(/\*/g, '');
result = result.replace(/\?/g, '');
result = result.replace(/\[/g, '');
result = result.replace(/\]/g, '');
result = result.replace(/\|/g, '');
result = result.replace(/\`/g, '');
result = result.replace(/\$/g, '');
result = result.replace(/;/g, '');
result = result.replace(/&/g, '');
result = result.replace(/\)/g, '');
result = result.replace(/\(/g, '');
result = result.replace(/\$/g, '');
result = result.replace(/#/g, '');
result = result.replace(/\\/g, '');
result = result.replace(/\t/g, '');
result = result.replace(/\n/g, '');
result = result.replace(/\"/g, '');
return result;
}
function noop() { }