Merge branch 'dev'

2025-12-17 23:34:24 +01:00 · 2024-06-06 21:26:03 +08:00
parent ee889235fe a5a84c0cdd
commit 6d34de14d3
31 changed files with 114 additions and 49 deletions
--- a/lib/data/model/container/ps.dart
+++ b/lib/data/model/container/ps.dart
@@ -3,8 +3,9 @@ import 'dart:convert';
 import 'package:fl_lib/fl_lib.dart';
 import 'package:toolbox/core/extension/context/locale.dart';
 import 'package:toolbox/data/model/container/type.dart';
+import 'package:toolbox/data/res/misc.dart';

-abstract final class ContainerPs {
+sealed class ContainerPs {
  final String? id = null;
  final String? image = null;
  String? get name;
@@ -140,7 +141,11 @@ final class DockerPs implements ContainerPs {
  String? get cmd => null;

  @override
-  bool get running => state?.contains('Up ') ?? false;
+  bool get running {
+    if (state?.contains('Exited') == true) return false;
+    if (state?.contains('Up') == true) return true;
+    return true;
+  }

  @override
  void parseStats(String s) {
@@ -154,12 +159,12 @@ final class DockerPs implements ContainerPs {
  /// CONTAINER ID                   NAMES                          IMAGE                          STATUS
  /// a049d689e7a1                   aria2-pro                      p3terx/aria2-pro               Up 3 weeks
  factory DockerPs.parse(String raw) {
-    final parts = raw.split(RegExp(r'\s{2,}'));
+    final parts = raw.split(Miscs.multiBlankreg);
    return DockerPs(
      id: parts[0],
      names: parts[1],
      image: parts[2],
-      state: parts[3],
+      state: parts[3].trim(),
    );
  }
 }
--- a/lib/data/provider/container.dart
+++ b/lib/data/provider/container.dart
@@ -277,8 +277,8 @@ enum ContainerCmdType {
      ContainerCmdType.version => '$prefix version $_jsonFmt',
      ContainerCmdType.ps => switch (type) {
          /// Use [_jsonFmt] in Docker will cause the operation to slow down.
-          ContainerType.docker => '$prefix ps -a --format "table '
-              '{{printf \\"${"%-30.30s " * 4}\\" .ID .Names .Image .Status}}"',
+          ContainerType.docker => '$prefix ps -a --format "table {{printf \\"'
+              '%-15.15s ${"%-30.30s " * 3}\\" .ID .Names .Image .Status}}"',
          ContainerType.podman => '$prefix ps -a $_jsonFmt',
        },
      ContainerCmdType.stats =>
--- a/lib/data/res/build_data.dart
+++ b/lib/data/res/build_data.dart
@@ -2,9 +2,9 @@

 class BuildData {
  static const String name = "ServerBox";
-  static const int build = 923;
+  static const int build = 936;
  static const String engine = "3.22.1";
-  static const String buildAt = "2024-06-01 22:31:14";
-  static const int modifications = 4;
+  static const String buildAt = "2024-06-06 16:18:25";
+  static const int modifications = 2;
  static const int script = 48;
 }
--- a/lib/data/res/misc.dart
+++ b/lib/data/res/misc.dart
@@ -2,6 +2,7 @@ import 'dart:convert';

 abstract final class Miscs {
  static final blankReg = RegExp(r'\s+');
+  static final multiBlankreg = RegExp(r'\s{2,}');

  /// RegExp for password request
  static final pwdRequestWithUserReg = RegExp(r'\[sudo\] password for (.+):');
--- a/lib/data/res/url.dart
+++ b/lib/data/res/url.dart
@@ -1,6 +1,6 @@
 abstract final class Urls {
  static const cdnBase = 'https://cdn.lolli.tech/serverbox';
-  static const updateCfg = '$cdnBase/update.json';
+  static const updateCfg = '$cdnBase/update2.json';
  static const myGithub = 'https://github.com/lollipopkit';
  static const appHelp = '$myGithub/flutter_server_box#-help';
  static const appWiki = '$myGithub/flutter_server_box/wiki';
--- a/lib/data/store/setting.dart
+++ b/lib/data/store/setting.dart
@@ -276,6 +276,8 @@ class SettingStore extends PersistentStore {
  /// fmt: https://example.com/{DIST}-{BRIGHT}.png
  late final serverLogoUrl = property('serverLogoUrl', '');

+  late final betaTest = property('betaTest', false);
+
  // Never show these settings for users
  //
  // ------BEGIN------
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -2,6 +2,7 @@
  "@@locale": "de",
  "about": "Über",
  "aboutThanks": "Vielen Dank an die folgenden Personen, die daran teilgenommen haben.\n",
+  "acceptBeta": "Akzeptieren Sie Testversion-Updates",
  "add": "Neu",
  "addAServer": "Server hinzufügen",
  "addPrivateKey": "Private key hinzufügen",
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -2,6 +2,7 @@
  "@@locale": "en",
  "about": "About",
  "aboutThanks": "Thanks to the following people who participated in.",
+  "acceptBeta": "Accept test version updates",
  "add": "Add",
  "addAServer": "add a server",
  "addPrivateKey": "Add private key",
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -2,6 +2,7 @@
  "@@locale": "es",
  "about": "Acerca de",
  "aboutThanks": "Gracias a los siguientes participantes.",
+  "acceptBeta": "Aceptar actualizaciones de la versión de prueba",
  "add": "Añadir",
  "addAServer": "Agregar un servidor",
  "addPrivateKey": "Agregar una llave privada",
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -2,6 +2,7 @@
  "@@locale": "fr",
  "about": "À propos",
  "aboutThanks": "Merci aux personnes suivantes qui ont participé.",
+  "acceptBeta": "Accepter les mises à jour de la version de test",
  "add": "Ajouter",
  "addAServer": "Ajouter un serveur",
  "addPrivateKey": "Ajouter une clé privée",
--- a/lib/l10n/app_id.arb
+++ b/lib/l10n/app_id.arb
@@ -2,6 +2,7 @@
  "@@locale": "id",
  "about": "Tentang",
  "aboutThanks": "Terima kasih kepada orang -orang berikut yang berpartisipasi.",
+  "acceptBeta": "Terima pembaruan versi uji coba",
  "add": "Menambahkan",
  "addAServer": "tambahkan server",
  "addPrivateKey": "Tambahkan kunci pribadi",
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@@ -2,6 +2,7 @@
  "@@locale": "ja",
  "about": "約",
  "aboutThanks": "以下の参加者に感謝します。",
+  "acceptBeta": "テストバージョンの更新を受け入れる",
  "add": "追加",
  "addAServer": "サーバーを追加する",
  "addPrivateKey": "プライベートキーを追加",
--- a/lib/l10n/app_nl.arb
+++ b/lib/l10n/app_nl.arb
@@ -2,6 +2,7 @@
  "@@locale": "nl",
  "about": "Over",
  "aboutThanks": "Met dank aan de volgende mensen die hebben deelgenomen aan.",
+  "acceptBeta": "Accepteer testversie-updates",
  "add": "Toevoegen",
  "addAServer": "een server toevoegen",
  "addPrivateKey": "Privésleutel toevoegen",
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -2,6 +2,7 @@
  "@@locale": "pt",
  "about": "Sobre",
  "aboutThanks": "Agradecimentos a todos os participantes.",
+  "acceptBeta": "Aceitar atualizações da versão de teste",
  "add": "Adicionar",
  "addAServer": "Adicionar um servidor",
  "addPrivateKey": "Adicionar uma chave privada",
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -2,6 +2,7 @@
  "@@locale": "ru",
  "about": "о",
  "aboutThanks": "Благодарности всем участникам.",
+  "acceptBeta": "Принять обновления тестовой версии",
  "add": "добавить",
  "addAServer": "добавить сервер",
  "addPrivateKey": "добавить приватный ключ",
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -2,6 +2,7 @@
  "@@locale": "zh",
  "about": "关于",
  "aboutThanks": "感谢以下参与的各位。",
+  "acceptBeta": "接受测试版更新推送",
  "add": "新增",
  "addAServer": "添加服务器",
  "addPrivateKey": "添加一个私钥",
--- a/lib/l10n/app_zh_tw.arb
+++ b/lib/l10n/app_zh_tw.arb
@@ -2,6 +2,7 @@
  "@@locale": "zh_TW",
  "about": "關於",
  "aboutThanks": "感謝以下參與的各位。",
+  "acceptBeta": "接受測試版更新推送",
  "add": "新增",
  "addAServer": "新增服務器",
  "addPrivateKey": "新增一個私鑰",
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -20,6 +20,7 @@ import 'package:toolbox/data/model/server/custom.dart';
 import 'package:toolbox/data/model/server/private_key_info.dart';
 import 'package:toolbox/data/model/server/server_private_info.dart';
 import 'package:toolbox/data/model/server/snippet.dart';
+import 'package:toolbox/data/model/server/wol_cfg.dart';
 import 'package:toolbox/data/model/ssh/virtual_key.dart';
 import 'package:toolbox/data/res/build_data.dart';
 import 'package:toolbox/data/res/misc.dart';
@@ -87,6 +88,7 @@ Future<void> _initData() async {
  Hive.registerAdapter(NetViewTypeAdapter()); // 5
  Hive.registerAdapter(ServerFuncBtnAdapter()); // 6
  Hive.registerAdapter(ServerCustomAdapter()); // 7
+  Hive.registerAdapter(WakeOnLanCfgAdapter()); // 8

  await Stores.setting.init();
  await Stores.server.init();
@@ -98,6 +100,8 @@ Future<void> _initData() async {
  Pros.snippet.load();
  Pros.key.load();
  await Pros.app.init();
+
+  if (Stores.setting.betaTest.fetch()) AppUpdate.chan = AppUpdateChan.beta;
 }

 void _setupDebug() {
--- a/lib/view/page/container.dart
+++ b/lib/view/page/container.dart
@@ -206,7 +206,10 @@ class _ContainerPageState extends State<ContainerPage> {
              ],
            ),
            Text(
-              '${item.image ?? l10n.unknown} - ${item.running ? l10n.running : l10n.stopped}',
+              '${item.image ?? l10n.unknown} - ${switch (item) {
+                final PodmanPs ps => ps.running ? l10n.running : l10n.stopped,
+                final DockerPs ps => ps.state,
+              }}',
              style: UIs.text13Grey,
            ),
            _buildPsItemStats(item),
@@ -550,7 +553,10 @@ class _ContainerPageState extends State<ContainerPage> {
      case ContainerMenu.logs:
        AppRoutes.ssh(
          spi: widget.spi,
-          initCmd: 'docker logs -f --tail 100 ${dItem.id}',
+          initCmd: '${switch (_container.type) {
+            ContainerType.podman => 'podman',
+            ContainerType.docker => 'docker',
+          }} logs -f --tail 100 ${dItem.id}',
        ).go(context);
        break;
      case ContainerMenu.terminal:
--- a/lib/view/page/home/home.dart
+++ b/lib/view/page/home/home.dart
@@ -341,7 +341,7 @@ ${GithubIds.participants.map((e) => '[$e](${e.url})').join(' ')}
    if (Stores.setting.autoCheckAppUpdate.fetch()) {
      AppUpdateIface.doUpdate(
        build: BuildData.build,
-        url: '${Urls.cdnBase}/update.json',
+        url: Urls.updateCfg,
        context: context,
      );
    }
--- a/lib/view/page/home/wear.dart
+++ b/lib/view/page/home/wear.dart
@@ -94,7 +94,7 @@ final class _WearHomeState extends State<WearHome> with AfterLayoutMixin {
    if (Stores.setting.autoCheckAppUpdate.fetch()) {
      AppUpdateIface.doUpdate(
        build: BuildData.build,
-        url: '${Urls.cdnBase}/update.json',
+        url: Urls.updateCfg,
        context: context,
      );
    }
--- a/lib/view/page/setting/entry.dart
+++ b/lib/view/page/setting/entry.dart
@@ -1066,6 +1066,7 @@ class _SettingPageState extends State<SettingPage> {
      leading: const Icon(MingCute.more_3_fill),
      title: Text(l10n.more),
      children: [
+        _buildBeta(),
        _buildWakeLock(),
        if (isAndroid || isIOS) _buildCollectUsage(),
        _buildCollapseUI(),
@@ -1195,4 +1196,12 @@ class _SettingPageState extends State<SettingPage> {
      },
    );
  }
+
+  Widget _buildBeta() {
+    return ListTile(
+      title: const Text('Beta Program'),
+      subtitle: Text(l10n.acceptBeta, style: UIs.textGrey),
+      trailing: StoreSwitch(prop: _setting.betaTest),
+    );
+  }
 }
--- a/lib/view/page/ssh/page.dart
+++ b/lib/view/page/ssh/page.dart
@@ -515,9 +515,9 @@ class _SSHPageState extends State<SSHPage> with AutomaticKeepAliveClientMixin {
    _terminalStyle = TerminalStyle.fromTextStyle(textStyle);
  }

-  Future<void> _showHelp() async {
+  void _showHelp() {
    if (!Stores.setting.sshTermHelpShown.fetch()) {
-      await context.showRoundDialog(
+      context.showRoundDialog(
        title: l10n.doc,
        child: Text(l10n.sshTermHelp),
        actions: [
--- a/lib/view/page/storage/sftp.dart
+++ b/lib/view/page/storage/sftp.dart
@@ -472,19 +472,41 @@ class _SftpPageState extends State<SftpPage> with AfterLayoutMixin {
  void _delete(SftpName file) {
    context.pop();
    final isDir = file.attr.isDirectory;
-    final useRmr = Stores.setting.sftpRmrDir.fetch();
+    var useRmr = Stores.setting.sftpRmrDir.fetch();
    final text = () {
      if (isDir && !useRmr) {
-        return l10n.askContinue(
-          '${l10n.dirEmpty}\n${l10n.delete} '
-          '${file.filename}',
-        );
+        return l10n.askContinue('${l10n.delete} ${file.filename}');
      }
      return l10n.askContinue('${l10n.delete} ${file.filename}');
    }();
+
+    // Most users don't know that SFTP can't delete a directory which is not
+    // empty, so we provide a checkbox to let user choose to use `rm -r` or not
    context.showRoundDialog(
-      child: Text(text),
      title: l10n.attention,
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          ListTile(
+            title: Text(text),
+          ),
+          if (!useRmr)
+            StatefulBuilder(
+              builder: (_, setState) {
+                return CheckboxListTile(
+                  title: Text(l10n.sftpRmrDirSummary),
+                  value: useRmr,
+                  onChanged: (val) {
+                    setState(() {
+                      useRmr = val ?? false;
+                    });
+                  },
+                );
+              },
+            ),
+        ],
+      ),
      actions: [
        TextButton(
          onPressed: () => context.pop(),