opt.: TimeSeq

lib/data/model/server/cpu.dart

@@ -1,58 +1,44 @@
-class Cpus {
-  List<OneTimeCpuStatus> _pre;
-  List<OneTimeCpuStatus> _now;
-  Cpus(this._pre, this._now);
+import 'time_seq.dart';
+
+class Cpus extends TimeSeq<OneTimeCpuStatus> {
+  Cpus(super.pre, super.now);
 
   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;
+    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) {
-    _pre = _now;
-    _now = newStatus;
-    // 类似 [NetSpeed.update] 的处理
-    // 虽然CPU热插拔情况较少...
-    if (_pre.length != _now.length) {
-      if (_pre.length > _now.length) {
-        _pre = _pre.sublist(0, _now.length);
-      } else {
-        _pre.addAll(_now.sublist(_pre.length, _now.length));
-      }
-    }
-  }
+  int get coresCount => now.length;
 
-  int get coresCount => _now.length;
-
-  int get totalDelta => _now[0].total - _pre[0].total;
+  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;
+    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;
+    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;
+    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;
+    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;
   }
@@ -60,7 +46,7 @@ class Cpus {
   double get idle => 100 - usedPercent();
 }
 
-class OneTimeCpuStatus {
+class OneTimeCpuStatus extends TimeSeqIface<OneTimeCpuStatus> {
   late String id;
   late int user;
   late int sys;
@@ -82,6 +68,9 @@ class OneTimeCpuStatus {
   );
 
   int get total => user + sys + nice + idle + iowait + irq + softirq;
+
+  @override
+  bool same(OneTimeCpuStatus other) => id == other.id;
 }
 
 List<OneTimeCpuStatus> parseCPU(String raw) {

lib/data/model/server/net_speed.dart

@@ -1,55 +1,35 @@
 import 'package:toolbox/core/extension/numx.dart';
 
-class NetSpeedPart {
+import 'time_seq.dart';
+
+class NetSpeedPart extends TimeSeqIface<NetSpeedPart> {
   String device;
   BigInt bytesIn;
   BigInt bytesOut;
   BigInt time;
   NetSpeedPart(this.device, this.bytesIn, this.bytesOut, this.time);
+
+  @override
+  bool same(NetSpeedPart other) => device == other.device;
 }
 
-class NetSpeed {
-  List<NetSpeedPart> _old;
-  List<NetSpeedPart> _now;
-  NetSpeed(this._old, this._now);
+class NetSpeed extends TimeSeq<NetSpeedPart> {
+  NetSpeed(super.pre, super.now);
 
-  List<String> get devices {
-    final devices = <String>[];
-    for (var item in _now) {
-      devices.add(item.device);
-    }
-    return devices;
-  }
+  List<String> get devices => now.map((e) => e.device).toList();
 
-  void update(List<NetSpeedPart> newOne) {
-    _old = _now;
-    _now = newOne;
-    // 当长度不同，说明有网络接口改变
-    //
-    // 应当跟随改变：
-    // 旧长度 > 新长度：将旧的数据截断
-    // 旧长度 < 新长度：将旧的数据补齐
-    if (_old.length != _now.length) {
-      if (_old.length > _now.length) {
-        _old = _old.sublist(0, _now.length);
-      } else {
-        _old.addAll(_now.sublist(_old.length, _now.length));
-      }
-    }
-  }
+  BigInt get _timeDiff => now[0].time - pre[0].time;
 
-  BigInt get timeDiff => _now[0].time - _old[0].time;
-
-  double _speedIn(int i) => (_now[i].bytesIn - _old[i].bytesIn) / timeDiff;
-  double _speedOut(int i) => (_now[i].bytesOut - _old[i].bytesOut) / timeDiff;
-  BigInt _sizeIn(int i) => _now[i].bytesIn;
-  BigInt _sizeOut(int i) => _now[i].bytesOut;
+  double _speedIn(int i) => (now[i].bytesIn - pre[i].bytesIn) / _timeDiff;
+  double _speedOut(int i) => (now[i].bytesOut - pre[i].bytesOut) / _timeDiff;
+  BigInt _sizeIn(int i) => now[i].bytesIn;
+  BigInt _sizeOut(int i) => now[i].bytesOut;
 
   String speedIn({String? device, bool all = false}) {
-    if (_old[0].device == '' || _now[0].device == '') return '0kb/s';
+    if (pre[0].device == '' || now[0].device == '') return '0kb/s';
     if (all) {
       var speed = 0.0;
-      for (var i = 0; i < _now.length; i++) {
+      for (var i = 0; i < now.length; i++) {
         speed += _speedIn(i);
       }
       return buildStandardOutput(speed);
@@ -59,10 +39,10 @@ class NetSpeed {
   }
 
   String sizeIn({String? device, bool all = false}) {
-    if (_old[0].device == '' || _now[0].device == '') return '0kb';
+    if (pre[0].device == '' || now[0].device == '') return '0kb';
     if (all) {
       var size = BigInt.from(0);
-      for (var i = 0; i < _now.length; i++) {
+      for (var i = 0; i < now.length; i++) {
         size += _sizeIn(i);
       }
       return size.convertBytes;
@@ -72,10 +52,10 @@ class NetSpeed {
   }
 
   String speedOut({String? device, bool all = false}) {
-    if (_old[0].device == '' || _now[0].device == '') return '0kb/s';
+    if (pre[0].device == '' || now[0].device == '') return '0kb/s';
     if (all) {
       var speed = 0.0;
-      for (var i = 0; i < _now.length; i++) {
+      for (var i = 0; i < now.length; i++) {
         speed += _speedOut(i);
       }
       return buildStandardOutput(speed);
@@ -85,10 +65,10 @@ class NetSpeed {
   }
 
   String sizeOut({String? device, bool all = false}) {
-    if (_old[0].device == '' || _now[0].device == '') return '0kb';
+    if (pre[0].device == '' || now[0].device == '') return '0kb';
     if (all) {
       var size = BigInt.from(0);
-      for (var i = 0; i < _now.length; i++) {
+      for (var i = 0; i < now.length; i++) {
         size += _sizeOut(i);
       }
       return size.convertBytes;
@@ -99,9 +79,9 @@ class NetSpeed {
 
   int deviceIdx(String? device) {
     if (device != null) {
-      for (var item in _now) {
+      for (var item in now) {
         if (item.device == device) {
-          return _now.indexOf(item);
+          return now.indexOf(item);
         }
       }
     }

lib/data/model/server/time_seq.dart

@@ -0,0 +1,22 @@
+// ignore_for_file: prefer_final_fields
+
+abstract class TimeSeq<T extends TimeSeqIface> {
+  List<T> pre;
+  List<T> now;
+
+  void update(List<T> new_) {
+    pre = now;
+    now = new_;
+
+    if (pre.length != now.length) {
+      pre.removeWhere((e) => now.any((el) => e.same(el)));
+      pre.addAll(now.where((e) => pre.every((el) => !e.same(el))));
+    }
+  }
+
+  TimeSeq(this.pre, this.now);
+}
+
+abstract class TimeSeqIface<T> {
+  bool same(T other);
+}