fix for stopping all tasks on window close

juri117 · Jun 8, 2023 · 14fc1b4 · 14fc1b4
1 parent 915132a
commit 14fc1b4
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 12 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -9,6 +9,7 @@
 **bug-fixes:**
 * [x] fix bug in log list trim
 * [x] make logs selectable
+* [x] kill tasks on windows close did not work
 
 ## 0.00.004
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
 import 'package:multi_split_view/multi_split_view.dart';
 import 'package:task_launcher/log_view.dart';
 import 'package:task_launcher/models/task.dart';
+import 'package:window_manager/window_manager.dart';
 
 const String versionName = "0.00.005";
 
@@ -41,7 +42,7 @@ class MyHomePage extends StatefulWidget {
   State<MyHomePage> createState() => _MyHomePageState();
 }
 
-class _MyHomePageState extends State<MyHomePage> {
+class _MyHomePageState extends State<MyHomePage> with WindowListener {
   Timer? _timer;
   final MultiSplitViewController _splitViewController =
       MultiSplitViewController(areas: Area.weights([0.4, 0.6]));
@@ -54,12 +55,29 @@ class _MyHomePageState extends State<MyHomePage> {
   @override
   void initState() {
     super.initState();
+    windowManager.addListener(this);
     _loadJsonFile();
     startTimer();
   }
 
   @override
   void dispose() {
+    windowManager.removeListener(this);
+    super.dispose();
+  }
+
+  //@override
+  //void onWindowEvent(String eventName) {
+  //  print('[WindowManager] onWindowEvent: $eventName');
+  //}
+
+  @override
+  void onWindowClose() {
+    //print("win close");
+    cleanupOnCLose();
+  }
+
+  void cleanupOnCLose() {
     if (_timer != null) {
       _timer?.cancel();
       _timer = null;
@@ -71,7 +89,6 @@ class _MyHomePageState extends State<MyHomePage> {
         print("${task.name}: failed to kill");
       }
     }
-    super.dispose();
   }
 
   void startTimer() {
@@ -120,7 +137,7 @@ class _MyHomePageState extends State<MyHomePage> {
     _appendOutputToTask(task,
         "\n*${'=' * 40}*\n*running command: ${task.cmd} ${task.params.join(" ")}*\n*${'-' * 40}*\n",
         level: "D");
-    print("${task.name} start...");
+    //print("${task.name} start...");
     try {
       if (task.profile.isNotEmpty) {
         if (!tasks.profiles.containsKey(task.profile)) {
@@ -177,7 +194,7 @@ class _MyHomePageState extends State<MyHomePage> {
         print("${task.name} onError stderr error: $error, $stack");
         _appendOutputToTask(task, "error: $error", level: "E");
       }, cancelOnError: false);
-      print("${task.name} listener added");
+      // print("${task.name} listener added");
       final int? exitCode = await completer.future;
       print("${task.name} completed $exitCode");
       _appendOutputToTask(task, "*exit code: $exitCode*\n", level: "D");
@@ -200,7 +217,6 @@ class _MyHomePageState extends State<MyHomePage> {
           level: "E");
       _appendOutputToTask(task, "$e\n", level: "E");
     }
-    print('${task.name} finish...');
     task.finished();
     print('${task.name} finished');
   }
@@ -221,7 +237,7 @@ class _MyHomePageState extends State<MyHomePage> {
     }
   }
 
-  Future<void> _killTask(Task task) async {
+  void _killTask(Task task) {
     var pid = task.process?.pid;
     if (pid != null) {
       task.process?.kill(ProcessSignal.sigint);

diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
@@ -6,6 +6,14 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <screen_retriever/screen_retriever_plugin.h>
+#include <window_manager/window_manager_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) screen_retriever_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin");
+  screen_retriever_plugin_register_with_registrar(screen_retriever_registrar);
+  g_autoptr(FlPluginRegistrar) window_manager_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin");
+  window_manager_plugin_register_with_registrar(window_manager_registrar);
 }
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
@@ -3,6 +3,8 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  screen_retriever
+  window_manager
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

diff --git a/pubspec.lock b/pubspec.lock
@@ -13,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: c372bb384f273f0c2a8aaaa226dad84dc27c8519a691b888725dec59518ad53a
+      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.2"
   async:
     dependency: transitive
     description:
@@ -159,10 +159,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "6b0206b0bf4f04961fc5438198ccb3a885685cd67d4d4a32cc20ad7f8adbe015"
+      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   matcher:
     dependency: transitive
     description:
@@ -227,6 +227,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  screen_retriever:
+    dependency: transitive
+    description:
+      name: screen_retriever
+      sha256: "4931f226ca158123ccd765325e9fbf360bfed0af9b460a10f960f9bb13d58323"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -296,6 +304,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  window_manager:
+    dependency: "direct main"
+    description:
+      name: window_manager
+      sha256: "95096fede562cbb65f30d38b62d819a458f59ba9fe4a317f6cee669710f6676b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.4"
   xml:
     dependency: transitive
     description:
@@ -313,5 +329,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.0.0-417 <4.0.0"
-  flutter: ">=1.17.0"
+  dart: ">=3.0.0 <4.0.0"
+  flutter: ">=3.3.0"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -39,6 +39,7 @@ dependencies:
   intl: ^0.18.0
   multi_split_view: ^2.1.0
   rich_text_view: ^1.1.0
+  window_manager: ^0.3.4
 
 dev_dependencies:
   flutter_test:

diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
@@ -6,6 +6,12 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <screen_retriever/screen_retriever_plugin.h>
+#include <window_manager/window_manager_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  ScreenRetrieverPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
+  WindowManagerPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("WindowManagerPlugin"));
 }
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
@@ -3,6 +3,8 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  screen_retriever
+  window_manager
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST