#24 #25 #33 new: sftp file edit

lib/data/model/server/conn.dart

@@ -1,13 +1,13 @@
 import '../../../core/extension/stringx.dart';
 import '../../res/misc.dart';
 
-class ConnStatus {
+class Conn {
   final int maxConn;
   final int active;
   final int passive;
   final int fail;
 
-  ConnStatus({
+  Conn({
     required this.maxConn,
     required this.active,
     required this.passive,
@@ -15,13 +15,13 @@ class ConnStatus {
   });
 }
 
-ConnStatus? parseConn(String raw) {
+Conn? parseConn(String raw) {
   final lines = raw.split('\n');
   final idx = lines.lastWhere((element) => element.startsWith('Tcp:'),
       orElse: () => '');
   if (idx != '') {
     final vals = idx.split(numReg);
-    return ConnStatus(
+    return Conn(
       maxConn: vals[5].i,
       active: vals[6].i,
       passive: vals[7].i,

lib/data/model/server/cpu.dart

@@ -1,7 +1,7 @@
-class CpuStatus {
+class Cpus {
   List<OneTimeCpuStatus> _pre;
   List<OneTimeCpuStatus> _now;
-  CpuStatus(this._pre, this._now);
+  Cpus(this._pre, this._now);
 
   double usedPercent({int coreIdx = 0}) {
     if (_now.length != _pre.length) return 0;

lib/data/model/server/disk.dart

@@ -1,6 +1,6 @@
 import '../../res/misc.dart';
 
-class DiskInfo {
+class Disk {
   final String path;
   final String loc;
   final int usedPercent;
@@ -8,7 +8,7 @@ class DiskInfo {
   final String size;
   final String avail;
 
-  DiskInfo({
+  Disk({
     required this.path,
     required this.loc,
     required this.usedPercent,
@@ -18,8 +18,8 @@ class DiskInfo {
   });
 }
 
-List<DiskInfo> parseDisk(String raw) {
-  final list = <DiskInfo>[];
+List<Disk> parseDisk(String raw) {
+  final list = <Disk>[];
   final items = raw.split('\n');
   items.removeAt(0);
   var pathCache = '';
@@ -36,7 +36,7 @@ List<DiskInfo> parseDisk(String raw) {
       vals[0] = pathCache;
       pathCache = '';
     }
-    list.add(DiskInfo(
+    list.add(Disk(
       path: vals[0],
       loc: vals[5],
       usedPercent: int.parse(vals[4].replaceFirst('%', '')),

lib/data/model/server/server_status.dart

@@ -1,19 +1,19 @@
 import 'package:toolbox/data/model/server/temp.dart';
 
-import 'cpu_status.dart';
-import 'disk_info.dart';
+import 'cpu.dart';
+import 'disk.dart';
 import 'memory.dart';
 import 'net_speed.dart';
-import 'conn_status.dart';
+import 'conn.dart';
 
 class ServerStatus {
-  CpuStatus cpu;
+  Cpus cpu;
   Memory mem;
   Swap swap;
   String sysVer;
   String uptime;
-  List<DiskInfo> disk;
-  ConnStatus tcp;
+  List<Disk> disk;
+  Conn tcp;
   NetSpeed netSpeed;
   Temperatures temps;
   String? failedInfo;

lib/data/model/server/server_status_update_req.dart

@@ -1,10 +1,10 @@
 import '../../res/server_cmd.dart';
-import 'cpu_status.dart';
-import 'disk_info.dart';
+import 'cpu.dart';
+import 'disk.dart';
 import 'memory.dart';
 import 'net_speed.dart';
 import 'server_status.dart';
-import 'conn_status.dart';
+import 'conn.dart';
 
 class ServerStatusUpdateReq {
   final ServerStatus ss;