mirror of
https://github.com/lollipopkit/flutter_server_box.git
synced 2025-12-17 15:24:35 +01:00
Merge branch 'dev'
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -57,7 +57,7 @@ test.dart
|
|||||||
|
|
||||||
# Linux release
|
# Linux release
|
||||||
linux.AppDir
|
linux.AppDir
|
||||||
ServerBox-x86_64.AppImage
|
**/*.AppImage
|
||||||
|
|
||||||
untranlated.json
|
untranlated.json
|
||||||
|
|
||||||
|
|||||||
@@ -690,7 +690,7 @@
|
|||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CLANG_ENABLE_MODULES = YES;
|
CLANG_ENABLE_MODULES = YES;
|
||||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||||
CURRENT_PROJECT_VERSION = 936;
|
CURRENT_PROJECT_VERSION = 943;
|
||||||
DEVELOPMENT_TEAM = BA88US33G6;
|
DEVELOPMENT_TEAM = BA88US33G6;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
|
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
|
||||||
@@ -700,7 +700,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.936;
|
MARKETING_VERSION = 1.0.943;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||||
@@ -826,7 +826,7 @@
|
|||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CLANG_ENABLE_MODULES = YES;
|
CLANG_ENABLE_MODULES = YES;
|
||||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||||
CURRENT_PROJECT_VERSION = 936;
|
CURRENT_PROJECT_VERSION = 943;
|
||||||
DEVELOPMENT_TEAM = BA88US33G6;
|
DEVELOPMENT_TEAM = BA88US33G6;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
|
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
|
||||||
@@ -836,7 +836,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.936;
|
MARKETING_VERSION = 1.0.943;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||||
@@ -854,7 +854,7 @@
|
|||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CLANG_ENABLE_MODULES = YES;
|
CLANG_ENABLE_MODULES = YES;
|
||||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||||
CURRENT_PROJECT_VERSION = 936;
|
CURRENT_PROJECT_VERSION = 943;
|
||||||
DEVELOPMENT_TEAM = BA88US33G6;
|
DEVELOPMENT_TEAM = BA88US33G6;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
|
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
|
||||||
@@ -864,7 +864,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.936;
|
MARKETING_VERSION = 1.0.943;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||||
@@ -885,7 +885,7 @@
|
|||||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 936;
|
CURRENT_PROJECT_VERSION = 943;
|
||||||
DEVELOPMENT_TEAM = BA88US33G6;
|
DEVELOPMENT_TEAM = BA88US33G6;
|
||||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||||
GENERATE_INFOPLIST_FILE = YES;
|
GENERATE_INFOPLIST_FILE = YES;
|
||||||
@@ -898,7 +898,7 @@
|
|||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
"@executable_path/../../Frameworks",
|
"@executable_path/../../Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.936;
|
MARKETING_VERSION = 1.0.943;
|
||||||
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
|
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
|
||||||
MTL_FAST_MATH = YES;
|
MTL_FAST_MATH = YES;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
|
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
|
||||||
@@ -924,7 +924,7 @@
|
|||||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 936;
|
CURRENT_PROJECT_VERSION = 943;
|
||||||
DEVELOPMENT_TEAM = BA88US33G6;
|
DEVELOPMENT_TEAM = BA88US33G6;
|
||||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||||
GENERATE_INFOPLIST_FILE = YES;
|
GENERATE_INFOPLIST_FILE = YES;
|
||||||
@@ -937,7 +937,7 @@
|
|||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
"@executable_path/../../Frameworks",
|
"@executable_path/../../Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.936;
|
MARKETING_VERSION = 1.0.943;
|
||||||
MTL_FAST_MATH = YES;
|
MTL_FAST_MATH = YES;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
|
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
@@ -960,7 +960,7 @@
|
|||||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 936;
|
CURRENT_PROJECT_VERSION = 943;
|
||||||
DEVELOPMENT_TEAM = BA88US33G6;
|
DEVELOPMENT_TEAM = BA88US33G6;
|
||||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||||
GENERATE_INFOPLIST_FILE = YES;
|
GENERATE_INFOPLIST_FILE = YES;
|
||||||
@@ -973,7 +973,7 @@
|
|||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
"@executable_path/../../Frameworks",
|
"@executable_path/../../Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.936;
|
MARKETING_VERSION = 1.0.943;
|
||||||
MTL_FAST_MATH = YES;
|
MTL_FAST_MATH = YES;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
|
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
@@ -996,7 +996,7 @@
|
|||||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 936;
|
CURRENT_PROJECT_VERSION = 943;
|
||||||
DEVELOPMENT_ASSET_PATHS = "";
|
DEVELOPMENT_ASSET_PATHS = "";
|
||||||
DEVELOPMENT_TEAM = BA88US33G6;
|
DEVELOPMENT_TEAM = BA88US33G6;
|
||||||
ENABLE_PREVIEWS = YES;
|
ENABLE_PREVIEWS = YES;
|
||||||
@@ -1008,7 +1008,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.936;
|
MARKETING_VERSION = 1.0.943;
|
||||||
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
|
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
|
||||||
MTL_FAST_MATH = YES;
|
MTL_FAST_MATH = YES;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
|
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
|
||||||
@@ -1037,7 +1037,7 @@
|
|||||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 936;
|
CURRENT_PROJECT_VERSION = 943;
|
||||||
DEVELOPMENT_ASSET_PATHS = "";
|
DEVELOPMENT_ASSET_PATHS = "";
|
||||||
DEVELOPMENT_TEAM = BA88US33G6;
|
DEVELOPMENT_TEAM = BA88US33G6;
|
||||||
ENABLE_PREVIEWS = YES;
|
ENABLE_PREVIEWS = YES;
|
||||||
@@ -1049,7 +1049,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.936;
|
MARKETING_VERSION = 1.0.943;
|
||||||
MTL_FAST_MATH = YES;
|
MTL_FAST_MATH = YES;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
|
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
|
||||||
PRODUCT_NAME = ServerBox;
|
PRODUCT_NAME = ServerBox;
|
||||||
@@ -1075,7 +1075,7 @@
|
|||||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 936;
|
CURRENT_PROJECT_VERSION = 943;
|
||||||
DEVELOPMENT_ASSET_PATHS = "";
|
DEVELOPMENT_ASSET_PATHS = "";
|
||||||
DEVELOPMENT_TEAM = BA88US33G6;
|
DEVELOPMENT_TEAM = BA88US33G6;
|
||||||
ENABLE_PREVIEWS = YES;
|
ENABLE_PREVIEWS = YES;
|
||||||
@@ -1087,7 +1087,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.936;
|
MARKETING_VERSION = 1.0.943;
|
||||||
MTL_FAST_MATH = YES;
|
MTL_FAST_MATH = YES;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
|
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd;
|
||||||
PRODUCT_NAME = ServerBox;
|
PRODUCT_NAME = ServerBox;
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ class MyApp extends StatelessWidget {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
_setup(context);
|
_setup(context);
|
||||||
return ListenableBuilder(
|
return ListenableBuilder(
|
||||||
listenable: RebuildNodes.app,
|
listenable: RNodes.app,
|
||||||
builder: (context, _) {
|
builder: (context, _) {
|
||||||
if (!Stores.setting.useSystemPrimaryColor.fetch()) {
|
if (!Stores.setting.useSystemPrimaryColor.fetch()) {
|
||||||
UIs.colorSeed = Color(Stores.setting.primaryColor.fetch());
|
UIs.colorSeed = Color(Stores.setting.primaryColor.fetch());
|
||||||
|
|||||||
@@ -170,7 +170,7 @@ class Backup {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Pros.reload();
|
Pros.reload();
|
||||||
RebuildNodes.app.rebuild();
|
RNodes.app.build();
|
||||||
|
|
||||||
_logger.info('Restore success');
|
_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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -143,7 +143,6 @@ final class DockerPs implements ContainerPs {
|
|||||||
@override
|
@override
|
||||||
bool get running {
|
bool get running {
|
||||||
if (state?.contains('Exited') == true) return false;
|
if (state?.contains('Exited') == true) return false;
|
||||||
if (state?.contains('Up') == true) return true;
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -162,9 +161,9 @@ final class DockerPs implements ContainerPs {
|
|||||||
final parts = raw.split(Miscs.multiBlankreg);
|
final parts = raw.split(Miscs.multiBlankreg);
|
||||||
return DockerPs(
|
return DockerPs(
|
||||||
id: parts[0],
|
id: parts[0],
|
||||||
names: parts[1],
|
state: parts[1],
|
||||||
image: parts[2],
|
names: parts[2],
|
||||||
state: parts[3].trim(),
|
image: parts[3].trim(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -276,9 +276,13 @@ enum ContainerCmdType {
|
|||||||
return switch (this) {
|
return switch (this) {
|
||||||
ContainerCmdType.version => '$prefix version $_jsonFmt',
|
ContainerCmdType.version => '$prefix version $_jsonFmt',
|
||||||
ContainerCmdType.ps => switch (type) {
|
ContainerCmdType.ps => switch (type) {
|
||||||
|
/// TODO: Rollback to json format when permformance recovers.
|
||||||
/// Use [_jsonFmt] in Docker will cause the operation to slow down.
|
/// Use [_jsonFmt] in Docker will cause the operation to slow down.
|
||||||
ContainerType.docker => '$prefix ps -a --format "table {{printf \\"'
|
ContainerType.docker => '$prefix ps -a --format "table {{printf \\"'
|
||||||
'%-15.15s ${"%-30.30s " * 3}\\" .ID .Names .Image .Status}}"',
|
'%-15.15s '
|
||||||
|
'%-30.30s '
|
||||||
|
'${"%-50.50s " * 2}\\"'
|
||||||
|
' .ID .Status .Names .Image}}"',
|
||||||
ContainerType.podman => '$prefix ps -a $_jsonFmt',
|
ContainerType.podman => '$prefix ps -a $_jsonFmt',
|
||||||
},
|
},
|
||||||
ContainerCmdType.stats =>
|
ContainerCmdType.stats =>
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
class BuildData {
|
class BuildData {
|
||||||
static const String name = "ServerBox";
|
static const String name = "ServerBox";
|
||||||
static const int build = 936;
|
static const int build = 943;
|
||||||
static const String engine = "3.22.1";
|
static const String engine = "3.22.1";
|
||||||
static const String buildAt = "2024-06-06 16:18:25";
|
static const String buildAt = "2024-06-08 19:28:01";
|
||||||
static const int modifications = 2;
|
static const int modifications = 7;
|
||||||
static const int script = 48;
|
static const int script = 48;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
import 'package:toolbox/data/model/app/github_id.dart';
|
|
||||||
|
|
||||||
abstract final class GithubIds {
|
abstract final class GithubIds {
|
||||||
// Thanks
|
// Thanks
|
||||||
// If you want to change your Github ID, please open an issue.
|
// If you want to change your Github ID, please open an issue.
|
||||||
@@ -75,3 +73,9 @@ abstract final class GithubIds {
|
|||||||
'Jasonzhu1207',
|
'Jasonzhu1207',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
typedef GhId = String;
|
||||||
|
|
||||||
|
extension GhIdX on GhId {
|
||||||
|
String get url => 'https://github.com/$this';
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import 'package:toolbox/data/model/app/rebuild.dart';
|
import 'package:fl_lib/fl_lib.dart';
|
||||||
|
|
||||||
abstract final class RebuildNodes {
|
abstract final class RNodes {
|
||||||
static final app = RebuildNode();
|
static final app = RNode();
|
||||||
|
static final dark = false.vn;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import 'package:toolbox/core/channel/home_widget.dart';
|
|||||||
import 'package:toolbox/core/extension/build.dart';
|
import 'package:toolbox/core/extension/build.dart';
|
||||||
import 'package:toolbox/core/extension/context/locale.dart';
|
import 'package:toolbox/core/extension/context/locale.dart';
|
||||||
import 'package:toolbox/core/route.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/model/app/tab.dart';
|
||||||
import 'package:toolbox/data/res/build_data.dart';
|
import 'package:toolbox/data/res/build_data.dart';
|
||||||
import 'package:toolbox/data/res/github_id.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/provider.dart';
|
||||||
import 'package:toolbox/data/res/store.dart';
|
import 'package:toolbox/data/res/store.dart';
|
||||||
import 'package:toolbox/data/res/url.dart';
|
import 'package:toolbox/data/res/url.dart';
|
||||||
|
import 'package:toolbox/view/page/ssh/page.dart';
|
||||||
import 'package:wakelock_plus/wakelock_plus.dart';
|
import 'package:wakelock_plus/wakelock_plus.dart';
|
||||||
|
|
||||||
part 'appbar.dart';
|
part 'appbar.dart';
|
||||||
@@ -151,6 +151,7 @@ class _HomePageState extends State<HomePage>
|
|||||||
physics: const NeverScrollableScrollPhysics(),
|
physics: const NeverScrollableScrollPhysics(),
|
||||||
itemBuilder: (_, index) => AppTab.values[index].page,
|
itemBuilder: (_, index) => AppTab.values[index].page,
|
||||||
onPageChanged: (value) {
|
onPageChanged: (value) {
|
||||||
|
SSHPage.focusNode.unfocus();
|
||||||
if (!_switchingPage) {
|
if (!_switchingPage) {
|
||||||
_selectIndex.value = value;
|
_selectIndex.value = value;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -305,7 +305,7 @@ class _SettingPageState extends State<SettingPage> {
|
|||||||
_setting.primaryColor.put(color.value);
|
_setting.primaryColor.put(color.value);
|
||||||
context.pop();
|
context.pop();
|
||||||
context.pop();
|
context.pop();
|
||||||
RebuildNodes.app.rebuild();
|
RNodes.app.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Widget _buildLaunchPage() {
|
// Widget _buildLaunchPage() {
|
||||||
@@ -393,7 +393,7 @@ class _SettingPageState extends State<SettingPage> {
|
|||||||
);
|
);
|
||||||
if (selected != null) {
|
if (selected != null) {
|
||||||
_setting.themeMode.put(selected);
|
_setting.themeMode.put(selected);
|
||||||
RebuildNodes.app.rebuild();
|
RNodes.app.build();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
trailing: ValBuilder(
|
trailing: ValBuilder(
|
||||||
@@ -442,7 +442,7 @@ class _SettingPageState extends State<SettingPage> {
|
|||||||
onPressed: () {
|
onPressed: () {
|
||||||
_setting.fontPath.delete();
|
_setting.fontPath.delete();
|
||||||
context.pop();
|
context.pop();
|
||||||
RebuildNodes.app.rebuild();
|
RNodes.app.build();
|
||||||
},
|
},
|
||||||
child: Text(l10n.clear),
|
child: Text(l10n.clear),
|
||||||
)
|
)
|
||||||
@@ -466,7 +466,7 @@ class _SettingPageState extends State<SettingPage> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
context.pop();
|
context.pop();
|
||||||
RebuildNodes.app.rebuild();
|
RNodes.app.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildTermFontSize() {
|
Widget _buildTermFontSize() {
|
||||||
@@ -536,7 +536,7 @@ class _SettingPageState extends State<SettingPage> {
|
|||||||
if (selected != null) {
|
if (selected != null) {
|
||||||
_setting.locale.put(selected.code);
|
_setting.locale.put(selected.code);
|
||||||
context.pop();
|
context.pop();
|
||||||
RebuildNodes.app.rebuild();
|
RNodes.app.build();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
trailing: ListenBuilder(
|
trailing: ListenBuilder(
|
||||||
@@ -609,7 +609,7 @@ class _SettingPageState extends State<SettingPage> {
|
|||||||
subtitle: Text(l10n.fullScreenTip, style: UIs.textGrey),
|
subtitle: Text(l10n.fullScreenTip, style: UIs.textGrey),
|
||||||
trailing: StoreSwitch(
|
trailing: StoreSwitch(
|
||||||
prop: _setting.fullScreen,
|
prop: _setting.fullScreen,
|
||||||
callback: (_) => RebuildNodes.app.rebuild(),
|
callback: (_) => RNodes.app.build(),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -820,7 +820,7 @@ class _SettingPageState extends State<SettingPage> {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_setting.textFactor.put(val);
|
_setting.textFactor.put(val);
|
||||||
RebuildNodes.app.rebuild();
|
RNodes.app.build();
|
||||||
context.pop();
|
context.pop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -41,13 +41,15 @@ class SSHPage extends StatefulWidget {
|
|||||||
this.terminalKey,
|
this.terminalKey,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
static final focusNode = FocusNode();
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<SSHPage> createState() => _SSHPageState();
|
State<SSHPage> createState() => SSHPageState();
|
||||||
}
|
}
|
||||||
|
|
||||||
const _horizonPadding = 7.0;
|
const _horizonPadding = 7.0;
|
||||||
|
|
||||||
class _SSHPageState extends State<SSHPage> with AutomaticKeepAliveClientMixin {
|
class SSHPageState extends State<SSHPage> with AutomaticKeepAliveClientMixin {
|
||||||
final _keyboard = VirtKeyProvider();
|
final _keyboard = VirtKeyProvider();
|
||||||
late final _terminal = Terminal(inputHandler: _keyboard);
|
late final _terminal = Terminal(inputHandler: _keyboard);
|
||||||
final TerminalController _terminalController = TerminalController();
|
final TerminalController _terminalController = TerminalController();
|
||||||
@@ -159,6 +161,7 @@ class _SSHPageState extends State<SSHPage> with AutomaticKeepAliveClientMixin {
|
|||||||
CustomAppBar.barHeight ?? _media.padding.top,
|
CustomAppBar.barHeight ?? _media.padding.top,
|
||||||
),
|
),
|
||||||
hideScrollBar: false,
|
hideScrollBar: false,
|
||||||
|
focusNode: SSHPage.focusNode,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import 'package:fl_lib/fl_lib.dart';
|
import 'package:fl_lib/fl_lib.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:icons_plus/icons_plus.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:toolbox/core/extension/context/locale.dart';
|
import 'package:toolbox/core/extension/context/locale.dart';
|
||||||
import 'package:toolbox/core/route.dart';
|
import 'package:toolbox/core/route.dart';
|
||||||
@@ -15,37 +16,37 @@ class SSHTabPage extends StatefulWidget {
|
|||||||
State<SSHTabPage> createState() => _SSHTabPageState();
|
State<SSHTabPage> createState() => _SSHTabPageState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
typedef _TabMap = Map<String, ({Widget page, GlobalKey<SSHPageState>? key})>;
|
||||||
|
|
||||||
class _SSHTabPageState extends State<SSHTabPage>
|
class _SSHTabPageState extends State<SSHTabPage>
|
||||||
with TickerProviderStateMixin, AutomaticKeepAliveClientMixin {
|
with TickerProviderStateMixin, AutomaticKeepAliveClientMixin {
|
||||||
late final _tabMap = <String, ({Widget page})>{
|
late final _TabMap _tabMap = {
|
||||||
l10n.add: (page: _buildAddPage()),
|
l10n.add: (page: _buildAddPage(), key: null),
|
||||||
};
|
};
|
||||||
late var _tabController = TabController(
|
final _pageCtrl = PageController();
|
||||||
length: _tabMap.length,
|
final _fabVN = 0.vn;
|
||||||
vsync: this,
|
final _tabRN = RNode();
|
||||||
);
|
|
||||||
final _fabRN = ValueNotifier(0);
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
super.build(context);
|
super.build(context);
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: TabBar(
|
appBar: PreferredSizeListenBuilder(
|
||||||
controller: _tabController,
|
listenable: _tabRN,
|
||||||
tabs: _tabMap.keys.map(_buildTabItem).toList(),
|
builder: () {
|
||||||
isScrollable: true,
|
return _TabBar(
|
||||||
tabAlignment: TabAlignment.start,
|
idxVN: _fabVN,
|
||||||
dividerColor: Colors.transparent,
|
map: _tabMap,
|
||||||
onTap: (value) {
|
onTap: _onTapTab,
|
||||||
_fabRN.value = value;
|
onClose: _onTapClose,
|
||||||
FocusScope.of(context).unfocus();
|
);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
body: _buildBody(),
|
body: _buildBody(),
|
||||||
floatingActionButton: ListenableBuilder(
|
floatingActionButton: ListenableBuilder(
|
||||||
listenable: _fabRN,
|
listenable: _fabVN,
|
||||||
builder: (_, __) {
|
builder: (_, __) {
|
||||||
if (_fabRN.value != 0) return const SizedBox();
|
if (_fabVN.value != 0) return const SizedBox();
|
||||||
return FloatingActionButton(
|
return FloatingActionButton(
|
||||||
heroTag: 'sshAddServer',
|
heroTag: 'sshAddServer',
|
||||||
onPressed: () => AppRoutes.serverEdit().go(context),
|
onPressed: () => AppRoutes.serverEdit().go(context),
|
||||||
@@ -57,24 +58,19 @@ class _SSHTabPageState extends State<SSHTabPage>
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildTabItem(String e) {
|
void _onTapTab(int idx) async {
|
||||||
if (e == l10n.add) {
|
await _toPage(idx);
|
||||||
return Tab(child: Text(e));
|
_fabVN.value = idx;
|
||||||
|
FocusScope.of(context).unfocus();
|
||||||
}
|
}
|
||||||
return Tab(
|
|
||||||
child: Row(
|
void _onTapClose(String name) async {
|
||||||
children: [
|
|
||||||
Text(e),
|
|
||||||
UIs.width7,
|
|
||||||
IconBtn(
|
|
||||||
icon: Icons.close,
|
|
||||||
onTap: () async {
|
|
||||||
final confirm = await showDialog<bool>(
|
final confirm = await showDialog<bool>(
|
||||||
context: context,
|
context: context,
|
||||||
builder: (context) {
|
builder: (context) {
|
||||||
return AlertDialog(
|
return AlertDialog(
|
||||||
title: Text(l10n.attention),
|
title: Text(l10n.attention),
|
||||||
content: Text('${l10n.close} SSH ${l10n.conn}($e) ?'),
|
content: Text('${l10n.close} SSH ${l10n.conn}($name) ?'),
|
||||||
actions: [
|
actions: [
|
||||||
TextButton(
|
TextButton(
|
||||||
onPressed: () => context.pop(true),
|
onPressed: () => context.pop(true),
|
||||||
@@ -88,18 +84,11 @@ class _SSHTabPageState extends State<SSHTabPage>
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
Future.delayed(const Duration(milliseconds: 50),
|
Future.delayed(Durations.short1, FocusScope.of(context).unfocus);
|
||||||
FocusScope.of(context).unfocus);
|
if (confirm != true) return;
|
||||||
if (confirm != true) {
|
|
||||||
return;
|
_tabMap.remove(name);
|
||||||
}
|
_tabRN.build();
|
||||||
_tabMap.remove(e);
|
|
||||||
_refreshTabs();
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildAddPage() {
|
Widget _buildAddPage() {
|
||||||
@@ -134,44 +123,155 @@ class _SSHTabPageState extends State<SSHTabPage>
|
|||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildBody() {
|
Widget _buildBody() {
|
||||||
return TabBarView(
|
return ListenBuilder(
|
||||||
|
listenable: _tabRN,
|
||||||
|
builder: () {
|
||||||
|
return PageView.builder(
|
||||||
physics: const NeverScrollableScrollPhysics(),
|
physics: const NeverScrollableScrollPhysics(),
|
||||||
controller: _tabController,
|
controller: _pageCtrl,
|
||||||
children: _tabMap.values.map((e) => e.page).toList(),
|
itemCount: _tabMap.length,
|
||||||
|
itemBuilder: (_, idx) {
|
||||||
|
final name = _tabMap.keys.elementAt(idx);
|
||||||
|
return _tabMap[name]?.page ?? UIs.placeholder;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
void _onTapInitCard(ServerPrivateInfo spi) {
|
void _onTapInitCard(ServerPrivateInfo spi) async {
|
||||||
final name = () {
|
final name = () {
|
||||||
if (_tabMap.containsKey(spi.name)) {
|
final reg = RegExp(r'\((\d+)\)');
|
||||||
return '${spi.name}(${_tabMap.length + 1})';
|
final idxs = _tabMap.keys
|
||||||
|
.map((e) => reg.firstMatch(e))
|
||||||
|
.map((e) => e?.group(1))
|
||||||
|
.where((e) => e != null);
|
||||||
|
if (idxs.isEmpty) return 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;
|
return spi.name;
|
||||||
}();
|
}();
|
||||||
|
final key = GlobalKey<SSHPageState>();
|
||||||
_tabMap[name] = (
|
_tabMap[name] = (
|
||||||
page: SSHPage(
|
page: SSHPage(
|
||||||
|
// Keep it, or the Flutter will works unexpectedly
|
||||||
|
key: key,
|
||||||
spi: spi,
|
spi: spi,
|
||||||
notFromTab: false,
|
notFromTab: false,
|
||||||
onSessionEnd: () {
|
onSessionEnd: () {
|
||||||
_tabMap.remove(name);
|
_tabMap.remove(name);
|
||||||
_refreshTabs();
|
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
key: key,
|
||||||
);
|
);
|
||||||
_refreshTabs();
|
_tabRN.build();
|
||||||
final idx = _tabMap.length - 1;
|
// Wait for the page to be built
|
||||||
_tabController.animateTo(idx);
|
await Future.delayed(Durations.short3);
|
||||||
_fabRN.value = idx;
|
final idx = _tabMap.keys.toList().indexOf(name);
|
||||||
|
await _toPage(idx);
|
||||||
|
_fabVN.value = idx;
|
||||||
}
|
}
|
||||||
|
|
||||||
void _refreshTabs() {
|
Future<void> _toPage(int idx) => _pageCtrl.animateToPage(idx,
|
||||||
_tabController = TabController(
|
duration: Durations.short3, curve: Curves.fastEaseInToSlowEaseOut);
|
||||||
length: _tabMap.length,
|
|
||||||
vsync: this,
|
|
||||||
);
|
|
||||||
setState(() {});
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
bool get wantKeepAlive => true;
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -471,7 +471,7 @@
|
|||||||
CODE_SIGN_IDENTITY = "Apple Development";
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
COMBINE_HIDPI_IMAGES = YES;
|
COMBINE_HIDPI_IMAGES = YES;
|
||||||
CURRENT_PROJECT_VERSION = 936;
|
CURRENT_PROJECT_VERSION = 943;
|
||||||
DEVELOPMENT_TEAM = BA88US33G6;
|
DEVELOPMENT_TEAM = BA88US33G6;
|
||||||
INFOPLIST_FILE = Runner/Info.plist;
|
INFOPLIST_FILE = Runner/Info.plist;
|
||||||
INFOPLIST_KEY_CFBundleDisplayName = "Server Box";
|
INFOPLIST_KEY_CFBundleDisplayName = "Server Box";
|
||||||
@@ -481,7 +481,7 @@
|
|||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MACOSX_DEPLOYMENT_TARGET = 10.15;
|
MACOSX_DEPLOYMENT_TARGET = 10.15;
|
||||||
MARKETING_VERSION = 1.0.936;
|
MARKETING_VERSION = 1.0.943;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
||||||
PRODUCT_NAME = "Server Box";
|
PRODUCT_NAME = "Server Box";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
@@ -608,7 +608,7 @@
|
|||||||
CODE_SIGN_IDENTITY = "Apple Development";
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
COMBINE_HIDPI_IMAGES = YES;
|
COMBINE_HIDPI_IMAGES = YES;
|
||||||
CURRENT_PROJECT_VERSION = 936;
|
CURRENT_PROJECT_VERSION = 943;
|
||||||
DEVELOPMENT_TEAM = BA88US33G6;
|
DEVELOPMENT_TEAM = BA88US33G6;
|
||||||
INFOPLIST_FILE = Runner/Info.plist;
|
INFOPLIST_FILE = Runner/Info.plist;
|
||||||
INFOPLIST_KEY_CFBundleDisplayName = "Server Box";
|
INFOPLIST_KEY_CFBundleDisplayName = "Server Box";
|
||||||
@@ -618,7 +618,7 @@
|
|||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MACOSX_DEPLOYMENT_TARGET = 10.15;
|
MACOSX_DEPLOYMENT_TARGET = 10.15;
|
||||||
MARKETING_VERSION = 1.0.936;
|
MARKETING_VERSION = 1.0.943;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
||||||
PRODUCT_NAME = "Server Box";
|
PRODUCT_NAME = "Server Box";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
@@ -638,7 +638,7 @@
|
|||||||
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application";
|
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application";
|
||||||
CODE_SIGN_STYLE = Manual;
|
CODE_SIGN_STYLE = Manual;
|
||||||
COMBINE_HIDPI_IMAGES = YES;
|
COMBINE_HIDPI_IMAGES = YES;
|
||||||
CURRENT_PROJECT_VERSION = 936;
|
CURRENT_PROJECT_VERSION = 943;
|
||||||
DEVELOPMENT_TEAM = "";
|
DEVELOPMENT_TEAM = "";
|
||||||
"DEVELOPMENT_TEAM[sdk=macosx*]" = BA88US33G6;
|
"DEVELOPMENT_TEAM[sdk=macosx*]" = BA88US33G6;
|
||||||
INFOPLIST_FILE = Runner/Info.plist;
|
INFOPLIST_FILE = Runner/Info.plist;
|
||||||
@@ -649,7 +649,7 @@
|
|||||||
"@executable_path/../Frameworks",
|
"@executable_path/../Frameworks",
|
||||||
);
|
);
|
||||||
MACOSX_DEPLOYMENT_TARGET = 10.15;
|
MACOSX_DEPLOYMENT_TARGET = 10.15;
|
||||||
MARKETING_VERSION = 1.0.936;
|
MARKETING_VERSION = 1.0.943;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
|
||||||
PRODUCT_NAME = "Server Box";
|
PRODUCT_NAME = "Server Box";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
|
|||||||
@@ -401,8 +401,8 @@ packages:
|
|||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
path: "."
|
path: "."
|
||||||
ref: "v1.0.33"
|
ref: "v1.0.39"
|
||||||
resolved-ref: "7c4fdde33ec7c9ee226bfe0fd0c148f2d3f3ca54"
|
resolved-ref: "49fc10b39e390f4ecc3ee4f16f0926460b77adac"
|
||||||
url: "https://github.com/lppcg/fl_lib"
|
url: "https://github.com/lppcg/fl_lib"
|
||||||
source: git
|
source: git
|
||||||
version: "0.0.1"
|
version: "0.0.1"
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ dependencies:
|
|||||||
fl_lib:
|
fl_lib:
|
||||||
git:
|
git:
|
||||||
url: https://github.com/lppcg/fl_lib
|
url: https://github.com/lppcg/fl_lib
|
||||||
ref: v1.0.33
|
ref: v1.0.39
|
||||||
|
|
||||||
dependency_overrides:
|
dependency_overrides:
|
||||||
# dartssh2:
|
# 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