fix(macos): prevent closed task windows from reopening (#1492)

This commit is contained in:
Levi authored and GitHub committed 2026-09-10 00:19:49 +08:00
1 parent 1f8906f952
commit b991482617
9 files changed
+847 -440

No files matched your search

@@ -1,5 +1,7 @@
import 'package:flutter/widgets.dart';
import 'package:go_router/go_router.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../features/tasks/application/task_list_navigation.dart';
import '../../features/extensions/presentation/pages/extensions_page.dart';
import '../../features/extensions/presentation/pages/extension_details_page.dart';
@@ -17,6 +19,13 @@ import 'shells/main_shell.dart';
class AppRouter {
static final GlobalKey<NavigatorState> rootNavigatorKey = GlobalKey<NavigatorState>();
static void showDownloadingTasks() {
final context = rootNavigatorKey.currentContext;
if (context == null || !context.mounted) return;
ProviderScope.containerOf(context, listen: false).read(taskListNavigationProvider.notifier).showDownloading();
GoRouter.of(context).go('/');
}
static GoRouter build(WebAuthController webAuthController) {
return GoRouter(
navigatorKey: rootNavigatorKey,
@@ -16,12 +16,18 @@ import '../window/app_window_appearance.dart';
import 'capability_rpc.dart';
import 'gopeed_capability.dart';
import 'storage_capability.dart';
import 'app_navigation_capability.dart';
import '../../app/router/app_router.dart';
class AppCapabilities {
AppCapabilities(CapabilityInvoker invoker) : gopeed = GopeedService(invoker), storage = AppStorageService(invoker);
AppCapabilities(CapabilityInvoker invoker)
: gopeed = GopeedService(invoker),
storage = AppStorageService(invoker),
navigation = AppNavigationService(invoker);
final GopeedService gopeed;
final AppStorageService storage;
final AppNavigationService navigation;
}
class LocalAppCapabilities {
@@ -29,6 +35,10 @@ class LocalAppCapabilities {
registry = CapabilityRegistry(codecs);
_bindGopeed(registry);
_bindStorage(registry);
registry.bind(NavigationMethods.showDownloadingTasks, (_) {
AppRouter.showDownloadingTasks();
return const RpcUnit();
});
capabilities = AppCapabilities(LocalCapabilityInvoker(registry));
}
@@ -0,0 +1,15 @@
import 'capability_rpc.dart';
abstract final class NavigationMethods {
static const showDownloadingTasks = RpcMethod<RpcUnit, RpcUnit>('navigation.tasks.downloading');
}
class AppNavigationService {
const AppNavigationService(this._invoker);
final CapabilityInvoker _invoker;
Future<void> showDownloadingTasks() async {
await _invoker.invoke(NavigationMethods.showDownloadingTasks, const RpcUnit());
}
}
@@ -19,6 +19,7 @@ import '../../../../shared/widgets/responsive_navigation_layout.dart';
import '../../../../l10n/l10n.dart';
import '../../../../util/util.dart';
import '../../../tasks/application/tasks_controller.dart';
import '../../../tasks/application/task_list_navigation.dart';
import '../../../tasks/application/pending_update_task.dart';
import '../../../tasks/application/task_batch_selection_controller.dart';
import '../../../tasks/domain/task_record.dart';
@@ -86,6 +87,11 @@ class _HomePageState extends ConsumerState<HomePage> {
Widget build(BuildContext context) {
final palette = AppPalette.of(context);
final tasksAsync = ref.watch(tasksControllerProvider);
ref.listen(taskListNavigationProvider, (_, _) {
_searchController.clear();
_setActiveFilter(_TaskFilter.downloading);
setState(() => _batchMode = false);
});
final tasksState = tasksAsync.value;
final tasks = tasksState?.tasks ?? const <TaskRecord>[];
final filteredTasks = _filteredTasks(tasks);
@@ -0,0 +1,11 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
final taskListNavigationProvider = NotifierProvider<TaskListNavigation, int>(TaskListNavigation.new);
// A request also resets an already-visible list's filter, search and selection.
class TaskListNavigation extends Notifier<int> {
@override
int build() => 0;
void showDownloading() => state++;
}
@@ -737,6 +737,19 @@ class _CreateTaskWindowPageState extends ConsumerState<CreateTaskWindowPage> {
await windowManager.close();
}
Future<void> _finishCreation() async {
if (widget.windowController != null) {
// Navigation is best-effort after a successful submission. A navigation
// failure must not leave a completed form available for resubmission.
try {
await ref.read(appCapabilitiesProvider).navigation.showDownloadingTasks();
} catch (error) {
debugPrint('Unable to select downloading tasks: $error');
}
}
await _closeWindow();
}
Future<void> _loadDefaults() async {
try {
final config = await ref.read(gopeedServiceProvider).getConfig();
@@ -863,7 +876,7 @@ class _CreateTaskWindowPageState extends ConsumerState<CreateTaskWindowPage> {
);
}),
);
await _closeWindow();
await _finishCreation();
return;
}
@@ -879,7 +892,7 @@ class _CreateTaskWindowPageState extends ConsumerState<CreateTaskWindowPage> {
}
return;
}
await _closeWindow();
await _finishCreation();
} catch (error) {
if (mounted) {
_showToast(error.toString());