morgan/gnome-shell-extension-freon
1
0
Fork 0
mirror of https://github.com/morgan9e/gnome-shell-extension-freon synced 2026-04-14 00:14:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #201 from jonasmalacofilho/only-parse-sensors-json-once

Browse Source 
Only parse the JSON from sensors once
This commit is contained in:
Vasilii
2021-04-28 18:34:02 +03:00
committed by GitHub
parent 0fe773b35a 824282e0d6
commit 7a2e47b992
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
freon@UshakovVasilii_Github.yahoo.com/commandLineUtil.js
View File

@@ -26,8 +26,8 @@ var CommandLineUtil = class {
} catch (e) {
logError(e);
} finally {
this._updated = true;
callback();
this._updated = true;
}
});
} catch(e){

43
freon@UshakovVasilii_Github.yahoo.com/sensorsUtil.js
View File

@@ -12,6 +12,30 @@ var SensorsUtil = class extends CommandLineUtil.CommandLineUtil {
this._argv = path ? [path, '-A', '-j'] : null;
}
// Avoid parsing the data more than once.
execute(callback) {
super.execute(() => {
let data = [];
try {
data = JSON.parse(this._output.join(''));
} catch (e) {
try {
// fix for wrong lm_sensors output
// https://github.com/UshakovVasilii/gnome-shell-extension-freon/issues/114#issuecomment-491613545
let lineRemoved = this._output.filter(l => l.trim() !== ',').join('\n');
let errorRemoved = lineRemoved.replace(/ERROR.*Can't read/, "");
errorRemoved = errorRemoved.replace(/ERROR.*I\/O error/, "");
data = JSON.parse(errorRemoved);
} catch (e) {
global.log(e.toString());
return [];
}
}
this._data = data;
callback();
});
}
get temp() {
return this._parseGenericSensorsOutput(/^temp\d+_input/, 'temp');
}
@@ -37,25 +61,10 @@ var SensorsUtil = class extends CommandLineUtil.CommandLineUtil {
}
_parseSensorsOutput(sensorFilter, sensorType, gpuFlag) {
if(!this._output)
if(!this._data)
return [];
let data = []
try {
data = JSON.parse(this._output.join(''));
} catch (e) {
try {
// fix for wrong lm_sensors output
// https://github.com/UshakovVasilii/gnome-shell-extension-freon/issues/114#issuecomment-491613545
let lineRemoved = this._output.filter(l => l.trim() !== ',').join('\n');
let errorRemoved = lineRemoved.replace(/ERROR.*Can't read/, "");
errorRemoved = errorRemoved.replace(/ERROR.*I\/O error/, "");
data = JSON.parse(errorRemoved);
} catch (e) {
global.log(e.toString());
return [];
}
}
const data = this._data;
let sensors = [];
for (var chipset in data) {