fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autocore: 10_system: fix parse data

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2022-03-26 19:17:46 +08:00
parent 42e2aaf2b3
commit 51225d75e4
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/emortal/autocore/files/generic/10_system.js
View File

@ -73,8 +73,8 @@ return baseclass.extend({
var fields = [ var fields = [
_('Hostname'), boardinfo.hostname, _('Hostname'), boardinfo.hostname,
_('Model'), boardinfo.model + cpubench, _('Model'), boardinfo.model + cpubench.cpubench,
_('Architecture'), cpuinfo, _('Architecture'), cpuinfo.cpuinfo,
_('Target Platform'), (L.isObject(boardinfo.release) ? boardinfo.release.target : ''), _('Target Platform'), (L.isObject(boardinfo.release) ? boardinfo.release.target : ''),
_('Firmware Version'), (L.isObject(boardinfo.release) ? boardinfo.release.description + ' / ' : '') + (luciversion || ''), _('Firmware Version'), (L.isObject(boardinfo.release) ? boardinfo.release.description + ' / ' : '') + (luciversion || ''),
_('Kernel Version'), boardinfo.kernel, _('Kernel Version'), boardinfo.kernel,
@ -85,7 +85,7 @@ return baseclass.extend({
systeminfo.load[1] / 65535.0, systeminfo.load[1] / 65535.0,
systeminfo.load[2] / 65535.0 systeminfo.load[2] / 65535.0
) : null, ) : null,
_('CPU usage (%)'), cpuusage _('CPU usage (%)'), cpuusage.cpuusage
]; ];
var table = E('table', { 'class': 'table' }); var table = E('table', { 'class': 'table' });

12
package/emortal/autocore/files/generic/luci
View File

@ -623,8 +623,9 @@ local methods = {
getCPUBench = { getCPUBench = {
call = function() call = function()
local sys = require "luci.sys" local sys = require "luci.sys"
local cpubench = sys.exec("cat /etc/bench.log 2>/dev/null") or "" local cpubench = {}
cpubench.cpubench = sys.exec("cat /etc/bench.log 2>/dev/null")
return cpubench return cpubench
end end
}, },
@ -632,9 +633,11 @@ local methods = {
getCPUInfo = { getCPUInfo = {
call = function() call = function()
local sys = require "luci.sys" local sys = require "luci.sys"
local cpuinfo = sys.exec("/sbin/cpuinfo") local cpuinfo = {}
if (cpuinfo == nil) or (cpuinfo == "") then cpuinfo.cpuinfo = sys.exec("/sbin/cpuinfo")
if (cpuinfo.cpuinfo == nil) or (cpuinfo.cpuinfo == "") then
cpuinfo.cpuinfo = "? x ? (2.33MHz, 2.33°C)" cpuinfo.cpuinfo = "? x ? (2.33MHz, 2.33°C)"
end end
@ -645,8 +648,9 @@ local methods = {
getCPUUsage = { getCPUUsage = {
call = function() call = function()
local sys = require "luci.sys" local sys = require "luci.sys"
local cpuusage = sys.exec("top -n1 | awk '/^CPU/ {printf(\"%d%\", 100 - $8)}'") or "6%" local cpuusage = {}
cpuusage.cpuusage = sys.exec("top -n1 | awk '/^CPU/ {printf(\"%d%\", 100 - $8)}'") or "6%"
return cpuusage return cpuusage
end end
}, },