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

fix: server card height

Browse Source
This commit is contained in:
lollipopkit
2023-09-03 15:43:08 +08:00
parent b417cca906
commit ab09fa6614
11 changed files with 80 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
import 'package:logging/logging.dart';
import 'package:toolbox/core/extension/ssh_client.dart';
import 'package:toolbox/core/extension/stringx.dart';
import 'package:toolbox/core/utils/ui.dart';
import 'package:toolbox/data/model/app/shell_func.dart';
import 'package:toolbox/data/model/docker/image.dart';
import 'package:toolbox/data/model/docker/ps.dart';
@@ -147,15 +148,7 @@ class DockerProvider extends ChangeNotifier {
Future<void> _onPwd(String event, StreamSink<Uint8List> stdin) async {
if (isRequestingPwd) return;
isRequestingPwd = true;
if (event.contains('[sudo] password for ')) {
_logger.info('sudo password request for $userName');
final pwd = await onPwdReq!();
if (pwd.isEmpty) {
_logger.info('sudo password request cancelled');
return;
}
stdin.add('$pwd\n'.uint8List);
}
await onPwd(event, stdin, onPwdReq);
isRequestingPwd = false;
}

13
lib/data/provider/pkg.dart
View File

@@ -5,8 +5,8 @@ import 'package:dartssh2/dartssh2.dart';
import 'package:flutter/material.dart';
import 'package:logging/logging.dart';
import 'package:toolbox/core/extension/ssh_client.dart';
import 'package:toolbox/core/extension/stringx.dart';
import 'package:toolbox/core/extension/uint8list.dart';
import 'package:toolbox/core/utils/ui.dart';
import 'package:toolbox/data/model/pkg/manager.dart';
import 'package:toolbox/data/model/pkg/upgrade_info.dart';
import 'package:toolbox/data/model/server/dist.dart';
@@ -124,16 +124,7 @@ class PkgProvider extends ChangeNotifier {
Future<void> _onPwd(String event, StreamSink<Uint8List> stdin) async {
if (isRequestingPwd) return;
isRequestingPwd = true;
if (event.contains('[sudo] password for ')) {
final user = pwdRequestWithUserReg.firstMatch(event)?.group(1);
logger.info('sudo password request for $user');
final pwd = await onPasswordRequest!();
if (pwd.isEmpty) {
logger.info('sudo password request cancelled');
return;
}
stdin.add('$pwd\n'.uint8List);
}
await onPwd(event, stdin, onPasswordRequest);
isRequestingPwd = false;
}

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

@@ -2,8 +2,8 @@
class BuildData {
static const String name = "ServerBox";
static const int build = 520;
static const int build = 522;
static const String engine = "3.13.1";
static const String buildAt = "2023-08-30 19:21:56.317609";
static const String buildAt = "2023-09-01 12:58:00.909396";
static const int modifications = 2;
}

3
lib/data/res/misc.dart
View File

@@ -7,6 +7,9 @@ import '../model/app/github_id.dart';
/// RegExp for number
final numReg = RegExp(r'\s{1,}');
/// RegExp for password request
final pwdRequestWithUserReg = RegExp(r'\[sudo\] password for (.+):');
/// Private Key max allowed size is 20kb
const privateKeyMaxSize = 20 * 1024;