Fix running from .jar file and Windows support

airsquared · airsquared · commit 21a28b51a0d3 · 2018-06-13T17:05:56.000-07:00
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # blobsaver
-A GUI for saving SHSH blobs using tsschecker. Supports both Mac and <s>Windows</s>(not yet).
+A GUI for saving SHSH blobs using encounter's fork of tsschecker. Supports both Mac and Windows.
+
+If you have an antivirus, select "Always Allow" for anything related to tsschecker or Java. An antivirus may cause blobsaver to crash. If that happens please send feedback.
 
 # Features
 - Store up to three devices with presets
@@ -9,5 +11,6 @@ A GUI for saving SHSH blobs using tsschecker. Supports both Mac and <s>Windows</
 
 # TODO:
 - Show success/failure using alerts
-- Windows support
+- Menu bar
+- Check for updates and prompt if available
 - Choose where to save blobs
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: blobsaver.Main
+
diff --git a/src/blobsaver/Controller.java b/src/blobsaver/Controller.java
@@ -1,5 +1,6 @@
 package blobsaver;
 
+import com.sun.javafx.PlatformUtil;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -19,7 +20,7 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Properties;
+import java.util.prefs.Preferences;
 
 public class Controller {
 
@@ -137,7 +138,6 @@ public void initialize() {
         });
         goButton.setDefaultButton(true);
 
-
         errorBorder.setOffsetY(0f);
         errorBorder.setOffsetX(0f);
         errorBorder.setColor(Color.RED);
@@ -146,7 +146,48 @@ public void initialize() {
     }
 
     private void run(String device) {
-        ArrayList<String> args = new ArrayList<>(Arrays.asList(getClass().getResource("tsschecker").getPath(), "-d", device, "-s", "-e", ecidField.getText()));
+        File file;
+        try {
+            InputStream input;
+            if (PlatformUtil.isWindows()) {
+                input = getClass().getResourceAsStream("tsschecker.exe");
+                file = File.createTempFile("tsschecker", ".tmp.exe");
+            } else {
+                input = getClass().getResourceAsStream("tsschecker");
+                file = File.createTempFile("tsschecker", ".tmp");
+            }
+            OutputStream out = new FileOutputStream(file);
+            int read;
+            byte[] bytes = new byte[1024];
+
+            while ((read = input.read(bytes)) != -1) {
+                out.write(bytes, 0, read);
+            }
+            out.close();
+        } catch (IOException ex) {
+            ex.printStackTrace();
+            return;
+        }
+        file.deleteOnExit();
+
+        if (!file.setExecutable(true, false)) {
+            Alert alert = new Alert(Alert.AlertType.ERROR, "There was an error setting tsschecker as executable.\n\nPlease create a new issue on Github or PM me on Reddit.", githubIssue, redditPM, ButtonType.CANCEL);
+            alert.showAndWait();
+            try {
+                if (alert.getResult().equals(githubIssue) && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+                    Desktop.getDesktop().browse(new URI("https://github.com/airsquared/blobsaver/issues/new"));
+                } else if (alert.getResult().equals(redditPM) && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+                    Desktop.getDesktop().browse(new URI("https://www.reddit.com//message/compose?to=01110101_00101111&subject=Blobsaver+Bug+Report"));
+                }
+            } catch (IOException | URISyntaxException ee) {
+                ee.printStackTrace();
+            }
+            return;
+        }
+
+        ArrayList<String> args;
+        args = new ArrayList<>(Arrays.asList(file.getPath(), "-d", device, "-s", "-e", ecidField.getText()));
+
         if (boardConfig) {
             args.add("--boardconfig");
             args.add(boardConfigField.getText());
@@ -163,6 +204,7 @@ private void run(String device) {
         }
         Process proc = null;
         try {
+            System.out.println(args.toString());
             proc = new ProcessBuilder(args).start();
         } catch (IOException e) {
             Alert alert = new Alert(Alert.AlertType.ERROR, "There was an error starting tsschecker.\n\nPlease create a new issue on Github or PM me on Reddit. The crash log has been copied to your clipboard", githubIssue, redditPM, ButtonType.CANCEL);
@@ -182,10 +224,14 @@ private void run(String device) {
             e.printStackTrace();
         }
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(proc.getInputStream()))) {
-            String line = "";
+            StringBuilder log = new StringBuilder();
+            String line;
             while ((line = reader.readLine()) != null) {
                 System.out.print(line + "\n");
+                log.append(line).append("\n");
             }
+            Alert alert = new Alert(Alert.AlertType.INFORMATION, log.toString(), ButtonType.OK);
+            alert.showAndWait();
         } catch (IOException e) {
             Alert alert = new Alert(Alert.AlertType.ERROR, "There was an error getting the tsschecker log.\n\nPlease create a new issue on Github or PM me on Reddit. The crash log has been copied to your clipboard", githubIssue, redditPM, ButtonType.CANCEL);
             StringSelection stringSelection = new StringSelection(e.toString());
@@ -222,6 +268,12 @@ private void run(String device) {
                 ee.printStackTrace();
             }
         }
+
+        if (!file.delete()) {
+            Alert alert = new Alert(Alert.AlertType.ERROR, "There was an error deleting the temporary file.", githubIssue, redditPM, ButtonType.CANCEL);
+            alert.showAndWait();
+        }
+
     }
 
     public void apnonceCheckBoxHandler() {
@@ -288,63 +340,37 @@ public void identifierCheckBoxHandler() {
 
     @SuppressWarnings("unchecked")
     private void loadPreset(int preset) {
-        File file;
-        try {
-            file = new File(getClass().getResource("preset" + Integer.toString(preset) + ".properties").toURI());
-            if (file.exists()) {
-                Properties prop = new Properties();
-                try (InputStream input = new FileInputStream(file)) {
-                    prop.load(input);
-                    ecidField.setText(prop.getProperty("ecid"));
-                    if (prop.getProperty("deviceModel").equals("none")) {
-                        identifierCheckBox.fire();
-                        identifierField.setText(prop.getProperty("deviceIdentifier"));
-                    } else {
-                        deviceTypeChoiceBox.setValue(prop.getProperty("deviceType"));
-                        deviceModelChoiceBox.setValue(prop.getProperty("deviceModel"));
-                    }
-                    if (!prop.getProperty("boardConfig").equals("none")) {
-                        boardConfigField.setText(prop.getProperty("boardConfig"));
-                    }
-                } catch (IOException e) {
-                    Alert alert = new Alert(Alert.AlertType.ERROR, "There was an error loading the profile.\n\nPlease create a new issue on Github or PM me on Reddit. The crash log has been copied to your clipboard", githubIssue, redditPM, ButtonType.CANCEL);
-                    StringSelection stringSelection = new StringSelection(e.toString());
-                    Toolkit.getDefaultToolkit().getSystemClipboard().setContents(stringSelection, null);
-                    alert.showAndWait();
-                    try {
-                        if (alert.getResult().equals(githubIssue) && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
-                            Desktop.getDesktop().browse(new URI("https://github.com/airsquared/blobsaver/issues/new"));
-
-                        } else if (alert.getResult().equals(redditPM) && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
-                            Desktop.getDesktop().browse(new URI("https://www.reddit.com//message/compose?to=01110101_00101111&subject=Blobsaver+Bug+Report"));
-                        }
-                    } catch (IOException | URISyntaxException ee) {
-                        ee.printStackTrace();
-                    }
-                    e.printStackTrace();
-                }
-            }
-        } catch (URISyntaxException e) {
-            e.printStackTrace();
-        } catch (NullPointerException e) {
-            Alert alert = new Alert(Alert.AlertType.ERROR, "Preset " + preset + " does not have anything", ButtonType.OK);
-            alert.showAndWait();
+        Preferences prefs = Preferences.userRoot().node("airsquared/blobsaver/preset" + preset);
+        ecidField.setText(prefs.get("ECID", ""));
+        if (prefs.get("Device Model", "").equals("none")) {
+            identifierCheckBox.setSelected(true);
+            identifierCheckBoxHandler();
+            identifierField.setText(prefs.get("Device Identifier", ""));
+        } else {
+            identifierCheckBox.setSelected(false);
+            identifierCheckBoxHandler();
+            deviceTypeChoiceBox.setValue(prefs.get("Device Type", ""));
+            deviceModelChoiceBox.setValue(prefs.get("Device Model", ""));
         }
+        if (!prefs.get("Board Config", "").equals("none")) {
+            boardConfigField.setText(prefs.get("Board Config", ""));
+        }
+
     }
 
     public void presetButtonHandler(ActionEvent evt) {
         Button btn = (Button) evt.getTarget();
         String text = btn.getText();
         int preset = Integer.valueOf(text.substring(text.length() - 1));
         if (editingPresets) {
-            saveOptions(preset);
-            saveOptionsHandler();
+            savePreset(preset);
+            savePresetHandler();
         } else {
             loadPreset(preset);
         }
     }
 
-    private void saveOptions(int preset) {
+    private void savePreset(int preset) {
         boolean doReturn = false;
         if (ecidField.getText().equals("")) {
             ecidField.setEffect(errorBorder);
@@ -365,45 +391,25 @@ private void saveOptions(int preset) {
         if (doReturn) {
             return;
         }
-        Properties prop = new Properties();
-        File file = new File(getClass().getResource("").toString().substring(5), "preset" + Integer.toString(preset) + ".properties");
-        try (OutputStream output = new FileOutputStream(file)) {
-            prop.setProperty("ecid", ecidField.getText());
-            if (identifierCheckBox.isSelected()) {
-                prop.setProperty("deviceType", "none");
-                prop.setProperty("deviceModel", "none");
-                prop.setProperty("deviceIdentifier", identifierField.getText());
-            } else {
-                prop.setProperty("deviceType", (String) deviceTypeChoiceBox.getValue());
-                prop.setProperty("deviceModel", (String) deviceModelChoiceBox.getValue());
-            }
-            if (boardConfig) {
-                prop.setProperty("boardConfig", boardConfigField.getText());
-            } else {
-                prop.setProperty("boardConfig", "none");
-            }
-            prop.store(output, null);
-        } catch (IOException e) {
-            Alert alert = new Alert(Alert.AlertType.ERROR, "There was an error while saving the data.\n\nPlease create a new issue on Github or PM me on Reddit. The crash log has been copied to your clipboard", githubIssue, redditPM, ButtonType.CANCEL);
-            StringSelection stringSelection = new StringSelection(e.toString());
-            Toolkit.getDefaultToolkit().getSystemClipboard().setContents(stringSelection, null);
-            alert.showAndWait();
-            try {
-                if (alert.getResult().equals(githubIssue) && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
-                    Desktop.getDesktop().browse(new URI("https://github.com/airsquared/blobsaver/issues/new"));
-
-                } else if (alert.getResult().equals(redditPM) && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
-                    Desktop.getDesktop().browse(new URI("https://www.reddit.com//message/compose?to=01110101_00101111&subject=Blobsaver+Bug+Report"));
-                }
-            } catch (IOException | URISyntaxException ee) {
-                ee.printStackTrace();
-            }
-
-            e.printStackTrace();
+        Preferences prefs = Preferences.userRoot().node("airsquared/blobsaver/preset" + preset);
+        prefs.putBoolean("Exists", true);
+        prefs.put("ECID", ecidField.getText());
+        if (identifierCheckBox.isSelected()) {
+            prefs.put("Device Type", "none");
+            prefs.put("Device Model", "none");
+            prefs.put("Device Identifier", identifierField.getText());
+        } else {
+            prefs.put("Device Type", (String) deviceTypeChoiceBox.getValue());
+            prefs.put("Device Model", (String) deviceModelChoiceBox.getValue());
+        }
+        if (boardConfig) {
+            prefs.put("Board Config", boardConfigField.getText());
+        } else {
+            prefs.put("Board Config", "none");
         }
     }
 
-    public void saveOptionsHandler() {
+    public void savePresetHandler() {
         editingPresets = !editingPresets;
         if (editingPresets) {
             int depth = 40;
diff --git a/src/blobsaver/Main.java b/src/blobsaver/Main.java
@@ -1,5 +1,6 @@
 package blobsaver;
 
+import com.sun.javafx.PlatformUtil;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -16,7 +17,11 @@ public static void main(String[] args) {
     public void start(Stage primaryStage) throws Exception {
         Parent root = FXMLLoader.load(getClass().getResource("blobsaver.fxml"));
         primaryStage.setTitle("SHSH Blob Saver 1.0 beta");
-        primaryStage.setScene(new Scene(root, 500, 420));
+        if (PlatformUtil.isWindows()) {
+            primaryStage.setScene(new Scene(root, 520, 450));
+        } else {
+            primaryStage.setScene(new Scene(root, 500, 420));
+        }
         primaryStage.getScene().getStylesheets().add(getClass().getResource("app.css").toExternalForm());
         primaryStage.show();
         primaryStage.setResizable(false);
diff --git a/src/blobsaver/blobsaver.fxml b/src/blobsaver/blobsaver.fxml
@@ -104,7 +104,7 @@
                 <Insets left="10.0" right="5.0"/>
             </HBox.margin>
         </Button>
-        <Button mnemonicParsing="false" onAction="#saveOptionsHandler" text="Save as preset">
+        <Button mnemonicParsing="false" onAction="#savePresetHandler" text="Save as preset">
             <HBox.margin>
                 <Insets left="5.0" right="5.0"/>
             </HBox.margin>
diff --git a/src/blobsaver/tsschecker.exe b/src/blobsaver/tsschecker.exe

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Manifest-Version: 1.0`
	`2`	`+Main-Class: blobsaver.Main`
	`3`	`+`