new: custom cmds (#313)

2025-12-18 15:54:35 +01:00 · 2024-03-24 23:03:39 -06:00
parent 96866565c4
commit b6a797c993
32 changed files with 260 additions and 146 deletions
--- a/lib/view/page/server/detail.dart
+++ b/lib/view/page/server/detail.dart
@@ -4,7 +4,6 @@ import 'package:provider/provider.dart';
 import 'package:toolbox/core/extension/context/common.dart';
 import 'package:toolbox/core/extension/context/dialog.dart';
 import 'package:toolbox/core/extension/context/locale.dart';
-import 'package:toolbox/core/extension/order.dart';
 import 'package:toolbox/core/extension/status_cmd_type.dart';
 import 'package:toolbox/data/model/app/server_detail_card.dart';
 import 'package:toolbox/data/model/server/battery.dart';
@@ -17,6 +16,7 @@ import 'package:toolbox/data/model/server/server_private_info.dart';
 import 'package:toolbox/data/model/server/system.dart';
 import 'package:toolbox/data/res/store.dart';
 import 'package:toolbox/view/widget/expand_tile.dart';
+import 'package:toolbox/view/widget/kv_row.dart';
 import 'package:toolbox/view/widget/server_func_btns.dart';

 import '../../../core/extension/numx.dart';
@@ -53,11 +53,12 @@ class _ServerDetailPageState extends State<ServerDetailPage>
      _buildTemperature,
      _buildBatteries,
      _buildPve,
+      _buildCustom,
    ],
  );

  late MediaQueryData _media;
-  final Order<String> _cardsOrder = [];
+  final List<String> _cardsOrder = [];

  final _netSortType = ValueNotifier(_NetSortType.device);
  late final _collapse = Stores.setting.collapseUIDefault.fetch();
@@ -73,7 +74,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
  void initState() {
    super.initState();
    final order = Stores.setting.detailCardOrder.fetch();
-    order.removeWhere((element) => !_cardBuildMap.containsKey(element));
+    order.removeWhere((e) => !ServerDetailCards.names.contains(e));
    _cardsOrder.addAll(order);
  }

@@ -716,6 +717,23 @@ class _ServerDetailPageState extends State<ServerDetailPage>
    );
  }

+  Widget _buildCustom(ServerStatus ss) {
+    return CardX(
+      child: ExpandTile(
+        leading: const Icon(MingCute.command_line, size: 17),
+        title: Text(l10n.customCmd),
+        initiallyExpanded: _getInitExpand(ss.customCmds.length),
+        children: [
+          for (final cmd in ss.customCmds.entries)
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 17, vertical: 7),
+              child: KvRow(k: cmd.key, v: cmd.value),
+            ),
+        ],
+      ),
+    );
+  }
+
  Widget _buildAnimatedText(Key key, String text, TextStyle style) {
    return AnimatedSwitcher(
      duration: const Duration(milliseconds: 277),
--- a/lib/view/page/server/edit.dart
+++ b/lib/view/page/server/edit.dart
@@ -1,9 +1,12 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:toolbox/core/extension/context/common.dart';
 import 'package:toolbox/core/extension/context/dialog.dart';
 import 'package:toolbox/core/extension/context/locale.dart';
 import 'package:toolbox/core/extension/context/snackbar.dart';
+import 'package:toolbox/core/extension/stringx.dart';
 import 'package:toolbox/core/extension/widget.dart';
 import 'package:toolbox/data/model/app/shell_func.dart';
 import 'package:toolbox/data/model/server/custom.dart';
@@ -37,6 +40,7 @@ class _ServerEditPageState extends State<ServerEditPage> {
  final _usernameController = TextEditingController();
  final _passwordController = TextEditingController();
  final _pveAddrCtrl = TextEditingController();
+  final _customCmdCtrl = TextEditingController();

  final _nameFocus = FocusNode();
  final _ipFocus = FocusNode();
@@ -77,7 +81,19 @@ class _ServerEditPageState extends State<ServerEditPage> {
      _altUrlController.text = spi.alterUrl ?? '';
      _autoConnect.value = spi.autoConnect ?? true;
      _jumpServer.value = spi.jumpId;
-      _pveAddrCtrl.text = spi.custom?.pveAddr ?? '';
+
+      final custom = spi.custom;
+      if (custom != null) {
+        _pveAddrCtrl.text = custom.pveAddr ?? '';
+        _pveIgnoreCert.value = custom.pveIgnoreCert;
+        try {
+          // Add a null check here to prevent setting `null` to the controller
+          final encoded = json.encode(custom.cmds!);
+          if (encoded.isNotEmpty) {
+            _customCmdCtrl.text = encoded;
+          }
+        } catch (_) {}
+      }
    }
  }

@@ -243,6 +259,7 @@ class _ServerEditPageState extends State<ServerEditPage> {
      _buildAuth(),
      //_buildJumpServer(),
      _buildPVE(),
+      _buildCustomCmd(),
    ];
    return SingleChildScrollView(
      padding: const EdgeInsets.fromLTRB(17, 17, 17, 47),
@@ -364,6 +381,17 @@ class _ServerEditPageState extends State<ServerEditPage> {
    );
  }

+  Widget _buildCustomCmd() {
+    return Input(
+      controller: _customCmdCtrl,
+      type: TextInputType.text,
+      maxLines: 3,
+      label: l10n.customCmd,
+      icon: Icons.code,
+      hint: '{${l10n.customCmdHint}}',
+    );
+  }
+
  Widget _buildFAB() {
    return FloatingActionButton(
      heroTag: 'server',
@@ -463,8 +491,21 @@ class _ServerEditPageState extends State<ServerEditPage> {
    if (_portController.text.isEmpty) {
      _portController.text = '22';
    }
-    final pveAddr = _pveAddrCtrl.text.isEmpty ? null : _pveAddrCtrl.text;
-    final custom = pveAddr == null ? null : ServerCustom(pveAddr: pveAddr);
+    final customCmds = () {
+      if (_customCmdCtrl.text.isEmpty) return null;
+      try {
+        return json.decode(_customCmdCtrl.text).cast<String, String>();
+      } catch (e) {
+        context.showSnackBar(l10n.invalidJson);
+        return null;
+      }
+    }();
+    final pveAddr = _pveAddrCtrl.text.selfIfNotNullEmpty;
+    final custom = ServerCustom(
+      pveAddr: pveAddr,
+      pveIgnoreCert: _pveIgnoreCert.value,
+      cmds: customCmds,
+    );

    final spi = ServerPrivateInfo(
      name: _nameController.text.isEmpty
--- a/lib/view/page/server/tab.dart
+++ b/lib/view/page/server/tab.dart
@@ -11,7 +11,6 @@ import 'package:toolbox/core/extension/ssh_client.dart';
 import 'package:toolbox/core/utils/platform/base.dart';
 import 'package:toolbox/core/utils/share.dart';
 import 'package:toolbox/data/model/app/shell_func.dart';
-import 'package:toolbox/data/model/server/sensors.dart';
 import 'package:toolbox/data/model/server/try_limiter.dart';
 import 'package:toolbox/data/res/provider.dart';
 import 'package:toolbox/data/res/store.dart';
@@ -212,7 +211,7 @@ class _ServerPageState extends State<ServerPage>
  Widget _buildRealServerCard(Server srv) {
    final id = srv.spi.id;
    final cardStatus = _getCardNoti(id);
-    final title = _buildServerCardTitle(srv.status, srv.state, srv.spi);
+    final title = _buildServerCardTitle(srv);

    return ListenableBuilder(
      listenable: cardStatus,
@@ -331,17 +330,13 @@ class _ServerPageState extends State<ServerPage>
    ];
  }

-  Widget _buildServerCardTitle(
-    ServerStatus ss,
-    ServerState cs,
-    ServerPrivateInfo spi,
-  ) {
+  Widget _buildServerCardTitle(Server s) {
    Widget rightCorner = UIs.placeholder;
-    if (cs == ServerState.failed) {
+    if (s.state == ServerState.failed) {
      rightCorner = InkWell(
        onTap: () {
-          TryLimiter.reset(spi.id);
-          Pros.server.refresh(spi: spi);
+          TryLimiter.reset(s.spi.id);
+          Pros.server.refresh(spi: s.spi);
        },
        child: const Padding(
          padding: EdgeInsets.symmetric(horizontal: 7),
@@ -352,9 +347,9 @@ class _ServerPageState extends State<ServerPage>
          ),
        ),
      );
-    } else if (!(spi.autoConnect ?? true) && cs == ServerState.disconnected) {
+    } else if (!(s.spi.autoConnect ?? true) && s.state == ServerState.disconnected) {
      rightCorner = InkWell(
-        onTap: () => Pros.server.refresh(spi: spi),
+        onTap: () => Pros.server.refresh(spi: s.spi),
        child: const Padding(
          padding: EdgeInsets.symmetric(horizontal: 7),
          child: Icon(
@@ -365,7 +360,7 @@ class _ServerPageState extends State<ServerPage>
        ),
      );
    } else if (Stores.setting.serverTabUseOldUI.fetch()) {
-      rightCorner = ServerFuncBtnsTopRight(spi: spi);
+      rightCorner = ServerFuncBtnsTopRight(spi: s.spi);
    }
    return Padding(
      padding: const EdgeInsets.symmetric(horizontal: 7),
@@ -375,7 +370,7 @@ class _ServerPageState extends State<ServerPage>
          ConstrainedBox(
            constraints: BoxConstraints(maxWidth: _media.size.width / 2.3),
            child: Text(
-              spi.name,
+              s.spi.name,
              style: UIs.text13Bold,
              maxLines: 1,
              overflow: TextOverflow.ellipsis,
@@ -387,26 +382,25 @@ class _ServerPageState extends State<ServerPage>
            color: Colors.grey,
          ),
          const Spacer(),
-          _buildTopRightText(ss, cs),
+          _buildTopRightText(s),
          rightCorner,
        ],
      ),
    );
  }

-  Widget _buildTopRightText(ServerStatus ss, ServerState cs) {
-    if (cs == ServerState.failed && ss.err != null) {
+  Widget _buildTopRightText(Server s) {
+    if (s.state == ServerState.failed && s.status.err != null) {
      return GestureDetector(
-        onTap: () => _showFailReason(ss),
+        onTap: () => _showFailReason(s.status),
        child: Text(
          l10n.viewErr,
          style: UIs.text13Grey,
        ),
      );
    }
-    final topRightStr = _getTopRightStr(ss, cs);
    return Text(
-      topRightStr,
+      s.topRightStr,
      style: UIs.text13Grey,
    );
  }
@@ -526,34 +520,6 @@ class _ServerPageState extends State<ServerPage>
          _tag == null || (pro.pick(id: e)?.spi.tags?.contains(_tag) ?? false))
      .toList();

-  String _getTopRightStr(ServerStatus ss, ServerState cs) {
-    switch (cs) {
-      case ServerState.disconnected:
-        return l10n.disconnected;
-      case ServerState.finished:
-        final temp = ss.temps.first;
-        final sensorTemp = SensorItem.findPreferTempVal(ss.sensors);
-        final tempStr = switch ((temp, sensorTemp)) {
-          (_, final double val) => '${val.toStringAsFixed(1)}°C',
-          (final double val, _) => '${val.toStringAsFixed(1)}°C',
-          _ => null,
-        };
-        final upTime = ss.more[StatusCmdType.uptime];
-        final items = [tempStr, 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 ss.err ?? l10n.serverTabFailed;
-    }
-  }
-
  double? _calcCardHeight(ServerState cs, bool flip) {
    if (_textFactorDouble != 1.0) return null;
    if (cs != ServerState.finished) {
--- a/lib/view/page/setting/seq/srv_detail_seq.dart
+++ b/lib/view/page/setting/seq/srv_detail_seq.dart
@@ -3,7 +3,6 @@ import 'package:toolbox/core/extension/context/locale.dart';
 import 'package:toolbox/core/extension/context/snackbar.dart';
 import 'package:toolbox/core/utils/platform/base.dart';
 import 'package:toolbox/data/model/app/server_detail_card.dart';
-import 'package:toolbox/data/res/logger.dart';
 import 'package:toolbox/data/res/store.dart';

 import '../../../../core/extension/order.dart';
@@ -33,15 +32,7 @@ class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
  Widget _buildBody() {
    return ValueListenableBuilder(
      valueListenable: prop.listenable(),
-      builder: (_, vals, __) {
-        final keys = () {
-          try {
-            return List<String>.from(vals);
-          } catch (e) {
-            Loggers.app.info('ServerDetailOrderPage: $e');
-            return ServerDetailCards.names;
-          }
-        }();
+      builder: (_, keys, __) {
        final disabled =
            ServerDetailCards.names.where((e) => !keys.contains(e)).toList();
        final allKeys = [...keys, ...disabled];
@@ -64,7 +55,7 @@ class _ServerDetailOrderPageState extends State<ServerDetailOrderPage> {
              context.showSnackBar(l10n.disabled);
              return;
            }
-            keys.moveByItem(keys, o, n, property: prop);
+            keys.moveByItem(o, n, property: prop);
          },
        );
      },
--- a/lib/view/page/setting/seq/srv_func_seq.dart
+++ b/lib/view/page/setting/seq/srv_func_seq.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:toolbox/core/extension/context/locale.dart';
 import 'package:toolbox/core/extension/context/snackbar.dart';
 import 'package:toolbox/data/model/app/menu/server_func.dart';
-import 'package:toolbox/data/res/logger.dart';
 import 'package:toolbox/data/res/store.dart';
 import 'package:toolbox/data/res/ui.dart';

@@ -33,15 +32,7 @@ class _ServerDetailOrderPageState extends State<ServerFuncBtnsOrderPage> {
  Widget _buildBody() {
    return ValueListenableBuilder(
      valueListenable: prop.listenable(),
-      builder: (_, vals, __) {
-        final keys = () {
-          try {
-            return List<int>.from(vals);
-          } catch (e) {
-            Loggers.app.info('ServerFuncBtnsOrderPage: $e');
-            return ServerFuncBtn.values.map((e) => e.index).toList();
-          }
-        }();
+      builder: (_, keys, __) {
        final disabled = ServerFuncBtn.values
            .map((e) => e.index)
            .where((e) => !keys.contains(e))
@@ -74,7 +65,7 @@ class _ServerDetailOrderPageState extends State<ServerFuncBtnsOrderPage> {
              context.showSnackBar(l10n.disabled);
              return;
            }
-            keys.moveByItem(keys, o, n, property: prop);
+            keys.moveByItem(o, n, property: prop);
          },
        );
      },
--- a/lib/view/page/setting/seq/virt_key.dart
+++ b/lib/view/page/setting/seq/virt_key.dart
@@ -4,7 +4,6 @@ import 'package:toolbox/core/extension/context/snackbar.dart';
 import 'package:toolbox/core/extension/order.dart';
 import 'package:toolbox/core/utils/platform/base.dart';
 import 'package:toolbox/data/model/ssh/virtual_key.dart';
-import 'package:toolbox/data/res/logger.dart';
 import 'package:toolbox/data/res/store.dart';
 import 'package:toolbox/data/res/ui.dart';
 import 'package:toolbox/view/widget/cardx.dart';
@@ -34,15 +33,7 @@ class _SSHVirtKeySettingPageState extends State<SSHVirtKeySettingPage> {
  Widget _buildBody() {
    return ValueListenableBuilder(
      valueListenable: prop.listenable(),
-      builder: (_, vals, __) {
-        final keys = () {
-          try {
-            return List<int>.from(vals);
-          } catch (e) {
-            Loggers.app.info('SSHVirtKeySettingPage: $e');
-            return VirtKey.values.map((e) => e.index).toList();
-          }
-        }();
+      builder: (_, keys, __) {
        final disabled = VirtKey.values
            .map((e) => e.index)
            .where((e) => !keys.contains(e))
@@ -70,7 +61,7 @@ class _SSHVirtKeySettingPageState extends State<SSHVirtKeySettingPage> {
              context.showSnackBar(l10n.disabled);
              return;
            }
-            keys.moveByItem(keys, o, n, property: prop);
+            keys.moveByItem(o, n, property: prop);
          },
        );
      },
--- a/lib/view/page/snippet/list.dart
+++ b/lib/view/page/snippet/list.dart
@@ -59,9 +59,9 @@ class _SnippetListPageState extends State<SnippetListPage> {
          itemCount: filtered.length,
          onReorder: (oldIdx, newIdx) => setState(() {
            provider.snippets.moveByItem(
-              filtered,
              oldIdx,
              newIdx,
+              filtered: filtered,
              onMove: (p0) {
                Stores.setting.snippetOrder.put(p0.map((e) => e.name).toList());
              },