Allow only one instance of app, add debug log(#4)

Author: airsquared

.gitattributes

@@ -0,0 +1,5 @@
+# Declare files that will always have CRLF line endings on checkout.
+gpl-3.0.txt text eol=lf
+gpl-3.0_windows.txt text eol=crlf
+libraries_used.txt text eol=lf
+libraries_used_windows.txt text eol=crlf

.idea/modules/blobsaver_main.iml

@@ -23,8 +23,6 @@ If you have an antivirus or firewall, you may need to disable some other setting
 Please send feedback via [Github Issue](https://github.com/airsquared/blobsaver/issues/new/choose) or [Reddit PM](https://www.reddit.com//message/compose?to=01110101_00101111&subject=Blobsaver+Feedback) if you encounter any bugs/problems or have a feature request. 
 
 ## TODO:
-- Allow only one instance
-- Debug log/window
 - Use macOS menu bar
 - Auto-upload to Dropbox/Google Drive
 - Package into .app/.exe [maybe this](https://github.com/Jorl17/jar2app)
@@ -37,4 +35,3 @@ Please send feedback via [Github Issue](https://github.com/airsquared/blobsaver/
 
 ## License
 This project is licensed under GNU GPL v3.0-only - see the [LICENSE](https://github.com/airsquared/blobsaver/blob/master/LICENSE) file for details
-

.idea/modules/blobsaver_test.iml

@@ -9,12 +9,15 @@ sourceCompatibility = 1.8
 
 repositories {
     mavenCentral()
+    maven {
+        url "http://repo.spring.io/plugins-release/"
+    }
 }
 
 dependencies {
-    // https://mvnrepository.com/artifact/org.json/json
     compile group: 'org.json', name: 'json', version: '20180130'
     compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile group: 'it.sauronsoftware', name: 'junique', version: '1.0.4'
 }
 
 compileJava {

README.md

@@ -447,7 +447,6 @@ private static void deleteTempFiles(File tsschecker) {
         }
     }
 
-    @SuppressWarnings("unused")
     private static void log(String msg) {
         System.out.println(msg);
     }

build.gradle

@@ -20,6 +20,7 @@
 
 import com.sun.javafx.PlatformUtil;
 import com.sun.javafx.scene.control.skin.LabeledText;
+import eu.hansolo.enzo.notification.Notification;
 import javafx.application.Platform;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
@@ -374,7 +375,11 @@ private void run(String device) {
             deleteTempFiles(tsschecker, buildManifestPlist);
             return;
         }
-
+        try {
+            proc.waitFor();
+        } catch (InterruptedException e) {
+            newReportableError("The tsschecker process was interrupted.", e.toString());
+        }
         if (tsscheckerLog.contains("Saved shsh blobs")) {
             Alert alert = new Alert(Alert.AlertType.INFORMATION, "Successfully saved blobs in\n" + pathField.getText(), ButtonType.OK);
             alert.setHeaderText("Success!");
@@ -430,11 +435,6 @@ private void run(String device) {
         } else {
             newReportableError("Unknown result.\n\nIf this was done to test whether the preset works in the background, please cancel that preset, fix the error, and try again.", tsscheckerLog);
         }
-        try {
-            proc.waitFor();
-        } catch (InterruptedException e) {
-            newReportableError("The tsschecker process was interrupted.", e.toString());
-        }
 
         deleteTempFiles(tsschecker, buildManifestPlist);
     }
@@ -621,7 +621,7 @@ private void savePreset(int preset) {
         if (doReturn) {
             return;
         }
-        TextInputDialog textInputDialog = new TextInputDialog("Preset " + preset);
+        TextInputDialog textInputDialog = new TextInputDialog(appPrefs.get("Name Preset" + preset, "Preset " + preset));
         textInputDialog.setTitle("Name Preset " + preset);
         textInputDialog.setHeaderText("Name Preset");
         textInputDialog.setContentText("Please enter a name for the preset:");
@@ -949,7 +949,12 @@ public void startBackgroundHandler() {
     }
 
     public void forceCheckForBlobsHandler() {
-        Background.startBackground(true);
+        if (Background.inBackground) {
+            Background.stopBackground(false);
+            Background.startBackground(false);
+        } else {
+            Background.startBackground(true);
+        }
     }
 
     public void resetAppHandler() {
@@ -973,7 +978,18 @@ public void resetAppHandler() {
         }
     }
 
-    @SuppressWarnings("unused")
+    public void debugLogHandler() {
+        if (DebugWindow.isShowing()) {
+            DebugWindow.hide();
+        } else {
+            DebugWindow.show();
+        }
+    }
+
+    public void throwException() {
+        throw new EnumConstantNotPresentException(Notification.Notifier.class, "");
+    }
+
     private void log(String msg) {
         System.out.println(msg);
     }

src/main/java/blobsaver/Background.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2018  airsquared
+ *
+ * This file is part of blobsaver.
+ *
+ * blobsaver is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * blobsaver is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with blobsaver.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package blobsaver;
+
+import javafx.application.Platform;
+import javafx.scene.Scene;
+import javafx.scene.control.TextArea;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import javafx.stage.Stage;
+
+import java.io.OutputStream;
+import java.io.PrintStream;
+
+class DebugWindow {
+
+    private static final PrintStream sysOut = System.out;
+    private static Stage debugStage = new Stage();
+    private static PrintStream myPrintStream;
+
+    static {
+        VBox vBox = new VBox();
+        vBox.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
+        TextArea textArea = new TextArea();
+        VBox.setVgrow(textArea, Priority.ALWAYS);
+        textArea.setEditable(false);
+        textArea.setWrapText(true);
+        textArea.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
+        vBox.getChildren().add(textArea);
+        debugStage.setTitle("Debug Log");
+        debugStage.setScene(new Scene(vBox));
+        debugStage.setOnCloseRequest((event) -> {
+            hide();
+            event.consume();
+        });
+
+        myPrintStream = new PrintStream(new OutputStream() {
+            void appendText(String valueOf) {
+                if (Platform.isFxApplicationThread()) {
+                    textArea.appendText(valueOf);
+                } else {
+                    Platform.runLater(() -> textArea.appendText(valueOf));
+                }
+            }
+
+            @Override
+            public void write(int b) {
+                sysOut.write(b);
+                appendText(String.valueOf((char) b));
+            }
+        });
+    }
+
+    static void show() {
+        debugStage.show();
+        System.setOut(myPrintStream);
+        System.setErr(myPrintStream);
+    }
+
+    static void hide() {
+        debugStage.hide();
+        System.setOut(sysOut);
+        System.setErr(sysOut);
+    }
+
+    static boolean isShowing() {
+        return debugStage.isShowing();
+    }
+
+}

src/main/java/blobsaver/Controller.java

@@ -20,6 +20,8 @@
 
 import com.sun.javafx.PlatformUtil;
 import com.sun.javafx.application.PlatformImpl;
+import it.sauronsoftware.junique.AlreadyLockedException;
+import it.sauronsoftware.junique.JUnique;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
@@ -35,9 +37,16 @@ public class Main {
 
     static final String appVersion = "v2.1-beta";
     static final Preferences appPrefs = Preferences.userRoot().node("airsquared/blobsaver/prefs");
+    private static final String appID = "com.airsquared.blobsaver";
     static Stage primaryStage;
 
     public static void main(String[] args) {
+        try {
+            JUnique.acquireLock(appID);
+        } catch (AlreadyLockedException e) {
+            javax.swing.JOptionPane.showMessageDialog(null, "blobsaver already running, exiting");
+            System.exit(-1);
+        }
         try {
             Class.forName("javafx.application.Application");
             if (PlatformUtil.isMac() || PlatformUtil.isWindows() || PlatformUtil.isLinux()) {

src/main/java/blobsaver/DebugWindow.java

@@ -24,6 +24,10 @@
     <VBox maxHeight="Infinity" maxWidth="-Infinity" minHeight="580.0" prefWidth="500.0">
         <MenuBar>
             <Menu mnemonicParsing="false" text="Options">
+                <MenuItem mnemonicParsing="false" onAction="#debugLogHandler"
+                          text="Debug log"/>
+                <MenuItem mnemonicParsing="false" onAction="#throwException"
+                          text="Throw exception"/>
                 <MenuItem mnemonicParsing="false" onAction="#checkBlobs"
                           text="Check for valid blobs..."/>
                 <MenuItem mnemonicParsing="false" onAction="#checkForUpdatesHandler"