new: only calc non-virt net iface (#295)

lib/data/model/app/net_view.dart

@@ -1,6 +1,7 @@
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:toolbox/core/extension/context/locale.dart';
 import 'package:toolbox/data/model/server/server.dart';
+import 'package:toolbox/data/res/store.dart';
 
 part 'net_view.g.dart';
 
@@ -36,6 +37,7 @@ enum NetViewType {
   }
 
   (String, String) build(ServerStatus ss) {
+    final ignoreLocal = Stores.setting.ignoreLocalNet.fetch();
     switch (this) {
       case NetViewType.conn:
         return (
@@ -43,14 +45,26 @@ enum NetViewType {
           '${l10n.failed}:\n${ss.tcp.fail}',
         );
       case NetViewType.speed:
+        if (ignoreLocal) {
+          return (
+            '↓:\n${ss.netSpeed.cachedRealVals.speedIn}',
+            '↑:\n${ss.netSpeed.cachedRealVals.speedOut}',
+          );
+        }
         return (
-          '↓:\n${ss.netSpeed.speedIn(all: true)}',
-          '↑:\n${ss.netSpeed.speedOut(all: true)}',
+          '↓:\n${ss.netSpeed.speedIn()}',
+          '↑:\n${ss.netSpeed.speedOut()}',
         );
       case NetViewType.traffic:
+        if (ignoreLocal) {
+          return (
+            '↓:\n${ss.netSpeed.cachedRealVals.sizeIn}',
+            '↑:\n${ss.netSpeed.cachedRealVals.sizeOut}',
+          );
+        }
         return (
-          '↓:\n${ss.netSpeed.sizeIn(all: true)}',
-          '↑:\n${ss.netSpeed.sizeOut(all: true)}',
+          '↓:\n${ss.netSpeed.sizeIn()}',
+          '↑:\n${ss.netSpeed.sizeOut()}',
         );
     }
   }

lib/data/model/server/cpu.dart

@@ -5,6 +5,16 @@ import 'time_seq.dart';
 class Cpus extends TimeSeq<OneTimeCpuStatus> {
   Cpus(super.pre, super.now);
 
+  @override
+  void onUpdate() {
+    _coresCount = now.length;
+    _totalDelta = now[0].total - pre[0].total;
+    _user = _getUser();
+    _sys = _getSys();
+    _iowait = _getIowait();
+    _idle = _getIdle();
+  }
+
   double usedPercent({int coreIdx = 0}) {
     if (now.length != pre.length) return 0;
     final idleDelta = now[coreIdx].idle - pre[coreIdx].idle;
@@ -13,39 +23,42 @@ class Cpus extends TimeSeq<OneTimeCpuStatus> {
     return used.isNaN ? 0 : 100 - used * 100;
   }
 
-  int get coresCount => now.length;
+  int _coresCount = 0;
+  int get coresCount => _coresCount;
 
-  int get totalDelta => now[0].total - pre[0].total;
+  int _totalDelta = 0;
+  int get totalDelta => _totalDelta;
 
-  double get user {
+  double _user = 0;
+  double get user => _user;
+  double _getUser() {
     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 {
+  double _sys = 0;
+  double get sys => _sys;
+  double _getSys() {
     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 {
+  double _iowait = 0;
+  double get iowait => _iowait;
+  double _getIowait() {
     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();
+  double _idle = 0;
+  double get idle => _idle;
+  double _getIdle() => 100 - usedPercent();
 }
 
 class OneTimeCpuStatus extends TimeSeqIface<OneTimeCpuStatus> {

lib/data/model/server/disk.dart

@@ -64,6 +64,11 @@ class Disk {
 class DiskIO extends TimeSeq<DiskIOPiece> {
   DiskIO(super.pre, super.now);
 
+  @override
+  void onUpdate() {
+    
+  }
+
   (double?, double?) _getSpeed(String dev) {
     final pres = this.pre.where(
           (element) => element.dev == dev.replaceFirst('/dev/', ''),

lib/data/model/server/net_speed.dart

@@ -17,8 +17,51 @@ class NetSpeedPart extends TimeSeqIface<NetSpeedPart> {
 class NetSpeed extends TimeSeq<NetSpeedPart> {
   NetSpeed(super.pre, super.now);
 
-  List<String> get devices => now.map((e) => e.device).toList();
+  @override
+  void onUpdate() {
+    devices.clear();
+    devices.addAll(now.map((e) => e.device).toList());
 
+    realIfaces.clear();
+    realIfaces.addAll(devices
+        .where((e) => realIfacePrefixs.any((prefix) => e.startsWith(prefix)))
+        .toList());
+
+    final sizeIn = this.sizeIn();
+    final sizeOut = this.sizeOut();
+    final speedIn = this.speedIn();
+    final speedOut = this.speedOut();
+    cachedRealVals = (
+      sizeIn: sizeIn,
+      sizeOut: sizeOut,
+      speedIn: speedIn,
+      speedOut: speedOut,
+    );
+  }
+
+  /// Cached network device list
+  final devices = <String>[];
+
+  /// Issue #295
+  /// Non-virtual network device prefix
+  static const List<String> realIfacePrefixs = ['eth', 'wlan', 'en', 'ww', 'wl'];
+
+  /// Cached non-virtual network device prefix
+  final realIfaces = <String>[];
+
+  ({
+    String sizeIn,
+    String sizeOut,
+    String speedIn,
+    String speedOut,
+  }) cachedRealVals = (
+    sizeIn: '0kb',
+    sizeOut: '0kb',
+    speedIn: '0kb/s',
+    speedOut: '0kb/s',
+  );
+
+  /// Time diff between [pre] and [now]
   BigInt get _timeDiff => BigInt.from(now[0].time - pre[0].time);
 
   double speedInBytes(int i) => (now[i].bytesIn - pre[i].bytesIn) / _timeDiff;
@@ -27,12 +70,16 @@ class NetSpeed extends TimeSeq<NetSpeedPart> {
   BigInt sizeInBytes(int i) => now[i].bytesIn;
   BigInt sizeOutBytes(int i) => now[i].bytesOut;
 
-  String speedIn({String? device, bool all = false}) {
+  String speedIn({String? device}) {
     if (pre[0].device == '' || now[0].device == '') return '0kb/s';
-    if (all) {
+    if (device == null) {
       var speed = 0.0;
-      for (var i = 0; i < now.length; i++) {
-        speed += speedInBytes(i);
+      for (final device in devices) {
+        for (final prefix in realIfacePrefixs) {
+          if (device.startsWith(prefix)) {
+            speed += speedInBytes(devices.indexOf(device));
+          }
+        }
       }
       return buildStandardOutput(speed);
     }
@@ -40,12 +87,16 @@ class NetSpeed extends TimeSeq<NetSpeedPart> {
     return buildStandardOutput(speedInBytes(idx));
   }
 
-  String sizeIn({String? device, bool all = false}) {
+  String sizeIn({String? device}) {
     if (pre[0].device == '' || now[0].device == '') return '0kb';
-    if (all) {
+    if (device == null) {
       var size = BigInt.from(0);
-      for (var i = 0; i < now.length; i++) {
-        size += sizeInBytes(i);
+      for (final device in devices) {
+        for (final prefix in realIfacePrefixs) {
+          if (device.startsWith(prefix)) {
+            size += sizeInBytes(devices.indexOf(device));
+          }
+        }
       }
       return size.bytes2Str;
     }
@@ -53,12 +104,16 @@ class NetSpeed extends TimeSeq<NetSpeedPart> {
     return sizeInBytes(idx).bytes2Str;
   }
 
-  String speedOut({String? device, bool all = false}) {
+  String speedOut({String? device}) {
     if (pre[0].device == '' || now[0].device == '') return '0kb/s';
-    if (all) {
+    if (device == null) {
       var speed = 0.0;
-      for (var i = 0; i < now.length; i++) {
-        speed += speedOutBytes(i);
+      for (final device in devices) {
+        for (final prefix in realIfacePrefixs) {
+          if (device.startsWith(prefix)) {
+            speed += speedOutBytes(devices.indexOf(device));
+          }
+        }
       }
       return buildStandardOutput(speed);
     }
@@ -66,12 +121,16 @@ class NetSpeed extends TimeSeq<NetSpeedPart> {
     return buildStandardOutput(speedOutBytes(idx));
   }
 
-  String sizeOut({String? device, bool all = false}) {
+  String sizeOut({String? device}) {
     if (pre[0].device == '' || now[0].device == '') return '0kb';
-    if (all) {
+    if (device == null) {
       var size = BigInt.from(0);
-      for (var i = 0; i < now.length; i++) {
-        size += sizeOutBytes(i);
+      for (final device in devices) {
+        for (final prefix in realIfacePrefixs) {
+          if (device.startsWith(prefix)) {
+            size += sizeOutBytes(devices.indexOf(device));
+          }
+        }
       }
       return size.bytes2Str;
     }

lib/data/model/server/time_seq.dart

@@ -1,6 +1,7 @@
 abstract class TimeSeq<T extends TimeSeqIface> {
   List<T> pre;
   List<T> now;
+  void onUpdate();
 
   void update(List<T> new_) {
     pre = now;
@@ -10,6 +11,8 @@ abstract class TimeSeq<T extends TimeSeqIface> {
       pre.removeWhere((e) => now.any((el) => e.same(el)));
       pre.addAll(now.where((e) => pre.every((el) => !e.same(el))));
     }
+
+    onUpdate();
   }
 
   TimeSeq(this.pre, this.now);