opt.

lib/data/model/server/cpu_2_status.dart

@@ -1,56 +0,0 @@
-import 'package:toolbox/data/model/server/cpu_status.dart';
-
-class Cpu2Status {
-  List<CpuStatus> _pre;
-  List<CpuStatus> _now;
-  String temp;
-  Cpu2Status(this._pre, this._now, this.temp);
-
-  double usedPercent({int coreIdx = 0}) {
-    if (_now.length != _pre.length) return 0;
-    final idleDelta = _now[coreIdx].idle - _pre[coreIdx].idle;
-    final totalDelta = _now[coreIdx].total - _pre[coreIdx].total;
-    final used = idleDelta / totalDelta;
-    return used.isNaN ? 0 : 100 - used * 100;
-  }
-
-  void update(List<CpuStatus> newStatus, String newTemp) {
-    _pre = _now;
-    _now = newStatus;
-    temp = newTemp;
-  }
-
-  int get coresCount => _now.length;
-
-  int get totalDelta => _now[0].total - _pre[0].total;
-
-  double get user {
-    if (_now.length != _pre.length) return 0;
-    final delta = _now[0].user - _pre[0].user;
-    final used = delta / totalDelta;
-    return used.isNaN ? 0 : used * 100;
-  }
-
-  double get sys {
-    if (_now.length != _pre.length) return 0;
-    final delta = _now[0].sys - _pre[0].sys;
-    final used = delta / totalDelta;
-    return used.isNaN ? 0 : used * 100;
-  }
-
-  double get nice {
-    if (_now.length != _pre.length) return 0;
-    final delta = _now[0].nice - _pre[0].nice;
-    final used = delta / totalDelta;
-    return used.isNaN ? 0 : used * 100;
-  }
-
-  double get iowait {
-    if (_now.length != _pre.length) return 0;
-    final delta = _now[0].iowait - _pre[0].iowait;
-    final used = delta / totalDelta;
-    return used.isNaN ? 0 : used * 100;
-  }
-
-  double get idle => 100 - usedPercent();
-}

lib/data/model/server/cpu_status.dart

@@ -1,7 +1,78 @@
+get initOneTimeCpuStatus => OneTimeCpuStatus(
+      'cpu',
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+    );
+get initCpuStatus => CpuStatus(
+      [initOneTimeCpuStatus],
+      [initOneTimeCpuStatus],
+      '',
+    );
+
+class CpuStatus {
+  List<OneTimeCpuStatus> _pre;
+  List<OneTimeCpuStatus> _now;
+  String temp;
+  CpuStatus(this._pre, this._now, this.temp);
+
+  double usedPercent({int coreIdx = 0}) {
+    if (_now.length != _pre.length) return 0;
+    final idleDelta = _now[coreIdx].idle - _pre[coreIdx].idle;
+    final totalDelta = _now[coreIdx].total - _pre[coreIdx].total;
+    final used = idleDelta / totalDelta;
+    return used.isNaN ? 0 : 100 - used * 100;
+  }
+
+  void update(List<OneTimeCpuStatus> newStatus, String newTemp) {
+    _pre = _now;
+    _now = newStatus;
+    temp = newTemp;
+  }
+
+  int get coresCount => _now.length;
+
+  int get totalDelta => _now[0].total - _pre[0].total;
+
+  double get user {
+    if (_now.length != _pre.length) return 0;
+    final delta = _now[0].user - _pre[0].user;
+    final used = delta / totalDelta;
+    return used.isNaN ? 0 : used * 100;
+  }
+
+  double get sys {
+    if (_now.length != _pre.length) return 0;
+    final delta = _now[0].sys - _pre[0].sys;
+    final used = delta / totalDelta;
+    return used.isNaN ? 0 : used * 100;
+  }
+
+  double get nice {
+    if (_now.length != _pre.length) return 0;
+    final delta = _now[0].nice - _pre[0].nice;
+    final used = delta / totalDelta;
+    return used.isNaN ? 0 : used * 100;
+  }
+
+  double get iowait {
+    if (_now.length != _pre.length) return 0;
+    final delta = _now[0].iowait - _pre[0].iowait;
+    final used = delta / totalDelta;
+    return used.isNaN ? 0 : used * 100;
+  }
+
+  double get idle => 100 - usedPercent();
+}
+
 ///
 /// Code generated by jsonToDartModel https://ashamp.github.io/jsonToDartModel/
 ///
-class CpuStatus {
+class OneTimeCpuStatus {
 /*
 {
   "user": 0,
@@ -23,7 +94,7 @@ class CpuStatus {
   late int irq;
   late int softirq;
 
-  CpuStatus(
+  OneTimeCpuStatus(
     this.id,
     this.user,
     this.sys,

lib/data/model/server/disk_info.dart

@@ -10,16 +10,16 @@ class DiskInfo {
 } 
 */
 
-  late String mountPath;
-  late String mountLocation;
+  late String path;
+  late String loc;
   late int usedPercent;
   late String used;
   late String size;
   late String avail;
 
   DiskInfo(
-    this.mountPath,
-    this.mountLocation,
+    this.path,
+    this.loc,
     this.usedPercent,
     this.used,
     this.size,

lib/data/model/server/memory.dart

@@ -1,3 +1,11 @@
+get initMemory => Memory(
+      total: 1,
+      used: 0,
+      free: 1,
+      cache: 0,
+      avail: 1,
+    );
+
 class Memory {
   int total;
   int used;

lib/data/model/server/net_speed.dart

@@ -1,5 +1,16 @@
 import 'package:toolbox/core/extension/numx.dart';
 
+get initNetSpeedPart => NetSpeedPart(
+      '',
+      0,
+      0,
+      0,
+    );
+get initNetSpeed => NetSpeed(
+      [initNetSpeedPart],
+      [initNetSpeedPart],
+    );
+
 class NetSpeedPart {
   String device;
   int bytesIn;

lib/data/model/server/server.dart

@@ -2,13 +2,13 @@ import 'package:dartssh2/dartssh2.dart';
 import 'package:toolbox/data/model/server/server_private_info.dart';
 import 'package:toolbox/data/model/server/server_status.dart';
 
-class ServerInfo {
-  ServerPrivateInfo info;
+class Server {
+  ServerPrivateInfo spi;
   ServerStatus status;
   SSHClient? client;
-  ServerConnectionState connectionState;
+  ServerConnectionState cs;
 
-  ServerInfo(this.info, this.status, this.client, this.connectionState);
+  Server(this.spi, this.status, this.client, this.cs);
 }
 
 enum ServerConnectionState { disconnected, connecting, connected, failed }

lib/data/model/server/server_status.dart

@@ -1,4 +1,4 @@
-import 'package:toolbox/data/model/server/cpu_2_status.dart';
+import 'package:toolbox/data/model/server/cpu_status.dart';
 import 'package:toolbox/data/model/server/disk_info.dart';
 import 'package:toolbox/data/model/server/memory.dart';
 import 'package:toolbox/data/model/server/net_speed.dart';
@@ -8,6 +8,16 @@ import 'package:toolbox/data/model/server/tcp_status.dart';
 /// Code generated by jsonToDartModel https://ashamp.github.io/jsonToDartModel/
 ///
 
+get initStatus => ServerStatus(
+      initCpuStatus,
+      initMemory,
+      'Loading...',
+      '',
+      [DiskInfo('/', '/', 0, '0', '0', '0')],
+      TcpStatus(0, 0, 0, 0),
+      initNetSpeed,
+    );
+
 class ServerStatus {
 /*
 {
@@ -30,8 +40,8 @@ class ServerStatus {
 } 
 */
 
-  Cpu2Status cpu2Status;
-  Memory memory;
+  CpuStatus cpu;
+  Memory mem;
   String sysVer;
   String uptime;
   List<DiskInfo> disk;
@@ -39,7 +49,7 @@ class ServerStatus {
   NetSpeed netSpeed;
   String? failedInfo;
 
-  ServerStatus(this.cpu2Status, this.memory, this.sysVer, this.uptime,
-      this.disk, this.tcp, this.netSpeed,
+  ServerStatus(this.cpu, this.mem, this.sysVer, this.uptime, this.disk,
+      this.tcp, this.netSpeed,
       {this.failedInfo});
 }

lib/data/provider/server.dart

@@ -6,7 +6,6 @@ import 'package:logging/logging.dart';
 import 'package:toolbox/core/extension/stringx.dart';
 import 'package:toolbox/core/extension/uint8list.dart';
 import 'package:toolbox/core/provider_base.dart';
-import 'package:toolbox/data/model/server/cpu_2_status.dart';
 import 'package:toolbox/data/model/server/cpu_status.dart';
 import 'package:toolbox/data/model/server/memory.dart';
 import 'package:toolbox/data/model/server/net_speed.dart';
@@ -45,35 +44,13 @@ final numReg = RegExp(r'\s{1,}');
 final memItemReg = RegExp(r'([A-Z].+:)\s+([0-9]+) kB');
 
 class ServerProvider extends BusyProvider {
-  List<ServerInfo> _servers = [];
-  List<ServerInfo> get servers => _servers;
+  List<Server> _servers = [];
+  List<Server> get servers => _servers;
 
   Timer? _timer;
 
   final logger = Logger('SERVER');
 
-  Memory get emptyMemory =>
-      Memory(total: 1, used: 0, free: 1, cache: 0, avail: 1);
-
-  NetSpeedPart get emptyNetSpeedPart => NetSpeedPart('', 0, 0, 0);
-
-  NetSpeed get emptyNetSpeed =>
-      NetSpeed([emptyNetSpeedPart], [emptyNetSpeedPart]);
-
-  CpuStatus get emptyCpuStatus => CpuStatus('cpu', 0, 0, 0, 0, 0, 0, 0);
-
-  Cpu2Status get emptyCpu2Status =>
-      Cpu2Status([emptyCpuStatus], [emptyCpuStatus], '');
-
-  ServerStatus get emptyStatus => ServerStatus(
-      emptyCpu2Status,
-      emptyMemory,
-      'Loading...',
-      '',
-      [DiskInfo('/', '/', 0, '0', '0', '0')],
-      TcpStatus(0, 0, 0, 0),
-      emptyNetSpeed);
-
   Future<void> loadLocalData() async {
     setBusyState(true);
     final infos = locator<ServerStore>().fetch();
@@ -82,9 +59,8 @@ class ServerProvider extends BusyProvider {
     notifyListeners();
   }
 
-  ServerInfo genInfo(ServerPrivateInfo spi) {
-    return ServerInfo(
-        spi, emptyStatus, null, ServerConnectionState.disconnected);
+  Server genInfo(ServerPrivateInfo spi) {
+    return Server(spi, initStatus, null, ServerConnectionState.disconnected);
   }
 
   Future<SSHClient> genClient(ServerPrivateInfo spi) async {
@@ -105,7 +81,7 @@ class ServerProvider extends BusyProvider {
       return;
     }
     await Future.wait(_servers.map((s) async {
-      await _getData(s.info);
+      await _getData(s.spi);
     }));
   }
 
@@ -128,7 +104,7 @@ class ServerProvider extends BusyProvider {
 
   void setDisconnected() {
     for (var i = 0; i < _servers.length; i++) {
-      _servers[i].connectionState = ServerConnectionState.disconnected;
+      _servers[i].cs = ServerConnectionState.disconnected;
     }
   }
 
@@ -140,7 +116,7 @@ class ServerProvider extends BusyProvider {
       }
       return;
     }
-    final idx = _servers.indexWhere((e) => e.info == spi);
+    final idx = _servers.indexWhere((e) => e.spi == spi);
     if (idx < 0) {
       throw RangeError.index(idx, _servers);
     }
@@ -155,7 +131,7 @@ class ServerProvider extends BusyProvider {
   }
 
   void delServer(ServerPrivateInfo info) {
-    final idx = _servers.indexWhere((s) => s.info == info);
+    final idx = _servers.indexWhere((s) => s.spi == info);
     if (idx == -1) return;
     _servers[idx].client?.close();
     _servers.removeAt(idx);
@@ -165,11 +141,11 @@ class ServerProvider extends BusyProvider {
 
   Future<void> updateServer(
       ServerPrivateInfo old, ServerPrivateInfo newSpi) async {
-    final idx = _servers.indexWhere((e) => e.info == old);
+    final idx = _servers.indexWhere((e) => e.spi == old);
     if (idx < 0) {
       throw RangeError.index(idx, _servers);
     }
-    _servers[idx].info = newSpi;
+    _servers[idx].spi = newSpi;
     locator<ServerStore>().update(old, newSpi);
     _servers[idx].client = await genClient(newSpi);
     notifyListeners();
@@ -177,11 +153,11 @@ class ServerProvider extends BusyProvider {
   }
 
   Future<void> _getData(ServerPrivateInfo spi) async {
-    final s = _servers.firstWhere((element) => element.info == spi);
-    final state = s.connectionState;
+    final s = _servers.firstWhere((element) => element.spi == spi);
+    final state = s.cs;
     if (state == ServerConnectionState.failed ||
         state == ServerConnectionState.disconnected) {
-      s.connectionState = ServerConnectionState.connecting;
+      s.cs = ServerConnectionState.connecting;
       notifyListeners();
       final time1 = DateTime.now();
       try {
@@ -189,7 +165,7 @@ class ServerProvider extends BusyProvider {
         final time2 = DateTime.now();
         logger.info(
             'Connected to [${spi.name}] in [${time2.difference(time1).toString()}].');
-        s.connectionState = ServerConnectionState.connected;
+        s.cs = ServerConnectionState.connected;
         final writeResult = await s.client!
             .run("echo '$shellCmd' > $shellPath && chmod +x $shellPath")
             .string;
@@ -197,7 +173,7 @@ class ServerProvider extends BusyProvider {
           throw Exception(writeResult);
         }
       } catch (e) {
-        s.connectionState = ServerConnectionState.failed;
+        s.cs = ServerConnectionState.failed;
         s.status.failedInfo = '$e ## ';
         logger.warning(e);
       } finally {
@@ -210,7 +186,7 @@ class ServerProvider extends BusyProvider {
     final raw = await s.client!.run("sh $shellPath").string;
     final segments = raw.split(seperator).map((e) => e.trim()).toList();
     if (raw.isEmpty || segments.length == 1) {
-      s.connectionState = ServerConnectionState.failed;
+      s.cs = ServerConnectionState.failed;
       if (s.status.failedInfo == null || s.status.failedInfo!.isEmpty) {
         s.status.failedInfo = 'No data received';
       }
@@ -228,7 +204,7 @@ class ServerProvider extends BusyProvider {
       _getTcp(spi, segments[4]);
       _getNetSpeed(spi, segments[0]);
     } catch (e) {
-      s.connectionState = ServerConnectionState.failed;
+      s.cs = ServerConnectionState.failed;
       s.status.failedInfo = e.toString();
       logger.warning(e);
       rethrow;
@@ -244,12 +220,12 @@ class ServerProvider extends BusyProvider {
   ///   eth0: 48481023  505772    0    0    0     0          0         0 36002262  202307    0    0    0     0       0          0
   /// 1635752901
   Future<void> _getNetSpeed(ServerPrivateInfo spi, String raw) async {
-    final info = _servers.firstWhere((e) => e.info == spi);
+    final info = _servers.firstWhere((e) => e.spi == spi);
     info.status.netSpeed.update(await compute(_parseNetSpeed, raw));
   }
 
   void _getSysVer(ServerPrivateInfo spi, String raw) {
-    final info = _servers.firstWhere((e) => e.info == spi);
+    final info = _servers.firstWhere((e) => e.spi == spi);
     final s = raw.split('=');
     if (s.length == 2) {
       info.status.sysVer = s[1].replaceAll('"', '').replaceFirst('\n', '');
@@ -258,22 +234,22 @@ class ServerProvider extends BusyProvider {
 
   Future<void> _getCPU(ServerPrivateInfo spi, String raw, String tempType,
       String tempValue) async {
-    final info = _servers.firstWhere((e) => e.info == spi);
+    final info = _servers.firstWhere((e) => e.spi == spi);
     final cpus = await compute(_parseCPU, raw);
 
     if (cpus.isNotEmpty) {
-      info.status.cpu2Status
+      info.status.cpu
           .update(cpus, await compute(_getCPUTemp, [tempType, tempValue]));
     }
   }
 
   void _getUpTime(ServerPrivateInfo spi, String raw) {
-    _servers.firstWhere((e) => e.info == spi).status.uptime =
+    _servers.firstWhere((e) => e.spi == spi).status.uptime =
         raw.split('up ')[1].split(', ')[0];
   }
 
   Future<void> _getTcp(ServerPrivateInfo spi, String raw) async {
-    final info = _servers.firstWhere((e) => e.info == spi);
+    final info = _servers.firstWhere((e) => e.spi == spi);
     final status = await compute(_parseTcp, raw);
     if (status != null) {
       info.status.tcp = status;
@@ -281,7 +257,7 @@ class ServerProvider extends BusyProvider {
   }
 
   void _getDisk(ServerPrivateInfo spi, String raw) {
-    final info = _servers.firstWhere((e) => e.info == spi);
+    final info = _servers.firstWhere((e) => e.spi == spi);
     final list = <DiskInfo>[];
     final items = raw.split('\n');
     for (var item in items) {
@@ -296,14 +272,14 @@ class ServerProvider extends BusyProvider {
   }
 
   Future<void> _getMem(ServerPrivateInfo spi, String raw) async {
-    final info = _servers.firstWhere((e) => e.info == spi);
+    final info = _servers.firstWhere((e) => e.spi == spi);
     final mem = await compute(_parseMem, raw);
-    info.status.memory = mem;
+    info.status.mem = mem;
   }
 
   Future<String?> runSnippet(String id, Snippet snippet) async {
     final client =
-        _servers.firstWhere((element) => element.info.id == id).client;
+        _servers.firstWhere((element) => element.spi.id == id).client;
     if (client == null) {
       return null;
     }
@@ -340,14 +316,14 @@ TcpStatus? _parseTcp(String raw) {
   return null;
 }
 
-List<CpuStatus> _parseCPU(String raw) {
-  final List<CpuStatus> cpus = [];
+List<OneTimeCpuStatus> _parseCPU(String raw) {
+  final List<OneTimeCpuStatus> 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(
+    cpus.add(OneTimeCpuStatus(
         id,
         int.parse(matches[0]),
         int.parse(matches[1]),

lib/data/res/build_data.dart

@@ -2,9 +2,9 @@
 
 class BuildData {
   static const String name = "ServerBox";
-  static const int build = 189;
+  static const int build = 190;
   static const String engine =
-      "Flutter 3.7.0 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision b06b8b2710 (4 days ago) • 2023-01-23 16:55:55 -0800\nEngine • revision b24591ed32\nTools • Dart 2.19.0 • DevTools 2.20.1\n";
-  static const String buildAt = "2023-01-28 14:28:14.979200";
-  static const int modifications = 2;
+      "Flutter 3.7.0 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision b06b8b2710 (5 days ago) • 2023-01-23 16:55:55 -0800\nEngine • revision b24591ed32\nTools • Dart 2.19.0 • DevTools 2.20.1\n";
+  static const String buildAt = "2023-01-28 21:12:37.408372";
+  static const int modifications = 19;
 }

lib/data/res/sizedbox.dart

@@ -0,0 +1,4 @@
+import 'package:flutter/widgets.dart';
+
+const height13 = SizedBox(height: 13);
+const width13 = SizedBox(width: 13);