mirror of
https://github.com/lollipopkit/flutter_server_box.git
synced 2026-02-15 12:44:59 +01:00
Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e5ef28415b | ||
|
|
46b98df153 | ||
|
|
9f34021c90 | ||
|
|
8121eef839 | ||
|
|
da48d1f66c | ||
|
|
b167287c5b | ||
|
|
41f9da6bf8 | ||
|
|
e7c7fc8186 | ||
|
|
b950dd2d68 | ||
|
|
6d34de14d3 | ||
|
|
a5a84c0cdd | ||
|
|
701b1b811f | ||
|
|
97267cdfbf | ||
|
|
40ce37d230 | ||
|
|
8a9ade355c | ||
|
|
9bffec64b5 | ||
|
|
a03ee2ae0e | ||
|
|
ee889235fe | ||
|
|
94d6d80497 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -57,9 +57,10 @@ test.dart
|
||||
|
||||
# Linux release
|
||||
linux.AppDir
|
||||
ServerBox-x86_64.AppImage
|
||||
**/*.AppImage
|
||||
|
||||
untranlated.json
|
||||
|
||||
.vscode/settings.json
|
||||
more_build_data.json
|
||||
trans.txt
|
||||
|
||||
@@ -17,7 +17,9 @@ Especially thanks to <a href="https://github.com/TerminalStudio/dartssh2">dartss
|
||||
## ⬇️ Download
|
||||
🎉 **The `Android / Linux / Windows` version are now built via GitHub Actions**
|
||||
|
||||
[iOS & macOS](https://apps.apple.com/app/id6476033062) / [Android & Linux & Windows](https://github.com/lollipopkit/flutter_gpt_box/releases)
|
||||
[iOS & macOS](https://apps.apple.com/app/id1586449703) / [Android & Linux & Windows](https://github.com/lollipopkit/flutter_server_box/releases)
|
||||
|
||||
All deprecated versions before `v930` can be found in [here](https://cdn.lolli.tech/serverbox/?sort=time&order=desc&layout=grid).
|
||||
|
||||
|
||||
## 🔖 Feature
|
||||
|
||||
@@ -18,7 +18,9 @@
|
||||
## ⬇️ Download
|
||||
🎉 **现在 `Android / Linux / Windows` 版本使用 GitHub Actions 构建**。
|
||||
|
||||
[iOS & macOS](https://apps.apple.com/app/id1586449703) / [Android & Linux & Windows](https://github.com/lollipopkit/flutter_gpt_box/releases)
|
||||
[iOS & macOS](https://apps.apple.com/app/id1586449703) / [Android & Linux & Windows](https://github.com/lollipopkit/flutter_server_box/releases)
|
||||
|
||||
所有 `v930` 之前的版本可以在 [这里](https://cdn.lolli.tech/serverbox/?sort=time&order=desc&layout=grid) 找到。
|
||||
|
||||
|
||||
## 🔖 特点
|
||||
|
||||
@@ -690,7 +690,7 @@
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CURRENT_PROJECT_VERSION = 923;
|
||||
CURRENT_PROJECT_VERSION = 948;
|
||||
DEVELOPMENT_TEAM = BA88US33G6;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
|
||||
@@ -700,7 +700,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0.923;
|
||||
MARKETING_VERSION = 1.0.948;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||
@@ -826,7 +826,7 @@
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CURRENT_PROJECT_VERSION = 923;
|
||||
CURRENT_PROJECT_VERSION = 948;
|
||||
DEVELOPMENT_TEAM = BA88US33G6;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
|
||||
@@ -836,7 +836,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0.923;
|
||||
MARKETING_VERSION = 1.0.948;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||
@@ -854,7 +854,7 @@
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CURRENT_PROJECT_VERSION = 923;
|
||||
CURRENT_PROJECT_VERSION = 948;
|
||||
DEVELOPMENT_TEAM = BA88US33G6;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
|
||||
@@ -864,7 +864,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0.923;
|
||||
MARKETING_VERSION = 1.0.948;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||
@@ -885,7 +885,7 @@
|
||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 923;
|
||||
CURRENT_PROJECT_VERSION = 948;
|
||||
DEVELOPMENT_TEAM = BA88US33G6;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
@@ -898,7 +898,7 @@
|
||||
"@executable_path/Frameworks",
|
||||
"@executable_path/../../Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0.923;
|
||||
MARKETING_VERSION = 1.0.948;
|
||||
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
|
||||
MTL_FAST_MATH = YES;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
|
||||
@@ -924,7 +924,7 @@
|
||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 923;
|
||||
CURRENT_PROJECT_VERSION = 948;
|
||||
DEVELOPMENT_TEAM = BA88US33G6;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
@@ -937,7 +937,7 @@
|
||||
"@executable_path/Frameworks",
|
||||
"@executable_path/../../Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0.923;
|
||||
MARKETING_VERSION = 1.0.948;
|
||||
MTL_FAST_MATH = YES;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
@@ -960,7 +960,7 @@
|
||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 923;
|
||||
CURRENT_PROJECT_VERSION = 948;
|
||||
DEVELOPMENT_TEAM = BA88US33G6;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
@@ -973,7 +973,7 @@
|
||||
"@executable_path/Frameworks",
|
||||
"@executable_path/../../Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0.923;
|
||||
MARKETING_VERSION = 1.0.948;
|
||||
MTL_FAST_MATH = YES;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
@@ -996,7 +996,7 @@
|
||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 923;
|
||||
CURRENT_PROJECT_VERSION = 948;
|
||||
DEVELOPMENT_ASSET_PATHS = "";
|
||||
DEVELOPMENT_TEAM = BA88US33G6;
|
||||
ENABLE_PREVIEWS = YES;
|
||||
@@ -1008,7 +1008,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0.923;
|
||||
MARKETING_VERSION = 1.0.948;
|
||||
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
|
||||
MTL_FAST_MATH = YES;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
|
||||
@@ -1037,7 +1037,7 @@
|
||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 923;
|
||||
CURRENT_PROJECT_VERSION = 948;
|
||||
DEVELOPMENT_ASSET_PATHS = "";
|
||||
DEVELOPMENT_TEAM = BA88US33G6;
|
||||
ENABLE_PREVIEWS = YES;
|
||||
@@ -1049,7 +1049,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0.923;
|
||||
MARKETING_VERSION = 1.0.948;
|
||||
MTL_FAST_MATH = YES;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
|
||||
PRODUCT_NAME = ServerBox;
|
||||
@@ -1075,7 +1075,7 @@
|
||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 923;
|
||||
CURRENT_PROJECT_VERSION = 948;
|
||||
DEVELOPMENT_ASSET_PATHS = "";
|
||||
DEVELOPMENT_TEAM = BA88US33G6;
|
||||
ENABLE_PREVIEWS = YES;
|
||||
@@ -1087,7 +1087,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0.923;
|
||||
MARKETING_VERSION = 1.0.948;
|
||||
MTL_FAST_MATH = YES;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
|
||||
PRODUCT_NAME = ServerBox;
|
||||
|
||||
@@ -15,7 +15,7 @@ class MyApp extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
_setup(context);
|
||||
return ListenableBuilder(
|
||||
listenable: RebuildNodes.app,
|
||||
listenable: RNodes.app,
|
||||
builder: (context, _) {
|
||||
if (!Stores.setting.useSystemPrimaryColor.fetch()) {
|
||||
UIs.colorSeed = Color(Stores.setting.primaryColor.fetch());
|
||||
|
||||
@@ -170,7 +170,7 @@ class Backup {
|
||||
}
|
||||
|
||||
Pros.reload();
|
||||
RebuildNodes.app.rebuild();
|
||||
RNodes.app.build();
|
||||
|
||||
_logger.info('Restore success');
|
||||
}
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
typedef GhId = String;
|
||||
|
||||
extension GhIdX on GhId {
|
||||
String get url => 'https://github.com/$this';
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
class RebuildNode implements Listenable {
|
||||
final List<VoidCallback> _listeners = [];
|
||||
|
||||
RebuildNode();
|
||||
|
||||
@override
|
||||
void addListener(VoidCallback listener) {
|
||||
_listeners.add(listener);
|
||||
}
|
||||
|
||||
@override
|
||||
void removeListener(VoidCallback listener) {
|
||||
_listeners.remove(listener);
|
||||
}
|
||||
|
||||
void rebuild() {
|
||||
for (var listener in _listeners) {
|
||||
listener();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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,10 @@ 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;
|
||||
return true;
|
||||
}
|
||||
|
||||
@override
|
||||
void parseStats(String s) {
|
||||
@@ -154,12 +158,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[1],
|
||||
names: parts[2],
|
||||
image: parts[3].trim(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -276,9 +276,13 @@ enum ContainerCmdType {
|
||||
return switch (this) {
|
||||
ContainerCmdType.version => '$prefix version $_jsonFmt',
|
||||
ContainerCmdType.ps => switch (type) {
|
||||
/// TODO: Rollback to json format when permformance recovers.
|
||||
/// 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 '
|
||||
'${"%-50.50s " * 2}\\"'
|
||||
' .ID .Status .Names .Image}}"',
|
||||
ContainerType.podman => '$prefix ps -a $_jsonFmt',
|
||||
},
|
||||
ContainerCmdType.stats =>
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
class BuildData {
|
||||
static const String name = "ServerBox";
|
||||
static const int build = 923;
|
||||
static const int build = 948;
|
||||
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-08 21:21:36";
|
||||
static const int modifications = 3;
|
||||
static const int script = 48;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import 'package:toolbox/data/model/app/github_id.dart';
|
||||
|
||||
abstract final class GithubIds {
|
||||
// Thanks
|
||||
// If you want to change your Github ID, please open an issue.
|
||||
@@ -75,3 +73,9 @@ abstract final class GithubIds {
|
||||
'Jasonzhu1207',
|
||||
};
|
||||
}
|
||||
|
||||
typedef GhId = String;
|
||||
|
||||
extension GhIdX on GhId {
|
||||
String get url => 'https://github.com/$this';
|
||||
}
|
||||
|
||||
@@ -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 (.+):');
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import 'package:toolbox/data/model/app/rebuild.dart';
|
||||
import 'package:fl_lib/fl_lib.dart';
|
||||
|
||||
abstract final class RebuildNodes {
|
||||
static final app = RebuildNode();
|
||||
abstract final class RNodes {
|
||||
static final app = RNode();
|
||||
static final dark = false.vn;
|
||||
}
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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------
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
"@@locale": "ja",
|
||||
"about": "約",
|
||||
"aboutThanks": "以下の参加者に感謝します。",
|
||||
"acceptBeta": "テストバージョンの更新を受け入れる",
|
||||
"add": "追加",
|
||||
"addAServer": "サーバーを追加する",
|
||||
"addPrivateKey": "プライベートキーを追加",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
"@@locale": "ru",
|
||||
"about": "о",
|
||||
"aboutThanks": "Благодарности всем участникам.",
|
||||
"acceptBeta": "Принять обновления тестовой версии",
|
||||
"add": "добавить",
|
||||
"addAServer": "добавить сервер",
|
||||
"addPrivateKey": "добавить приватный ключ",
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
"@@locale": "zh",
|
||||
"about": "关于",
|
||||
"aboutThanks": "感谢以下参与的各位。",
|
||||
"acceptBeta": "接受测试版更新推送",
|
||||
"add": "新增",
|
||||
"addAServer": "添加服务器",
|
||||
"addPrivateKey": "添加一个私钥",
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
"@@locale": "zh_TW",
|
||||
"about": "關於",
|
||||
"aboutThanks": "感謝以下參與的各位。",
|
||||
"acceptBeta": "接受測試版更新推送",
|
||||
"add": "新增",
|
||||
"addAServer": "新增服務器",
|
||||
"addPrivateKey": "新增一個私鑰",
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -9,7 +9,6 @@ import 'package:toolbox/core/channel/home_widget.dart';
|
||||
import 'package:toolbox/core/extension/build.dart';
|
||||
import 'package:toolbox/core/extension/context/locale.dart';
|
||||
import 'package:toolbox/core/route.dart';
|
||||
import 'package:toolbox/data/model/app/github_id.dart';
|
||||
import 'package:toolbox/data/model/app/tab.dart';
|
||||
import 'package:toolbox/data/res/build_data.dart';
|
||||
import 'package:toolbox/data/res/github_id.dart';
|
||||
@@ -17,6 +16,7 @@ import 'package:toolbox/data/res/misc.dart';
|
||||
import 'package:toolbox/data/res/provider.dart';
|
||||
import 'package:toolbox/data/res/store.dart';
|
||||
import 'package:toolbox/data/res/url.dart';
|
||||
import 'package:toolbox/view/page/ssh/page.dart';
|
||||
import 'package:wakelock_plus/wakelock_plus.dart';
|
||||
|
||||
part 'appbar.dart';
|
||||
@@ -151,6 +151,7 @@ class _HomePageState extends State<HomePage>
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
itemBuilder: (_, index) => AppTab.values[index].page,
|
||||
onPageChanged: (value) {
|
||||
SSHPage.focusNode.unfocus();
|
||||
if (!_switchingPage) {
|
||||
_selectIndex.value = value;
|
||||
}
|
||||
@@ -341,7 +342,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,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -305,7 +305,7 @@ class _SettingPageState extends State<SettingPage> {
|
||||
_setting.primaryColor.put(color.value);
|
||||
context.pop();
|
||||
context.pop();
|
||||
RebuildNodes.app.rebuild();
|
||||
RNodes.app.build();
|
||||
}
|
||||
|
||||
// Widget _buildLaunchPage() {
|
||||
@@ -393,7 +393,7 @@ class _SettingPageState extends State<SettingPage> {
|
||||
);
|
||||
if (selected != null) {
|
||||
_setting.themeMode.put(selected);
|
||||
RebuildNodes.app.rebuild();
|
||||
RNodes.app.build();
|
||||
}
|
||||
},
|
||||
trailing: ValBuilder(
|
||||
@@ -442,7 +442,7 @@ class _SettingPageState extends State<SettingPage> {
|
||||
onPressed: () {
|
||||
_setting.fontPath.delete();
|
||||
context.pop();
|
||||
RebuildNodes.app.rebuild();
|
||||
RNodes.app.build();
|
||||
},
|
||||
child: Text(l10n.clear),
|
||||
)
|
||||
@@ -466,7 +466,7 @@ class _SettingPageState extends State<SettingPage> {
|
||||
}
|
||||
|
||||
context.pop();
|
||||
RebuildNodes.app.rebuild();
|
||||
RNodes.app.build();
|
||||
}
|
||||
|
||||
Widget _buildTermFontSize() {
|
||||
@@ -536,7 +536,7 @@ class _SettingPageState extends State<SettingPage> {
|
||||
if (selected != null) {
|
||||
_setting.locale.put(selected.code);
|
||||
context.pop();
|
||||
RebuildNodes.app.rebuild();
|
||||
RNodes.app.build();
|
||||
}
|
||||
},
|
||||
trailing: ListenBuilder(
|
||||
@@ -609,7 +609,7 @@ class _SettingPageState extends State<SettingPage> {
|
||||
subtitle: Text(l10n.fullScreenTip, style: UIs.textGrey),
|
||||
trailing: StoreSwitch(
|
||||
prop: _setting.fullScreen,
|
||||
callback: (_) => RebuildNodes.app.rebuild(),
|
||||
callback: (_) => RNodes.app.build(),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -820,7 +820,7 @@ class _SettingPageState extends State<SettingPage> {
|
||||
return;
|
||||
}
|
||||
_setting.textFactor.put(val);
|
||||
RebuildNodes.app.rebuild();
|
||||
RNodes.app.build();
|
||||
context.pop();
|
||||
}
|
||||
|
||||
@@ -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),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import 'dart:ui';
|
||||
import 'package:fl_lib/fl_lib.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:toolbox/core/extension/context/locale.dart';
|
||||
@@ -22,6 +23,29 @@ class _ServerOrderPageState extends State<ServerOrderPage> {
|
||||
);
|
||||
}
|
||||
|
||||
Widget _proxyDecorator(Widget child, int index, Animation<double> animation) {
|
||||
return AnimatedBuilder(
|
||||
animation: animation,
|
||||
builder: (BuildContext context, Widget? child) {
|
||||
final double animValue = Curves.easeInOut.transform(animation.value);
|
||||
final double elevation = lerpDouble(1, 6, animValue)!;
|
||||
final double scale = lerpDouble(1, 1.02, animValue)!;
|
||||
return Transform.scale(
|
||||
scale: scale,
|
||||
// Create a Card based on the color and the content of the dragged one
|
||||
// and set its elevation to the animated value.
|
||||
child: Card(
|
||||
elevation: elevation,
|
||||
// color: cards[index].color,
|
||||
// child: cards[index].child,
|
||||
child: _buildCardTile(index),
|
||||
),
|
||||
);
|
||||
},
|
||||
// child: child,
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildBody() {
|
||||
if (Pros.server.serverOrder.isEmpty) {
|
||||
return Center(child: Text(l10n.noServerAvailable));
|
||||
@@ -37,28 +61,36 @@ class _ServerOrderPageState extends State<ServerOrderPage> {
|
||||
}),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 7, vertical: 3),
|
||||
buildDefaultDragHandles: false,
|
||||
itemBuilder: (_, idx) => _buildItem(idx, Pros.server.serverOrder[idx]),
|
||||
itemBuilder: (_, idx) => _buildItem(idx),
|
||||
itemCount: Pros.server.serverOrder.length,
|
||||
proxyDecorator: _proxyDecorator,
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildItem(int index, String id) {
|
||||
Widget _buildItem(int index) {
|
||||
return ReorderableDelayedDragStartListener(
|
||||
key: ValueKey('$index'),
|
||||
index: index,
|
||||
child: CardX(child: _buildCardTile(index)),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildCardTile(int index) {
|
||||
final id = Pros.server.serverOrder[index];
|
||||
final spi = Pros.server.pick(id: id)?.spi;
|
||||
if (spi == null) {
|
||||
return const SizedBox();
|
||||
}
|
||||
return ReorderableDelayedDragStartListener(
|
||||
key: ValueKey('$index'),
|
||||
index: index,
|
||||
child: CardX(
|
||||
child: ListTile(
|
||||
title: Text(spi.name),
|
||||
subtitle: Text(spi.id, style: UIs.textGrey),
|
||||
leading: CircleAvatar(
|
||||
child: Text(spi.name[0]),
|
||||
),
|
||||
trailing: const Icon(Icons.drag_handle),
|
||||
),
|
||||
|
||||
return ListTile(
|
||||
title: Text(spi.name),
|
||||
subtitle: Text(spi.id, style: UIs.textGrey),
|
||||
leading: CircleAvatar(
|
||||
child: Text(spi.name[0]),
|
||||
),
|
||||
trailing: ReorderableDragStartListener(
|
||||
index: index,
|
||||
child: const Icon(Icons.drag_handle),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:after_layout/after_layout.dart';
|
||||
import 'package:dartssh2/dartssh2.dart';
|
||||
import 'package:fl_lib/fl_lib.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
@@ -41,13 +42,16 @@ class SSHPage extends StatefulWidget {
|
||||
this.terminalKey,
|
||||
});
|
||||
|
||||
static final focusNode = FocusNode();
|
||||
|
||||
@override
|
||||
State<SSHPage> createState() => _SSHPageState();
|
||||
State<SSHPage> createState() => SSHPageState();
|
||||
}
|
||||
|
||||
const _horizonPadding = 7.0;
|
||||
|
||||
class _SSHPageState extends State<SSHPage> with AutomaticKeepAliveClientMixin {
|
||||
class SSHPageState extends State<SSHPage>
|
||||
with AutomaticKeepAliveClientMixin, AfterLayoutMixin {
|
||||
final _keyboard = VirtKeyProvider();
|
||||
late final _terminal = Terminal(inputHandler: _keyboard);
|
||||
final TerminalController _terminalController = TerminalController();
|
||||
@@ -71,13 +75,6 @@ class _SSHPageState extends State<SSHPage> with AutomaticKeepAliveClientMixin {
|
||||
super.initState();
|
||||
_initStoredCfg();
|
||||
_initVirtKeys();
|
||||
|
||||
Future.delayed(const Duration(milliseconds: 77), () async {
|
||||
_showHelp();
|
||||
await _initTerminal();
|
||||
|
||||
if (Stores.setting.sshWakeLock.fetch()) WakelockPlus.enable();
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -151,7 +148,7 @@ class _SSHPageState extends State<SSHPage> with AutomaticKeepAliveClientMixin {
|
||||
textStyle: _terminalStyle,
|
||||
theme: _terminalTheme,
|
||||
deleteDetection: isMobile,
|
||||
autofocus: true,
|
||||
autofocus: false,
|
||||
keyboardAppearance: _isDark ? Brightness.dark : Brightness.light,
|
||||
showToolbar: isMobile,
|
||||
viewOffset: Offset(
|
||||
@@ -159,6 +156,7 @@ class _SSHPageState extends State<SSHPage> with AutomaticKeepAliveClientMixin {
|
||||
CustomAppBar.barHeight ?? _media.padding.top,
|
||||
),
|
||||
hideScrollBar: false,
|
||||
focusNode: SSHPage.focusNode,
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -429,6 +427,8 @@ class _SSHPageState extends State<SSHPage> with AutomaticKeepAliveClientMixin {
|
||||
}
|
||||
}
|
||||
|
||||
SSHPage.focusNode.requestFocus();
|
||||
|
||||
await session.done;
|
||||
if (mounted && widget.notFromTab) {
|
||||
context.pop();
|
||||
@@ -516,21 +516,29 @@ class _SSHPageState extends State<SSHPage> with AutomaticKeepAliveClientMixin {
|
||||
}
|
||||
|
||||
Future<void> _showHelp() async {
|
||||
if (!Stores.setting.sshTermHelpShown.fetch()) {
|
||||
await context.showRoundDialog(
|
||||
title: l10n.doc,
|
||||
child: Text(l10n.sshTermHelp),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
Stores.setting.sshTermHelpShown.put(true);
|
||||
context.pop();
|
||||
},
|
||||
child: Text(l10n.noPromptAgain),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
if (Stores.setting.sshTermHelpShown.fetch()) return;
|
||||
|
||||
return await context.showRoundDialog(
|
||||
title: l10n.doc,
|
||||
child: Text(l10n.sshTermHelp),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
Stores.setting.sshTermHelpShown.put(true);
|
||||
context.pop();
|
||||
},
|
||||
child: Text(l10n.noPromptAgain),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
FutureOr<void> afterFirstLayout(BuildContext context) async {
|
||||
await _showHelp();
|
||||
await _initTerminal();
|
||||
|
||||
if (Stores.setting.sshWakeLock.fetch()) WakelockPlus.enable();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import 'package:fl_lib/fl_lib.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:icons_plus/icons_plus.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:toolbox/core/extension/context/locale.dart';
|
||||
import 'package:toolbox/core/route.dart';
|
||||
@@ -15,37 +16,37 @@ class SSHTabPage extends StatefulWidget {
|
||||
State<SSHTabPage> createState() => _SSHTabPageState();
|
||||
}
|
||||
|
||||
typedef _TabMap = Map<String, ({Widget page, GlobalKey<SSHPageState>? key})>;
|
||||
|
||||
class _SSHTabPageState extends State<SSHTabPage>
|
||||
with TickerProviderStateMixin, AutomaticKeepAliveClientMixin {
|
||||
late final _tabMap = <String, ({Widget page})>{
|
||||
l10n.add: (page: _buildAddPage()),
|
||||
late final _TabMap _tabMap = {
|
||||
l10n.add: (page: _buildAddPage(), key: null),
|
||||
};
|
||||
late var _tabController = TabController(
|
||||
length: _tabMap.length,
|
||||
vsync: this,
|
||||
);
|
||||
final _fabRN = ValueNotifier(0);
|
||||
final _pageCtrl = PageController();
|
||||
final _fabVN = 0.vn;
|
||||
final _tabRN = RNode();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
super.build(context);
|
||||
return Scaffold(
|
||||
appBar: TabBar(
|
||||
controller: _tabController,
|
||||
tabs: _tabMap.keys.map(_buildTabItem).toList(),
|
||||
isScrollable: true,
|
||||
tabAlignment: TabAlignment.start,
|
||||
dividerColor: Colors.transparent,
|
||||
onTap: (value) {
|
||||
_fabRN.value = value;
|
||||
FocusScope.of(context).unfocus();
|
||||
appBar: PreferredSizeListenBuilder(
|
||||
listenable: _tabRN,
|
||||
builder: () {
|
||||
return _TabBar(
|
||||
idxVN: _fabVN,
|
||||
map: _tabMap,
|
||||
onTap: _onTapTab,
|
||||
onClose: _onTapClose,
|
||||
);
|
||||
},
|
||||
),
|
||||
body: _buildBody(),
|
||||
floatingActionButton: ListenableBuilder(
|
||||
listenable: _fabRN,
|
||||
builder: (_, __) {
|
||||
if (_fabRN.value != 0) return const SizedBox();
|
||||
floatingActionButton: ValBuilder(
|
||||
listenable: _fabVN,
|
||||
builder: (idx) {
|
||||
if (idx != 0) return const SizedBox();
|
||||
return FloatingActionButton(
|
||||
heroTag: 'sshAddServer',
|
||||
onPressed: () => AppRoutes.serverEdit().go(context),
|
||||
@@ -57,49 +58,40 @@ class _SSHTabPageState extends State<SSHTabPage>
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildTabItem(String e) {
|
||||
if (e == l10n.add) {
|
||||
return Tab(child: Text(e));
|
||||
}
|
||||
return Tab(
|
||||
child: Row(
|
||||
children: [
|
||||
Text(e),
|
||||
UIs.width7,
|
||||
IconBtn(
|
||||
icon: Icons.close,
|
||||
onTap: () async {
|
||||
final confirm = await showDialog<bool>(
|
||||
context: context,
|
||||
builder: (context) {
|
||||
return AlertDialog(
|
||||
title: Text(l10n.attention),
|
||||
content: Text('${l10n.close} SSH ${l10n.conn}($e) ?'),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => context.pop(true),
|
||||
child: Text(l10n.ok, style: UIs.textRed),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () => context.pop(false),
|
||||
child: Text(l10n.cancel),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
Future.delayed(const Duration(milliseconds: 50),
|
||||
FocusScope.of(context).unfocus);
|
||||
if (confirm != true) {
|
||||
return;
|
||||
}
|
||||
_tabMap.remove(e);
|
||||
_refreshTabs();
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
void _onTapTab(int idx) async {
|
||||
await _toPage(idx);
|
||||
SSHPage.focusNode.unfocus();
|
||||
}
|
||||
|
||||
void _onTapClose(String name) async {
|
||||
SSHPage.focusNode.unfocus();
|
||||
|
||||
final confirm = await showDialog<bool>(
|
||||
context: context,
|
||||
builder: (context) {
|
||||
return AlertDialog(
|
||||
title: Text(l10n.attention),
|
||||
content: Text('${l10n.close} SSH ${l10n.conn}($name) ?'),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => context.pop(true),
|
||||
child: Text(l10n.ok, style: UIs.textRed),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () => context.pop(false),
|
||||
child: Text(l10n.cancel),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
Future.delayed(Durations.short1, FocusScope.of(context).unfocus);
|
||||
if (confirm != true) return;
|
||||
|
||||
_tabMap.remove(name);
|
||||
_tabRN.build();
|
||||
_pageCtrl.previousPage(
|
||||
duration: Durations.medium1, curve: Curves.fastEaseInToSlowEaseOut);
|
||||
}
|
||||
|
||||
Widget _buildAddPage() {
|
||||
@@ -134,44 +126,157 @@ class _SSHTabPageState extends State<SSHTabPage>
|
||||
}
|
||||
|
||||
Widget _buildBody() {
|
||||
return TabBarView(
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
controller: _tabController,
|
||||
children: _tabMap.values.map((e) => e.page).toList(),
|
||||
return ListenBuilder(
|
||||
listenable: _tabRN,
|
||||
builder: () {
|
||||
return PageView.builder(
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
controller: _pageCtrl,
|
||||
itemCount: _tabMap.length,
|
||||
itemBuilder: (_, idx) {
|
||||
final name = _tabMap.keys.elementAt(idx);
|
||||
return _tabMap[name]?.page ?? UIs.placeholder;
|
||||
},
|
||||
onPageChanged: (value) => _fabVN.value = value,
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
void _onTapInitCard(ServerPrivateInfo spi) {
|
||||
void _onTapInitCard(ServerPrivateInfo spi) async {
|
||||
final name = () {
|
||||
if (_tabMap.containsKey(spi.name)) {
|
||||
return '${spi.name}(${_tabMap.length + 1})';
|
||||
final reg = RegExp('${spi.name}\\((\\d+)\\)');
|
||||
final idxs = _tabMap.keys
|
||||
.map((e) => reg.firstMatch(e))
|
||||
.map((e) => e?.group(1))
|
||||
.where((e) => e != null);
|
||||
if (idxs.isEmpty) {
|
||||
return _tabMap.keys.contains(spi.name) ? '${spi.name}(1)' : spi.name;
|
||||
}
|
||||
final biggest = idxs.reduce((a, b) => a!.length > b!.length ? a : b);
|
||||
final biggestInt = int.tryParse(biggest ?? '0');
|
||||
if (biggestInt != null && biggestInt > 0) {
|
||||
return '${spi.name}(${biggestInt + 1})';
|
||||
}
|
||||
return spi.name;
|
||||
}();
|
||||
final key = GlobalKey<SSHPageState>();
|
||||
_tabMap[name] = (
|
||||
page: SSHPage(
|
||||
// Keep it, or the Flutter will works unexpectedly
|
||||
key: key,
|
||||
spi: spi,
|
||||
notFromTab: false,
|
||||
onSessionEnd: () {
|
||||
_tabMap.remove(name);
|
||||
_refreshTabs();
|
||||
},
|
||||
),
|
||||
key: key,
|
||||
);
|
||||
_refreshTabs();
|
||||
final idx = _tabMap.length - 1;
|
||||
_tabController.animateTo(idx);
|
||||
_fabRN.value = idx;
|
||||
_tabRN.build();
|
||||
// Wait for the page to be built
|
||||
await Future.delayed(Durations.short3);
|
||||
final idx = _tabMap.keys.toList().indexOf(name);
|
||||
await _toPage(idx);
|
||||
}
|
||||
|
||||
void _refreshTabs() {
|
||||
_tabController = TabController(
|
||||
length: _tabMap.length,
|
||||
vsync: this,
|
||||
);
|
||||
setState(() {});
|
||||
}
|
||||
Future<void> _toPage(int idx) => _pageCtrl.animateToPage(idx,
|
||||
duration: Durations.short3, curve: Curves.fastEaseInToSlowEaseOut);
|
||||
|
||||
@override
|
||||
bool get wantKeepAlive => true;
|
||||
}
|
||||
|
||||
final class _TabBar extends StatelessWidget implements PreferredSizeWidget {
|
||||
const _TabBar({
|
||||
required this.idxVN,
|
||||
required this.map,
|
||||
required this.onTap,
|
||||
required this.onClose,
|
||||
});
|
||||
|
||||
final ValueNotifier<int> idxVN;
|
||||
final _TabMap map;
|
||||
final void Function(int idx) onTap;
|
||||
final void Function(String name) onClose;
|
||||
|
||||
List<String> get names => map.keys.toList();
|
||||
|
||||
@override
|
||||
Size get preferredSize => const Size.fromHeight(48);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ListenBuilder(
|
||||
listenable: idxVN,
|
||||
builder: () {
|
||||
return ListView.separated(
|
||||
scrollDirection: Axis.horizontal,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 11, vertical: 5),
|
||||
itemCount: names.length,
|
||||
itemBuilder: (_, idx) => _buillItem(idx),
|
||||
separatorBuilder: (_, __) => Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 17),
|
||||
child: Container(
|
||||
color: const Color.fromARGB(61, 158, 158, 158),
|
||||
width: 3,
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buillItem(int idx) {
|
||||
final name = names[idx];
|
||||
final selected = idxVN.value == idx;
|
||||
final color = selected ? null : Colors.grey;
|
||||
|
||||
final Widget child;
|
||||
if (idx == 0) {
|
||||
child = Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 13),
|
||||
child: Icon(MingCute.add_circle_fill, size: 17, color: color),
|
||||
);
|
||||
} else {
|
||||
final text = Text(
|
||||
name,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(color: color),
|
||||
softWrap: false,
|
||||
textAlign: TextAlign.center,
|
||||
textWidthBasis: TextWidthBasis.parent,
|
||||
);
|
||||
child = AnimatedContainer(
|
||||
width: selected ? 90 : 50,
|
||||
duration: Durations.medium3,
|
||||
curve: Curves.fastEaseInToSlowEaseOut,
|
||||
child: switch (selected) {
|
||||
true => Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
SizedBox(width: 55, child: text),
|
||||
if (selected)
|
||||
FadeIn(
|
||||
child: IconBtn(
|
||||
icon: MingCute.close_circle_fill,
|
||||
color: color,
|
||||
onTap: () => onClose(name),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
false => Center(child: text),
|
||||
},
|
||||
).paddingOnly(left: 3, right: 3);
|
||||
}
|
||||
|
||||
return InkWell(
|
||||
borderRadius: BorderRadius.circular(13),
|
||||
onTap: () => onTap(idx),
|
||||
child: child,
|
||||
).paddingSymmetric(horizontal: 13);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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(),
|
||||
|
||||
@@ -471,7 +471,7 @@
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 923;
|
||||
CURRENT_PROJECT_VERSION = 948;
|
||||
DEVELOPMENT_TEAM = BA88US33G6;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "Server Box";
|
||||
@@ -481,7 +481,7 @@
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.15;
|
||||
MARKETING_VERSION = 1.0.923;
|
||||
MARKETING_VERSION = 1.0.948;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
||||
PRODUCT_NAME = "Server Box";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
@@ -608,7 +608,7 @@
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 923;
|
||||
CURRENT_PROJECT_VERSION = 948;
|
||||
DEVELOPMENT_TEAM = BA88US33G6;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "Server Box";
|
||||
@@ -618,7 +618,7 @@
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.15;
|
||||
MARKETING_VERSION = 1.0.923;
|
||||
MARKETING_VERSION = 1.0.948;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
||||
PRODUCT_NAME = "Server Box";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
@@ -638,7 +638,7 @@
|
||||
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application";
|
||||
CODE_SIGN_STYLE = Manual;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 923;
|
||||
CURRENT_PROJECT_VERSION = 948;
|
||||
DEVELOPMENT_TEAM = "";
|
||||
"DEVELOPMENT_TEAM[sdk=macosx*]" = BA88US33G6;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
@@ -649,7 +649,7 @@
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.15;
|
||||
MARKETING_VERSION = 1.0.923;
|
||||
MARKETING_VERSION = 1.0.948;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
||||
PRODUCT_NAME = "Server Box";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
|
||||
@@ -401,8 +401,8 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
path: "."
|
||||
ref: "v1.0.31"
|
||||
resolved-ref: f6322c5c2fad5230d1a882e79d52d1a0d246b8f4
|
||||
ref: "v1.0.39"
|
||||
resolved-ref: "49fc10b39e390f4ecc3ee4f16f0926460b77adac"
|
||||
url: "https://github.com/lppcg/fl_lib"
|
||||
source: git
|
||||
version: "0.0.1"
|
||||
|
||||
@@ -53,7 +53,7 @@ dependencies:
|
||||
fl_lib:
|
||||
git:
|
||||
url: https://github.com/lppcg/fl_lib
|
||||
ref: v1.0.31
|
||||
ref: v1.0.39
|
||||
|
||||
dependency_overrides:
|
||||
# dartssh2:
|
||||
|
||||
32
test/container_test.dart
Normal file
32
test/container_test.dart
Normal file
@@ -0,0 +1,32 @@
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:toolbox/data/model/container/ps.dart';
|
||||
|
||||
void main() {
|
||||
test('docker ps parse', () {
|
||||
const raw = '''
|
||||
CONTAINER ID STATUS NAMES IMAGE
|
||||
0e9e2ef860d2 Up 2 hours hbbs rustdesk/rustdesk-server:latest
|
||||
9a4df3ed340c Up 41 minutes hbbr rustdesk/rustdesk-server:latest
|
||||
fa1215b4be74 Up 12 hours firefly uusec/firefly:latest
|
||||
''';
|
||||
final lines = raw.split('\n');
|
||||
const ids = ['0e9e2ef860d2', '9a4df3ed340c', 'fa1215b4be74'];
|
||||
const names = ['hbbs', 'hbbr', 'firefly'];
|
||||
const images = [
|
||||
'rustdesk/rustdesk-server:latest',
|
||||
'rustdesk/rustdesk-server:latest',
|
||||
'uusec/firefly:latest'
|
||||
];
|
||||
const states = ['Up 2 hours', 'Up 41 minutes', 'Up 12 hours'];
|
||||
for (var idx = 1; idx < lines.length; idx++) {
|
||||
final raw = lines[idx];
|
||||
if (raw.isEmpty) continue;
|
||||
final ps = DockerPs.parse(raw);
|
||||
expect(ps.id, ids[idx - 1]);
|
||||
expect(ps.names, names[idx - 1]);
|
||||
expect(ps.image, images[idx - 1]);
|
||||
expect(ps.state, states[idx - 1]);
|
||||
expect(ps.running, true);
|
||||
}
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user