new: custom cmds (#313)

lib/data/model/app/server_detail_card.dart

@@ -15,6 +15,7 @@ enum ServerDetailCards implements VersionRelated {
   temp,
   battery,
   pve(sinceBuild: 818),
+  custom(sinceBuild: 825),
   ;
 
   @override
@@ -39,6 +40,7 @@ enum ServerDetailCards implements VersionRelated {
         temp => l10n.temperature,
         battery => l10n.battery,
         pve => 'PVE',
+        custom => l10n.cmd,
       };
 
   /// If:
@@ -48,9 +50,19 @@ enum ServerDetailCards implements VersionRelated {
     if (cur >= pve.sinceBuild!) {
       final prop = Stores.setting.detailCardOrder;
       final list = prop.fetch();
-      if (list.contains(pve.name)) return;
-      list.add(pve.name);
-      prop.put(list);
+      if (!list.contains(pve.name)) {
+        list.add(pve.name);
+        prop.put(list);
+      }
+    }
+
+    if (cur >= custom.sinceBuild!) {
+      final prop = Stores.setting.detailCardOrder;
+      final list = prop.fetch();
+      if (!list.contains(custom.name)) {
+        list.add(custom.name);
+        prop.put(list);
+      }
     }
   }
 }

lib/data/model/app/shell_func.dart

@@ -1,12 +1,6 @@
 import '../../res/build_data.dart';
 import '../server/system.dart';
 
-const seperator = 'SrvBoxSep';
-
-/// The suffix `\t` is for formatting
-const _cmdDivider = '\necho $seperator\n\t';
-const _homeVar = '\$HOME';
-
 enum ShellFunc {
   status,
   //docker,
@@ -16,6 +10,11 @@ enum ShellFunc {
   suspend,
   ;
 
+  static const _homeVar = '\$HOME';
+  static const seperator = 'SrvBoxSep';
+
+  /// The suffix `\t` is for formatting
+  static const cmdDivider = '\necho $seperator\n\t';
   static const _srvBoxDir = '.config/server_box';
   static const _scriptFile = 'mobile_v${BuildData.script}.sh';
 
@@ -82,9 +81,9 @@ chmod +x $_installShellPath
       case ShellFunc.status:
         return '''
 if [ "\$macSign" = "" ] && [ "\$bsdSign" = "" ]; then
-\t${_statusCmds.join(_cmdDivider)}
+\t${_statusCmds.join(cmdDivider)}
 else
-\t${_bsdStatusCmd.join(_cmdDivider)}
+\t${_bsdStatusCmd.join(cmdDivider)}
 fi''';
 //       case ShellFunc.docker:
 //         return '''
@@ -130,7 +129,7 @@ fi''';
     }
   }
 
-  static final String allScript = () {
+  static String allScript(Map<String, String>? customCmds) {
     final sb = StringBuffer();
     sb.write('''
 #!/bin/sh
@@ -151,9 +150,18 @@ userId=\$(id -u)
 ''');
     // Write each func
     for (final func in values) {
+      final customCmdsStr = () {
+        if (func == ShellFunc.status &&
+            customCmds != null &&
+            customCmds.isNotEmpty) {
+          return '$cmdDivider\n\t${customCmds.values.join(cmdDivider)}';
+        }
+        return '';
+      }();
       sb.write('''
 ${func.name}() {
 ${func._cmd.split('\n').map((e) => '\t$e').join('\n')}
+$customCmdsStr
 }
 
 ''');
@@ -174,7 +182,7 @@ ${func._cmd.split('\n').map((e) => '\t$e').join('\n')}
     ;;
 esac''');
     return sb.toString();
-  }();
+  }
 }
 
 extension EnumX on Enum {

lib/data/model/server/custom.dart

@@ -4,40 +4,49 @@ part 'custom.g.dart';
 
 @HiveType(typeId: 7)
 final class ServerCustom {
-  @HiveField(0)
-  final String? temperature;
+  // @HiveField(0)
+  // final String? temperature;
   @HiveField(1)
   final String? pveAddr;
-  @HiveField(2)
-  final bool? pveIgnoreCert;
+  @HiveField(2, defaultValue: false)
+  final bool pveIgnoreCert;
+
+  /// {"title": "cmd"}
+  @HiveField(3)
+  final Map<String, String>? cmds;
 
   const ServerCustom({
-    this.temperature,
+    //this.temperature,
     this.pveAddr,
-    this.pveIgnoreCert,
+    this.pveIgnoreCert = false,
+    this.cmds,
   });
 
   static ServerCustom fromJson(Map<String, dynamic> json) {
-    final temperature = json["temperature"] as String?;
+    //final temperature = json["temperature"] as String?;
     final pveAddr = json["pveAddr"] as String?;
-    final pveIgnoreCert = json["pveIgnoreCert"] as bool?;
+    final pveIgnoreCert = json["pveIgnoreCert"] as bool;
+    final cmds = json["cmds"] as Map<String, dynamic>?;
     return ServerCustom(
-      temperature: temperature,
+      //temperature: temperature,
       pveAddr: pveAddr,
       pveIgnoreCert: pveIgnoreCert,
+      cmds: cmds?.cast<String, String>(),
     );
   }
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-    if (temperature != null) {
-      json["temperature"] = temperature;
-    }
+    // if (temperature != null) {
+    //   json["temperature"] = temperature;
+    // }
     if (pveAddr != null) {
       json["pveAddr"] = pveAddr;
     }
-    if (pveIgnoreCert != null) {
-      json["pveIgnoreCert"] = pveIgnoreCert;
+    json["pveIgnoreCert"] = pveIgnoreCert;
+
+    if (cmds != null) {
+      json["cmds"] = cmds;
     }
     return json;
   }

lib/data/model/server/custom.g.dart

@@ -17,9 +17,9 @@ class ServerCustomAdapter extends TypeAdapter<ServerCustom> {
       for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
     };
     return ServerCustom(
-      temperature: fields[0] as String?,
       pveAddr: fields[1] as String?,
-      pveIgnoreCert: fields[2] as bool?,
+      pveIgnoreCert: fields[2] == null ? false : fields[2] as bool,
+      cmds: (fields[3] as Map?)?.cast<String, String>(),
     );
   }
 
@@ -27,12 +27,12 @@ class ServerCustomAdapter extends TypeAdapter<ServerCustom> {
   void write(BinaryWriter writer, ServerCustom obj) {
     writer
       ..writeByte(3)
-      ..writeByte(0)
-      ..write(obj.temperature)
       ..writeByte(1)
       ..write(obj.pveAddr)
       ..writeByte(2)
-      ..write(obj.pveIgnoreCert);
+      ..write(obj.pveIgnoreCert)
+      ..writeByte(3)
+      ..write(obj.cmds);
   }
 
   @override

lib/data/model/server/pve.dart

@@ -414,11 +414,11 @@ final class PveRes {
   static Future<PveRes> parse((List list, PveRes? old) val) async {
     final (list, old) = val;
     final items = list.map((e) => PveResIface.fromJson(e)).toList();
-    final Order<PveQemu> qemus = [];
-    final Order<PveLxc> lxcs = [];
-    final Order<PveNode> nodes = [];
-    final Order<PveStorage> storages = [];
-    final Order<PveSdn> sdns = [];
+    final List<PveQemu> qemus = [];
+    final List<PveLxc> lxcs = [];
+    final List<PveNode> nodes = [];
+    final List<PveStorage> storages = [];
+    final List<PveSdn> sdns = [];
     for (final item in items) {
       switch (item.type) {
         case PveResType.lxc:

lib/data/model/server/server.dart

@@ -1,4 +1,5 @@
 import 'package:dartssh2/dartssh2.dart';
+import 'package:toolbox/core/extension/context/locale.dart';
 import 'package:toolbox/data/model/app/shell_func.dart';
 import 'package:toolbox/data/model/server/battery.dart';
 import 'package:toolbox/data/model/server/conn.dart';
@@ -14,6 +15,8 @@ import 'package:toolbox/data/model/server/temp.dart';
 
 import '../app/tag_pickable.dart';
 
+part 'server.ext.dart';
+
 class Server implements TagPickable {
   ServerPrivateInfo spi;
   ServerStatus status;
@@ -58,6 +61,7 @@ class ServerStatus {
   final Map<StatusCmdType, String> more = {};
   final List<SensorItem> sensors = [];
   DiskUsage? diskUsage;
+  final Map<String, String> customCmds = {};
 
   ServerStatus({
     required this.cpu,

lib/data/model/server/server.ext.dart

@@ -0,0 +1,39 @@
+part of 'server.dart';
+
+extension ServerX on Server {
+  String get topRightStr {
+    switch (state) {
+      case ServerState.disconnected:
+        return l10n.disconnected;
+      case ServerState.finished:
+        final cmdTemp = status.customCmds['temperature'];
+        final temp = status.temps.first;
+        final sensorTemp = SensorItem.findPreferTempVal(status.sensors);
+        final temperatureVal = () {
+          if (temp != null) {
+            return temp;
+          }
+          if (sensorTemp != null) {
+            return sensorTemp;
+          }
+          return null;
+        }();
+        final tempVal = temperatureVal != null
+            ? '${temperatureVal.toStringAsFixed(1)}°C'
+            : null;
+        final upTime = status.more[StatusCmdType.uptime];
+        final items = [tempVal ?? cmdTemp, upTime];
+        final str = items.where((e) => e != null && e.isNotEmpty).join(' | ');
+        if (str.isEmpty) return l10n.noResult;
+        return str;
+      case ServerState.loading:
+        return l10n.serverTabLoading;
+      case ServerState.connected:
+        return l10n.connected;
+      case ServerState.connecting:
+        return l10n.serverTabConnecting;
+      case ServerState.failed:
+        return status.err ?? l10n.serverTabFailed;
+    }
+  }
+}

lib/data/model/server/server_private_info.dart

@@ -122,7 +122,8 @@ class ServerPrivateInfo {
         pwd != old.pwd ||
         keyId != old.keyId ||
         alterUrl != old.alterUrl ||
-        jumpId != old.jumpId;
+        jumpId != old.jumpId || 
+        custom?.cmds != old.custom?.cmds;
   }
 
   _IpPort fromStringUrl() {

lib/data/model/server/server_status_update_req.dart

@@ -16,11 +16,13 @@ class ServerStatusUpdateReq {
   final ServerStatus ss;
   final List<String> segments;
   final SystemType system;
+  final Map<String, String> customCmds;
 
   const ServerStatusUpdateReq({
     required this.system,
     required this.ss,
     required this.segments,
+    required this.customCmds,
   });
 }
 
@@ -155,6 +157,16 @@ Future<ServerStatus> _getLinuxStatus(ServerStatusUpdateReq req) async {
     Loggers.parse.warning(e, s);
   }
 
+  try {
+    for (int idx = 0; idx < req.customCmds.length; idx++) {
+      final key = req.customCmds.keys.elementAt(idx);
+      final value = req.segments[idx + req.system.segmentsLen];
+      req.ss.customCmds[key] = value;
+    }
+  } catch (e, s) {
+    Loggers.parse.warning(e, s);
+  }
+
   return req.ss;
 }