opt.: check client before route pushed

This commit is contained in:
lollipopkit
2023-08-10 00:37:51 +08:00
parent c512a6a274
commit cf1c9643b9
8 changed files with 68 additions and 43 deletions

View File

@@ -133,7 +133,7 @@ class _PkgManagePageState extends State<PkgManagePage>
}
Widget _buildFAB(PkgProvider pkg) {
if (pkg.isBusy || (pkg.upgradeable?.isEmpty ?? true)) {
if (pkg.upgradeable?.isEmpty ?? true) {
return nil;
}
return FloatingActionButton(

View File

@@ -311,10 +311,18 @@ class _ServerPageState extends State<ServerPage>
onSelected: (ServerTabMenuType value) async {
switch (value) {
case ServerTabMenuType.pkg:
AppRoute(PkgManagePage(spi), 'pkg manage').go(context);
AppRoute(PkgManagePage(spi), 'pkg manage').checkClientAndGo(
context: context,
s: _s,
id: spi.id,
);
break;
case ServerTabMenuType.sftp:
AppRoute(SftpPage(spi), 'SFTP').go(context);
AppRoute(SftpPage(spi), 'SFTP').checkClientAndGo(
context: context,
s: _s,
id: spi.id,
);
break;
case ServerTabMenuType.snippet:
final provider = locator<SnippetProvider>();
@@ -349,10 +357,18 @@ class _ServerPageState extends State<ServerPage>
AppRoute(ServerEditPage(spi: spi), 'Edit server info').go(context);
break;
case ServerTabMenuType.docker:
AppRoute(DockerManagePage(spi), 'Docker manage').go(context);
AppRoute(DockerManagePage(spi), 'Docker manage').checkClientAndGo(
context: context,
s: _s,
id: spi.id,
);
break;
case ServerTabMenuType.process:
AppRoute(ProcessPage(spi: spi), 'process page').go(context);
AppRoute(ProcessPage(spi: spi), 'process page').checkClientAndGo(
context: context,
s: _s,
id: spi.id,
);
break;
}
},

View File

@@ -4,6 +4,7 @@ import 'dart:typed_data';
import 'package:dartssh2/dartssh2.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:logging/logging.dart';
import 'package:toolbox/core/extension/navigator.dart';
import 'package:toolbox/core/extension/sftpfile.dart';
import 'package:toolbox/data/res/misc.dart';
@@ -16,7 +17,6 @@ import '../../../core/extension/stringx.dart';
import '../../../core/route.dart';
import '../../../core/utils/misc.dart';
import '../../../core/utils/ui.dart';
import '../../../data/model/server/server.dart';
import '../../../data/model/server/server_private_info.dart';
import '../../../data/model/sftp/absolute_path.dart';
import '../../../data/model/sftp/browser_status.dart';
@@ -54,9 +54,10 @@ class _SftpPageState extends State<SftpPage> {
late S _s;
ServerState? _state;
SSHClient? _client;
final _logger = Logger('SFTP');
@override
void didChangeDependencies() {
super.didChangeDependencies();
@@ -68,7 +69,6 @@ class _SftpPageState extends State<SftpPage> {
super.initState();
final serverProvider = locator<ServerProvider>();
_client = serverProvider.servers[widget.spi.id]?.client;
_state = serverProvider.servers[widget.spi.id]?.state;
}
@override
@@ -270,10 +270,6 @@ class _SftpPageState extends State<SftpPage> {
}
Widget _buildFileView() {
if (_client == null || _state != ServerState.connected) {
return centerLoading;
}
if (_status.isBusy) {
return centerLoading;
}
@@ -665,8 +661,9 @@ class _SftpPageState extends State<SftpPage> {
_status.isBusy = false;
});
}
} catch (e) {
await showRoundDialog(
} catch (e, trace) {
_logger.warning('list dir failed', e, trace);
Future.delayed(const Duration(milliseconds: 177), () => showRoundDialog(
context: context,
title: Text(_s.error),
child: Text(e.toString()),
@@ -676,7 +673,7 @@ class _SftpPageState extends State<SftpPage> {
child: Text(_s.ok),
)
],
);
));
await _backward();
}
}