From 998d3ea8f8838e7e23a9109bbc3b1940fe79f927 Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Sat, 30 Jul 2022 06:26:35 +0800
Subject: [PATCH] Revert "cpu"

This reverts commit 13e0935ce083afe8c151ef971f641d30ed34a1cd.
---
 Makefile                |  1 -
 files/generic/19_cpu.js | 45 -----------------------------------------
 files/generic/luci      |  2 +-
 3 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 files/generic/19_cpu.js

diff --git a/Makefile b/Makefile
index 8f40fbe..8242911 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,6 @@ define Package/autocore/install/Default
 	$(CP) ./files/generic/luci-mod-status-autocore.json $(1)/usr/share/rpcd/acl.d/
 
 	$(INSTALL_DIR) $(1)/www/luci-static/resources/view/status/include
-	$(INSTALL_DATA) ./files/generic/19_cpu.js $(1)/www/luci-static/resources/view/status/include/
 	$(INSTALL_DATA) ./files/generic/29_ethinfo.js $(1)/www/luci-static/resources/view/status/include/
 endef
 
diff --git a/files/generic/19_cpu.js b/files/generic/19_cpu.js
deleted file mode 100644
index 1c16dfd..0000000
--- a/files/generic/19_cpu.js
+++ /dev/null
@@ -1,45 +0,0 @@
-'use strict';
-'require rpc';
-
-var callCPUFreeInfo = rpc.declare({
-	object: 'luci',
-	method: 'getCPUUsage'
-});
-
-function progressbar(value, max) {
-	var vn = parseInt(value) || 0,
-	    mn = parseInt(max) || 100,
-	    pc = Math.floor((100 / mn) * vn);
-
-	return E('div', {
-		'class': 'cbi-progressbar',
-		'title': '%s%% / %s%%'.format(vn, mn, pc)
-	}, E('div', { 'style': 'width:%.2f%%'.format(pc) }));
-}
-
-return L.Class.extend({
-	title: _('CPU'),
-
-	load: function() {
-		return L.resolveDefault(callCPUFreeInfo(), {});
-	},
-
-	render: function(info) {
-		var fields = [
-			_('Used'), (info.cpuusage) ? info.cpuusage : 0, 100
-		];
-
-		var table = E('div', { 'class': 'table cpu' });
-
-		for (var i = 0; i < fields.length; i += 3) {
-			table.appendChild(E('div', { 'class': 'tr' }, [
-				E('div', { 'class': 'td left', 'width': '33%' }, [ fields[i] ]),
-				E('div', { 'class': 'td left' }, [
-					(fields[i + 1] != null) ? progressbar(fields[i + 1], fields[i + 2], true) : '?'
-				])
-			]));
-		}
-
-		return table;
-	}
-});
diff --git a/files/generic/luci b/files/generic/luci
index ba4adcf..06ae4c1 100755
--- a/files/generic/luci
+++ b/files/generic/luci
@@ -650,7 +650,7 @@ local methods = {
 			local sys = require "luci.sys"
 			local cpuusage = {}
 
-			cpuusage.cpuusage = sys.exec("busybox top -n1 | awk '/^CPU/ {printf(\"%d%\", 100 - $8)}'") or "6%"
+			cpuusage.cpuusage = sys.exec("busybox top -n1 | awk '/^CPU/ {printf(\"%d%%\", 100 - $8)}'") or "6%"
 			return cpuusage
 		end
 	},