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.: ssh page sftp path checking (#763)

Browse Source
This commit is contained in:
lollipopkit🏳️‍⚧️
2025-05-15 21:01:10 +08:00
committed by GitHub
parent 2b2f1ddb60
commit d29bd1d806
2 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,8 +27,6 @@ part 'init.dart';
part 'keyboard.dart';
part 'virt_key.dart';
const _echoPWD = 'echo \$PWD';
final class SshPageArgs {
final Spi spi;
final String? initCmd;

56
lib/view/page/ssh/page/virt_key.dart
View File

@@ -69,22 +69,60 @@ extension _VirtKey on SSHPageState {
snippet.runInTerm(_terminal, widget.args.spi);
break;
case VirtualKeyFunc.file:
// get $PWD from SSH session
_terminal.textInput(_echoPWD);
// get $PWD from SSH session with unique markers
const marker = 'ServerBoxOutput';
const markerEnd = 'ServerBoxEnd';
const pwdCommand = 'echo "$marker:\$PWD:$markerEnd"';
_terminal.textInput(pwdCommand);
_terminal.keyInput(TerminalKey.enter);
final cmds = _terminal.buffer.lines.toList();
// wait for the command to finish
await Future.delayed(const Duration(milliseconds: 777));
// the line below `echo $PWD` is the current path
final idx = cmds.lastIndexWhere((e) => e.toString().contains(_echoPWD));
final initPath = cmds.elementAtOrNull(idx + 1)?.toString();
if (initPath == null || !initPath.startsWith('/')) {
// Wait for output with timeout
String? initPath;
await Future.delayed(const Duration(milliseconds: 700));
final startTime = DateTime.now();
final timeout = const Duration(seconds: 3);
while (initPath == null) {
// Check if we've exceeded timeout
if (DateTime.now().difference(startTime) > timeout) {
contextSafe?.showRoundDialog(
title: libL10n.error,
child: Text(libL10n.empty),
);
return;
}
// Search for marked output in terminal buffer
final cmds = _terminal.buffer.lines.toList();
for (final line in cmds.reversed) {
final lineStr = line.toString();
if (lineStr.contains(marker) && lineStr.contains(markerEnd)) {
// Extract path between markers
final start = lineStr.indexOf(marker) + marker.length + 1; // +1 for ':'
final end = lineStr.indexOf(markerEnd) - 1; // -1 for ':'
if (start < end) {
initPath = lineStr.substring(start, end);
if (initPath.isEmpty || initPath == '\$PWD') {
initPath = null;
} else {
break;
}
}
}
}
// Short wait before checking again
await Future.delayed(const Duration(milliseconds: 100));
}
if (!initPath.startsWith('/')) {
context.showRoundDialog(
title: libL10n.error,
child: Text('${l10n.remotePath}: $initPath'),
);
return;
}
final args = SftpPageArgs(spi: widget.args.spi, initPath: initPath);
SftpPage.route.go(context, args);
break;