mirror of
https://github.com/lollipopkit/flutter_server_box.git
synced 2025-12-18 07:44:26 +01:00
opt.
This commit is contained in:
@@ -22,8 +22,8 @@ enum AppShellFuncType {
|
||||
case AppShellFuncType.status:
|
||||
return 'status';
|
||||
case AppShellFuncType.docker:
|
||||
/// `dockeR` -> avoid conflict with `docker` command
|
||||
/// 以防止循环递归
|
||||
// `dockeR` -> avoid conflict with `docker` command
|
||||
// 以防止循环递归
|
||||
return 'dockeR';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,13 +16,14 @@ import 'package:toolbox/locator.dart';
|
||||
|
||||
final _dockerNotFound = RegExp(r'command not found|Unknown command');
|
||||
final _versionReg = RegExp(r'(Version:)\s+([0-9]+\.[0-9]+\.[0-9]+)');
|
||||
final _editionReg = RegExp(r'(Client:)\s+(.+-.+)');
|
||||
// eg: `Docker Engine - Community`
|
||||
final _editionReg = RegExp(r'Docker Engine - [a-zA-Z]+');
|
||||
final _dockerPrefixReg = RegExp(r'(sudo )?docker ');
|
||||
|
||||
final _logger = Logger('DOCKER');
|
||||
|
||||
class DockerProvider extends BusyProvider {
|
||||
final dockerStore = locator<DockerStore>();
|
||||
final _dockerStore = locator<DockerStore>();
|
||||
|
||||
SSHClient? client;
|
||||
String? userName;
|
||||
@@ -36,8 +37,12 @@ class DockerProvider extends BusyProvider {
|
||||
String? runLog;
|
||||
bool isRequestingPwd = false;
|
||||
|
||||
void init(SSHClient client, String userName, PwdRequestFunc onPwdReq,
|
||||
String hostId) {
|
||||
void init(
|
||||
SSHClient client,
|
||||
String userName,
|
||||
PwdRequestFunc onPwdReq,
|
||||
String hostId,
|
||||
) {
|
||||
this.client = client;
|
||||
this.userName = userName;
|
||||
this.onPwdReq = onPwdReq;
|
||||
@@ -77,29 +82,22 @@ class DockerProvider extends BusyProvider {
|
||||
|
||||
// Parse docker version
|
||||
final verRaw = DockerCmdType.version.find(segments);
|
||||
try {
|
||||
version = _versionReg.firstMatch(verRaw)?.group(2);
|
||||
edition = _editionReg.firstMatch(verRaw)?.group(2);
|
||||
} catch (e) {
|
||||
error = DockerErr(
|
||||
type: DockerErrType.invalidVersion,
|
||||
message: '$verRaw\n\n$e',
|
||||
);
|
||||
rethrow;
|
||||
}
|
||||
version = _versionReg.firstMatch(verRaw)?.group(2);
|
||||
edition = _editionReg.firstMatch(verRaw)?.group(0);
|
||||
|
||||
// Parse docker ps
|
||||
final psRaw = DockerCmdType.ps.find(segments);
|
||||
try {
|
||||
final lines = psRaw.split('\n');
|
||||
lines.removeWhere((element) => element.isEmpty);
|
||||
lines.removeAt(0);
|
||||
if (lines.isNotEmpty) lines.removeAt(0);
|
||||
items = lines.map((e) => DockerPsItem.fromRawString(e)).toList();
|
||||
} catch (e) {
|
||||
error = DockerErr(
|
||||
type: DockerErrType.parsePsItem,
|
||||
message: '$psRaw\n\n$e',
|
||||
message: '$psRaw\n-\n$e',
|
||||
);
|
||||
_logger.warning('parse docker ps: $psRaw', e);
|
||||
rethrow;
|
||||
} finally {
|
||||
setBusyState(false);
|
||||
@@ -110,13 +108,14 @@ class DockerProvider extends BusyProvider {
|
||||
try {
|
||||
final imageLines = imageRaw.split('\n');
|
||||
imageLines.removeWhere((element) => element.isEmpty);
|
||||
imageLines.removeAt(0);
|
||||
if (imageLines.isNotEmpty) imageLines.removeAt(0);
|
||||
images = imageLines.map((e) => DockerImage.fromRawStr(e)).toList();
|
||||
} catch (e) {
|
||||
error = DockerErr(
|
||||
type: DockerErrType.parseImages,
|
||||
message: '$imageRaw\n\n$e',
|
||||
message: '$imageRaw\n-\n$e',
|
||||
);
|
||||
_logger.warning('parse docker images: $imageRaw', e);
|
||||
rethrow;
|
||||
} finally {
|
||||
setBusyState(false);
|
||||
@@ -139,8 +138,10 @@ class DockerProvider extends BusyProvider {
|
||||
} catch (e) {
|
||||
error = DockerErr(
|
||||
type: DockerErrType.parseStats,
|
||||
message: '$statsRaw\n\n$e',
|
||||
message: '$statsRaw\n-\n$e',
|
||||
);
|
||||
_logger.warning('parse docker stats: $statsRaw', e);
|
||||
rethrow;
|
||||
} finally {
|
||||
setBusyState(false);
|
||||
}
|
||||
@@ -205,7 +206,7 @@ class DockerProvider extends BusyProvider {
|
||||
|
||||
// judge whether to use DOCKER_HOST
|
||||
String _wrap(String cmd) {
|
||||
final dockerHost = dockerStore.getDockerHost(hostId!);
|
||||
final dockerHost = _dockerStore.getDockerHost(hostId!);
|
||||
if (dockerHost == null || dockerHost.isEmpty) {
|
||||
return cmd.withLangExport;
|
||||
}
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
class BuildData {
|
||||
static const String name = "ServerBox";
|
||||
static const int build = 417;
|
||||
static const int build = 422;
|
||||
static const String engine = "3.10.6";
|
||||
static const String buildAt = "2023-08-05 13:35:14.889342";
|
||||
static const int modifications = 3;
|
||||
static const String buildAt = "2023-08-05 17:05:26.027438";
|
||||
static const int modifications = 10;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import '../model/app/shell_func.dart';
|
||||
import 'build_data.dart';
|
||||
|
||||
const seperator = 'SrvBox';
|
||||
const seperator = 'SrvBoxSep';
|
||||
const serverBoxDir = r'$HOME/.config/server_box';
|
||||
const shellPath = '$serverBoxDir/mobile_app.sh';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user