aljaz/flutter_server_box
1
1
Fork 0
mirror of https://github.com/lollipopkit/flutter_server_box.git synced 2025-12-18 07:44:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change CPU Algorithm. Update README imgs

Browse Source
This commit is contained in:
LollipopKit
2021-10-28 00:39:12 +08:00
parent b8acd38b17
commit 6a0aa00f05
10 changed files with 125 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
lib/data/model/cpu_percent.dart Normal file
View File

@@ -0,0 +1,63 @@
///
/// Code generated by jsonToDartModel https://ashamp.github.io/jsonToDartModel/
///
class CpuStatus {
/*
{
"user": 0,
"sys": 0,
"nice": 0,
"idel": 0,
"wa": 0,
"hi": 0,
"si": 0,
"st": 0
}
*/
late String id;
late double user;
late double sys;
late double nice;
late double idle;
late double iowait;
late double irq;
late double softirq;
CpuStatus(
this.id,
this.user,
this.sys,
this.nice,
this.idle,
this.iowait,
this.irq,
this.softirq,
);
CpuStatus.fromJson(Map<String, dynamic> json) {
id = json["id"];
user = json["user"]?.toInt();
sys = json["sys"]?.toInt();
nice = json["nice"]?.toInt();
idle = json["idle"]?.toInt();
iowait = json["iowait"]?.toInt();
irq = json["irq"]?.toInt();
softirq = json["softirq"]?.toInt();
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{};
data["id"] = id;
data["user"] = user;
data["sys"] = sys;
data["nice"] = nice;
data["idle"] = idle;
data["iowait"] = iowait;
data["irq"] = irq;
data["softirq"] = softirq;
return data;
}
double get calculateUsedPercent {
final used = idle / (user + sys + nice + iowait + irq + softirq + idle);
return used.isNaN ? 0 : used;
}
}

8
lib/data/model/server_status.dart
View File

@@ -1,3 +1,4 @@
import 'package:toolbox/data/model/cpu_percent.dart';
import 'package:toolbox/data/model/disk_info.dart';
import 'package:toolbox/data/model/tcp_status.dart';
@@ -27,7 +28,7 @@ class ServerStatus {
}
*/
double? cpuPercent;
List<CpuStatus>? cpuPercent;
List<int?>? memList;
String? sysVer;
String? uptime;
@@ -42,7 +43,10 @@ class ServerStatus {
this.disk,
this.tcp});
ServerStatus.fromJson(Map<String, dynamic> json) {
cpuPercent = double.parse(json["cpuPercent"]);
cpuPercent = [];
for (var item in json["cpuPercent"]) {
cpuPercent!.add(CpuStatus.fromJson(item));
}
if (json["memList"] != null) {
final v = json["memList"];
final arr0 = <int>[];

86
lib/data/provider/server.dart
View File

@@ -4,6 +4,7 @@ import 'package:logging/logging.dart';
import 'package:ssh2/ssh2.dart';
import 'package:toolbox/core/extension/stringx.dart';
import 'package:toolbox/core/provider_base.dart';
import 'package:toolbox/data/model/cpu_percent.dart';
import 'package:toolbox/data/model/server_connection_state.dart';
import 'package:toolbox/data/model/disk_info.dart';
import 'package:toolbox/data/model/server.dart';
@@ -20,8 +21,11 @@ class ServerProvider extends BusyProvider {
final logger = Logger('ServerProvider');
List<CpuStatus> get emptyCpuPercent =>
[CpuStatus('cpu', 0, 0, 0, 0, 0, 0, 0)];
ServerStatus get emptyStatus => ServerStatus(
cpuPercent: 0,
cpuPercent: emptyCpuPercent,
memList: [100, 0],
disk: [
DiskInfo(
@@ -66,18 +70,15 @@ class ServerProvider extends BusyProvider {
}
return;
}
try {
await Future.wait(_servers.map((s) async {
final idx = _servers.indexOf(s);
final status = await _getData(s.info, idx);
if (status != null) {
_servers[idx].status = status;
notifyListeners();
}
}));
} catch (e) {
rethrow;
}
await Future.wait(_servers.map((s) async {
final idx = _servers.indexOf(s);
final status = await _getData(s.info, idx);
if (status != null) {
_servers[idx].status = status;
notifyListeners();
}
}));
}
Future<void> startAutoRefresh() async {
@@ -133,37 +134,42 @@ class ServerProvider extends BusyProvider {
}
}
try {
final cpu = await client.execute("top -bn1 | grep Cpu") ?? '0';
final mem = await client.execute('free -m') ?? '';
final sysVer = await client.execute('cat /etc/issue.net') ?? 'Unkown';
final upTime = await client.execute('uptime') ?? 'Failed';
final disk = await client.execute('df -h') ?? 'Failed';
final tcp = await client.execute('cat /proc/net/snmp') ?? 'Failed';
final cpu = await client.execute("cat /proc/stat | grep cpu") ?? '';
final mem = await client.execute('free -m') ?? '';
final sysVer = await client.execute('cat /etc/issue.net') ?? '';
final upTime = await client.execute('uptime') ?? '';
final disk = await client.execute('df -h') ?? '';
final tcp = await client.execute('cat /proc/net/snmp') ?? '';
return ServerStatus(
cpuPercent: _getCPU(cpu),
memList: _getMem(mem),
sysVer: sysVer.trim(),
disk: _getDisk(disk),
uptime: _getUpTime(upTime),
tcp: _getTcp(tcp));
} catch (e) {
_servers[idx].connectionState = ServerConnectionState.failed;
notifyListeners();
logger.warning(e);
return null;
}
return ServerStatus(
cpuPercent: _getCPU(cpu),
memList: _getMem(mem),
sysVer: sysVer.trim(),
disk: _getDisk(disk),
uptime: _getUpTime(upTime),
tcp: _getTcp(tcp));
}
double _getCPU(String raw) {
final match = RegExp('[0-9]*\\.[0-9] id,').firstMatch(raw);
if (match == null) {
return 0;
List<CpuStatus> _getCPU(String raw) {
final List<CpuStatus> cpus = [];
for (var item in raw.split('\n')) {
if (item == '') break;
final id = item.split(' ').first;
final matches = item.replaceFirst(id, '').trim().split(' ');
cpus.add(CpuStatus(
id,
double.parse(matches[0]),
double.parse(matches[1]),
double.parse(matches[2]),
double.parse(matches[3]),
double.parse(matches[4]),
double.parse(matches[5]),
double.parse(matches[6])));
}
return 100 -
double.parse(
raw.substring(match.start, match.end).replaceAll(' id,', ''));
if (cpus.isEmpty) {
return emptyCpuPercent;
}
return cpus;
}
String _getUpTime(String raw) {