#2 Stop run command when close the app window

Author: introfog

src/main/java/com/github/introfog/gitwave/controller/main/MainController.java

@@ -76,6 +76,7 @@ public void initialize(FxmlStageHolder fxmlStageHolder) {
         primaryStage.setOnCloseRequest(event -> {
             event.consume();
             if (DialogFactory.createCloseConfirmationAlert() == ButtonType.OK) {
+                AppConfig.getInstance().closeApp();
                 primaryStage.close();
             };
         });

src/main/java/com/github/introfog/gitwave/model/AppConfig.java

@@ -27,6 +27,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 import javafx.application.HostServices;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,6 +42,8 @@ public final class AppConfig {
     private final ConfigDto config;
     private HostServices hostServices;
 
+    private final AtomicBoolean appWasClosed = new AtomicBoolean(false);
+
 
     private AppConfig() {
         this.config = AppConfig.initConfig();
@@ -102,6 +105,14 @@ public void updateExistedCommand(CommandDto initial, CommandDto current) {
         saveConfig();
     }
 
+    public synchronized boolean appWasClosed() {
+        return appWasClosed.get();
+    }
+
+    public synchronized void closeApp() {
+        appWasClosed.set(true);
+    }
+
     private void saveConfig() {
         File configDir = new File(CONFIG_DIR_PATH);
         if (!configDir.exists() && !configDir.mkdirs()) {

src/main/java/com/github/introfog/gitwave/model/CommandExecutor.java

@@ -37,9 +37,16 @@ public static File searchGitRepositoriesAndCreateScriptFile(File directory, Stri
         LOGGER.info("Start searching git repositories in '{}' path.", directory.getAbsolutePath());
         List<File> repositoriesToRunCommand = new ArrayList<>();
         searchGitRepositories(directory, repositoriesToRunCommand);
+        if (AppConfig.getInstance().appWasClosed()) {
+            return null;
+        }
         LOGGER.info("'{}' git repositories were found to run command.", repositoriesToRunCommand.size());
         try {
-            return createAndFillScriptFileWithCommand(command, repositoriesToRunCommand);
+            final File scriptFile = createAndFillScriptFileWithCommand(command, repositoriesToRunCommand);
+            if (AppConfig.getInstance().appWasClosed()) {
+                removeScriptFile(scriptFile);
+            }
+            return scriptFile;
         } catch (IOException e) {
             LOGGER.error("Something goes wrong with creation temp script file with command.", e);
         }
@@ -48,20 +55,17 @@ public static File searchGitRepositoriesAndCreateScriptFile(File directory, Stri
     }
 
     public static void executeScriptFileWithCommand(File scriptFile) {
+        if (scriptFile == null || AppConfig.getInstance().appWasClosed()) {
+            return;
+        }
         try {
             LOGGER.info("Start executing script file '{}'.", scriptFile.getAbsolutePath());
             executeScriptFile(scriptFile);
             LOGGER.info("Finish executing git command.");
         } catch (IOException e) {
             LOGGER.error("Something goes wrong with executing temp script file with command.", e);
         } finally {
-            if (scriptFile != null && scriptFile.exists()) {
-                if (scriptFile.delete()) {
-                    LOGGER.info("Temp script file '{}' was removed.", scriptFile.getAbsolutePath());
-                } else {
-                    LOGGER.warn("Temp script file '{}' with command wasn't removed.", scriptFile.getAbsolutePath());
-                }
-            }
+            removeScriptFile(scriptFile);
         }
     }
 
@@ -107,6 +111,9 @@ private static File createAndFillScriptFileWithCommand(String gitCommand, List<F
         writer.write("#!/bin/bash\n");
         writer.write("echo -e \"\\033[0;32m\" \"" + gitCommand + "\" \"\\033[0m\"\n");
         for (File currentFolder : repositoriesToRunCommand) {
+            if (AppConfig.getInstance().appWasClosed()) {
+                break;
+            }
             writer.write("cd \"" + currentFolder.getAbsolutePath().replace("\\", "\\\\") + "\"\n");
             writer.write("echo -e \"\\033[0;36m\" $PWD \"\\033[0m\"\n");
 
@@ -118,6 +125,9 @@ private static File createAndFillScriptFileWithCommand(String gitCommand, List<F
     }
 
     private static void searchGitRepositories(File folder, List<File> repositoriesToRunCommand) {
+        if (AppConfig.getInstance().appWasClosed()) {
+            return;
+        }
         if (isGitRepository(folder)) {
             repositoriesToRunCommand.add(folder);
         } else {
@@ -136,6 +146,16 @@ private static void searchGitRepositories(File folder, List<File> repositoriesTo
         }
     }
 
+    private static void removeScriptFile(File scriptFile) {
+        if (scriptFile != null && scriptFile.exists()) {
+            if (scriptFile.delete()) {
+                LOGGER.info("Temp script file '{}' was removed.", scriptFile.getAbsolutePath());
+            } else {
+                LOGGER.warn("Temp script file '{}' with command wasn't removed.", scriptFile.getAbsolutePath());
+            }
+        }
+    }
+
     private static boolean isGitRepository(File folder) {
         File gitFolder = new File(folder, ".git");
         return gitFolder.exists() && gitFolder.isDirectory();