aljaz/flutter_server_box
1
1
Fork 0
mirror of https://github.com/lollipopkit/flutter_server_box.git synced 2025-12-17 07:14:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

opt.

Browse Source
This commit is contained in:
lollipopkit
2023-05-26 17:01:52 +08:00
parent c1c009863d
commit 20ef9d4575
28 changed files with 126 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -30,7 +30,7 @@ Especially thanks to <a href="https://github.com/TerminalStudio/dartssh2">dartss
- [x] `Docker & Pkg` Manager
- [x] Status charts
- [x] `Ping` and etc.
- [x] i18n (English, Chinese)
- [x] i18n (English, 简体中文, Deutsch)
- Welcome contribution :), [How to contribute?](#l10n-guide)
- [x] Desktop support

2
README_zh.md
View File

@@ -30,7 +30,7 @@
- [x] `Docker & 包` 管理器
- [x] 状态图表
- [x] `Ping` 和 更多
- [x] 本地化 ( 英语, 中文 )
- [x] 本地化 ( English, 简体中文, Deutsch )
- 欢迎贡献 :)，[怎么贡献?](#l10n)
- [x] 桌面端支持

1
apk.sksl.json
View File

File diff suppressed because one or more lines are too long

12
ios/Runner.xcodeproj/project.pbxproj
View File

@@ -360,7 +360,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 314;
CURRENT_PROJECT_VERSION = 318;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -368,7 +368,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.314;
MARKETING_VERSION = 1.0.318;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -491,7 +491,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 314;
CURRENT_PROJECT_VERSION = 318;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -499,7 +499,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.314;
MARKETING_VERSION = 1.0.318;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -516,7 +516,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 314;
CURRENT_PROJECT_VERSION = 318;
DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -524,7 +524,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.314;
MARKETING_VERSION = 1.0.318;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

4
lib/core/extension/colorx.dart
View File

@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
const Set<MaterialState> interactiveStates = <MaterialState>{
const _interactiveStates = <MaterialState>{
MaterialState.pressed,
MaterialState.hovered,
MaterialState.focused,
@@ -18,7 +18,7 @@ extension ColorX on Color {
MaterialStateProperty<Color?> get materialStateColor {
return MaterialStateProperty.resolveWith((states) {
if (states.any(interactiveStates.contains)) {
if (states.any(_interactiveStates.contains)) {
return this;
}
return null;

8
lib/core/extension/ssh_client.dart
View File

@@ -11,8 +11,12 @@ typedef PwdRequestFunc = Future<String> Function();
final pwdRequestWithUserReg = RegExp(r'\[sudo\] password for (.+):');
extension SSHClientX on SSHClient {
Future<int?> exec(String cmd,
{OnStd? onStderr, OnStd? onStdout, OnStdin? stdin}) async {
Future<int?> exec(
String cmd, {
OnStd? onStderr,
OnStd? onStdout,
OnStdin? stdin,
}) async {
final session = await execute(cmd);
final stdoutDone = Completer<void>();

7
lib/core/extension/stringx.dart
View File

@@ -10,8 +10,11 @@ extension StringX on String {
return Uri.parse(this);
}
Widget omitStartStr(
{TextStyle? style, TextOverflow? overflow, int? maxLines}) {
Widget omitStartStr({
TextStyle? style,
TextOverflow? overflow,
int? maxLines,
}) {
return LayoutBuilder(builder: (context, size) {
bool exceeded = false;
int len = 0;

16
lib/data/model/app/backup.dart
View File

@@ -11,14 +11,14 @@ class Backup {
final List<PrivateKeyInfo> keys;
final Map<String, String> dockerHosts;
Backup(
this.version,
this.date,
this.spis,
this.snippets,
this.keys,
this.dockerHosts,
);
Backup({
required this.version,
required this.date,
required this.spis,
required this.snippets,
required this.keys,
required this.dockerHosts,
});
Backup.fromJson(Map<String, dynamic> json)
: version = json['version'] as int,

6
lib/data/res/error.dart → lib/data/model/app/error.dart
View File

@@ -4,6 +4,7 @@ enum ErrFrom {
docker,
sftp,
ssh,
status;
}
abstract class Err<T> {
@@ -25,4 +26,9 @@ enum DockerErrType {
class DockerErr extends Err<DockerErrType> {
DockerErr({required DockerErrType type, String? message})
: super(from: ErrFrom.docker, type: type, message: message);
@override
String toString() {
return 'DockerErr<$type>: $message';
}
}

0
lib/data/res/menu.dart → lib/data/model/app/menu.dart
View File

17
lib/data/model/app/path_with_prefix.dart
View File

@@ -1,16 +1,10 @@
class PathWithPrefix {
late String _prefixPath;
final String _prefixPath;
String _path = '/';
String? _prePath;
String get path => _prefixPath + _path;
PathWithPrefix(String prefixPath) {
if (prefixPath.endsWith('/')) {
_prefixPath = prefixPath.substring(0, prefixPath.length - 1);
} else {
_prefixPath = prefixPath;
}
}
PathWithPrefix(String prefixPath) : _prefixPath = _trimSuffix(prefixPath);
void update(String newPath) {
_prePath = _path;
@@ -36,3 +30,10 @@ class PathWithPrefix {
return true;
}
}
String _trimSuffix(String prefixPath) {
if (prefixPath.endsWith('/')) {
return prefixPath.substring(0, prefixPath.length - 1);
}
return prefixPath;
}

36
lib/data/model/server/conn_status.dart
View File

@@ -2,26 +2,17 @@ import '../../../core/extension/stringx.dart';
import '../../res/misc.dart';
class ConnStatus {
/*
{
"maxConn": 0,
"active": 1,
"passive": 2,
"fail": 3
}
*/
final int maxConn;
final int active;
final int passive;
final int fail;
late int maxConn;
late int active;
late int passive;
late int fail;
ConnStatus(
this.maxConn,
this.active,
this.passive,
this.fail,
);
ConnStatus({
required this.maxConn,
required this.active,
required this.passive,
required this.fail,
});
}
ConnStatus? parseConn(String raw) {
@@ -30,7 +21,12 @@ ConnStatus? parseConn(String raw) {
orElse: () => '');
if (idx != '') {
final vals = idx.split(numReg);
return ConnStatus(vals[5].i, vals[6].i, vals[7].i, vals[8].i);
return ConnStatus(
maxConn: vals[5].i,
active: vals[6].i,
passive: vals[7].i,
fail: vals[8].i,
);
}
return null;
}

40
lib/data/model/server/disk_info.dart
View File

@@ -1,21 +1,21 @@
import '../../res/misc.dart';
class DiskInfo {
late String path;
late String loc;
late int usedPercent;
late String used;
late String size;
late String avail;
final String path;
final String loc;
final int usedPercent;
final String used;
final String size;
final String avail;
DiskInfo(
this.path,
this.loc,
this.usedPercent,
this.used,
this.size,
this.avail,
);
DiskInfo({
required this.path,
required this.loc,
required this.usedPercent,
required this.used,
required this.size,
required this.avail,
});
}
List<DiskInfo> parseDisk(String raw) {
@@ -37,12 +37,12 @@ List<DiskInfo> parseDisk(String raw) {
pathCache = '';
}
list.add(DiskInfo(
vals[0],
vals[5],
int.parse(vals[4].replaceFirst('%', '')),
vals[2],
vals[1],
vals[3],
path: vals[0],
loc: vals[5],
usedPercent: int.parse(vals[4].replaceFirst('%', '')),
used: vals[2],
size: vals[1],
avail: vals[3],
));
}
return list;

8
lib/data/model/server/memory.dart
View File

@@ -1,8 +1,8 @@
class Memory {
int total;
int free;
int cache;
int avail;
final int total;
final int free;
final int cache;
final int avail;
Memory({
required this.total,

14
lib/data/model/server/private_key_info.dart
View File

@@ -1,5 +1,3 @@
import 'dart:convert';
import 'package:hive_flutter/hive_flutter.dart';
part 'private_key_info.g.dart';
@@ -31,15 +29,3 @@ class PrivateKeyInfo {
return data;
}
}
List<PrivateKeyInfo> getPrivateKeyInfoList(dynamic data) {
List<PrivateKeyInfo> ss = [];
if (data is String) {
data = json.decode(data);
}
for (var t in data) {
ss.add(PrivateKeyInfo.fromJson(t));
}
return ss;
}

14
lib/data/model/server/server_private_info.dart
View File

@@ -1,5 +1,3 @@
import 'dart:convert';
import 'package:hive_flutter/hive_flutter.dart';
part 'server_private_info.g.dart';
@@ -51,15 +49,3 @@ class ServerPrivateInfo {
return data;
}
}
List<ServerPrivateInfo> getServerInfoList(dynamic data) {
List<ServerPrivateInfo> ss = [];
if (data is String) {
data = json.decode(data);
}
for (var t in data) {
ss.add(ServerPrivateInfo.fromJson(t));
}
return ss;
}

14
lib/data/model/server/snippet.dart
View File

@@ -1,5 +1,3 @@
import 'dart:convert';
import 'package:hive_flutter/hive_flutter.dart';
part 'snippet.g.dart';
@@ -23,15 +21,3 @@ class Snippet {
return data;
}
}
List<Snippet> getSnippetList(dynamic data) {
List<Snippet> ss = [];
if (data is String) {
data = json.decode(data);
}
for (var t in data) {
ss.add(Snippet.fromJson(t));
}
return ss;
}

2
lib/data/model/ssh/virtual_key.dart
View File

@@ -9,7 +9,7 @@ class VirtualKey {
final VirtualKeyFunc? func;
VirtualKey(this.text,
{this.key, this.toggleable = false, this.icon, this.func});
{this.key, this.toggleable = false, this.icon, this.func,});
}
enum VirtualKeyFunc { toggleIME, backspace, copy, paste, snippet }

2
lib/data/provider/docker.dart
View File

@@ -9,7 +9,7 @@ import 'package:toolbox/core/extension/uint8list.dart';
import 'package:toolbox/core/provider_base.dart';
import 'package:toolbox/data/model/docker/image.dart';
import 'package:toolbox/data/model/docker/ps.dart';
import 'package:toolbox/data/res/error.dart';
import 'package:toolbox/data/model/app/error.dart';
import 'package:toolbox/data/store/docker.dart';
import 'package:toolbox/locator.dart';

8
lib/data/res/build_data.dart
View File

@@ -2,8 +2,8 @@
class BuildData {
static const String name = "ServerBox";
static const int build = 314;
static const String engine = "3.10.0";
static const String buildAt = "2023-05-18 22:09:44.404990";
static const int modifications = 2;
static const int build = 318;
static const String engine = "3.10.2";
static const String buildAt = "2023-05-26 13:49:02.698178";
static const int modifications = 6;
}

13
lib/data/res/status.dart
View File

@@ -47,8 +47,17 @@ ServerStatus get initStatus => ServerStatus(
mem: _initMemory,
sysVer: 'Loading...',
uptime: '',
disk: [DiskInfo('/', '/', 0, '0', '0', '0')],
tcp: ConnStatus(0, 0, 0, 0),
disk: [
DiskInfo(
path: '/',
loc: '/',
usedPercent: 0,
used: '0',
size: '0',
avail: '0',
)
],
tcp: ConnStatus(maxConn: 0, active: 0, passive: 0, fail: 0),
netSpeed: initNetSpeed,
swap: _initSwap,
temps: Temperatures(),

12
lib/view/page/backup.dart
View File

@@ -84,12 +84,12 @@ class BackupPage extends StatelessWidget {
final result = _diyEncrtpt(
json.encode(
Backup(
backupFormatVersion,
DateTime.now().toString().split('.').first,
_server.fetch(),
_snippet.fetch(),
_privateKey.fetch(),
_dockerHosts.fetch(),
version: backupFormatVersion,
date: DateTime.now().toString().split('.').first,
spis: _server.fetch(),
snippets: _snippet.fetch(),
keys: _privateKey.fetch(),
dockerHosts: _dockerHosts.fetch(),
),
),
);

4
lib/view/page/docker.dart
View File

@@ -10,8 +10,8 @@ import '../../data/model/docker/ps.dart';
import '../../data/model/server/server_private_info.dart';
import '../../data/provider/docker.dart';
import '../../data/provider/server.dart';
import '../../data/res/error.dart';
import '../../data/res/menu.dart';
import '../../data/model/app/error.dart';
import '../../data/model/app/menu.dart';
import '../../data/res/ui.dart';
import '../../data/res/url.dart';
import '../../data/store/docker.dart';

2
lib/view/page/server/detail.dart
View File

@@ -389,7 +389,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Icon(Icons.device_hub, size: 17),
Icon(Icons.arrow_downward, size: 17),
Icon(Icons.ac_unit, size: 17),
],
),
const Padding(

2
lib/view/page/server/tab.dart
View File

@@ -14,7 +14,7 @@ import '../../../data/model/server/server_private_info.dart';
import '../../../data/model/server/server_status.dart';
import '../../../data/provider/server.dart';
import '../../../data/res/color.dart';
import '../../../data/res/menu.dart';
import '../../../data/model/app/menu.dart';
import '../../../data/res/ui.dart';
import '../../../data/res/url.dart';
import '../../../data/store/setting.dart';

12
lib/view/page/ssh.dart
View File

@@ -263,12 +263,12 @@ class _SSHPageState extends State<SSHPage> {
}
final selected = terminalSelected;
final children = <Widget>[
TextButton(
onPressed: () {
_paste();
},
child: Text(_s.paste),
),
// TextButton(
// onPressed: () {
// _paste();
// },
// child: Text(_s.paste),
// ),
];
if (selected?.trim().isNotEmpty ?? false) {
children.add(

5
lib/view/widget/two_line_text.dart
View File

@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:toolbox/data/res/ui.dart';
class TwoLineText extends StatelessWidget {
const TwoLineText({Key? key, required this.up, required this.down})
@@ -12,11 +13,11 @@ class TwoLineText extends StatelessWidget {
children: [
Text(
up,
style: const TextStyle(fontSize: 15),
style: textSize15,
),
Text(
down,
style: const TextStyle(fontSize: 11),
style: textSize11,
)
],
);

12
macos/Runner.xcodeproj/project.pbxproj
View File

@@ -475,9 +475,9 @@
baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CURRENT_PROJECT_VERSION = 314;
CURRENT_PROJECT_VERSION = 318;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0.314;
MARKETING_VERSION = 1.0.318;
PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
@@ -490,9 +490,9 @@
baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CURRENT_PROJECT_VERSION = 314;
CURRENT_PROJECT_VERSION = 318;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0.314;
MARKETING_VERSION = 1.0.318;
PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
@@ -505,9 +505,9 @@
baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CURRENT_PROJECT_VERSION = 314;
CURRENT_PROJECT_VERSION = 318;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0.314;
MARKETING_VERSION = 1.0.318;
PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;