Button to force check for blobs, minor changes

airsquared · airsquared · commit bb73b334779b · 2018-08-10T18:24:13.000-07:00
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ If you have an antivirus or firewall, you may need to disable some other setting
 ![Windows Screenshot](https://i.imgur.com/zlPh4JY.png)
 
 ## Features
-- **Automatically saves blobs in the background**
+- **Automatically save blobs in the background**
 - Store up to ten devices with presets
 - Choose where to save blobs with file picker
 - Save blobs for beta versions
@@ -23,10 +23,12 @@ 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:
-- Change interval to hours, days, weeks
+- 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)
-- New UI (material design?)
+- Better notifications
 
 ## Built With
 - JDK 8
diff --git a/src/main/java/blobsaver/Background.java b/src/main/java/blobsaver/Background.java
@@ -65,7 +65,7 @@ class Background {
     private static ScheduledExecutorService executor;
     private static TrayIcon trayIcon;
 
-    static void startBackground() {
+    static void startBackground(boolean runOnlyOnce) {
         ArrayList<Integer> presetsToSave = new ArrayList<>();
         JSONArray presetsToSaveJson = new JSONArray(appPrefs.get("Presets to save in background", "[]"));
         for (int i = 0; i < presetsToSaveJson.length(); i++) {
@@ -78,95 +78,102 @@ static void startBackground() {
             inBackground = false;
             return;
         }
-        if (Platform.isFxApplicationThread()) {
+        if (!runOnlyOnce && Platform.isFxApplicationThread()) {
             Main.primaryStage.hide();
             Notification.Notifier.INSTANCE.setPopupLifetime(Duration.seconds(30));
             Notification.Notifier.INSTANCE.notifyInfo("Background process has started", "Check your system tray/status bar for\nthe icon."
                     + presetsToSaveNames.toString().substring(1, presetsToSaveNames.toString().length() - 1));
-        } else {
+        } else if (!runOnlyOnce) {
             Platform.runLater(() -> {
                 Main.primaryStage.hide();
                 Notification.Notifier.INSTANCE.setPopupLifetime(Duration.seconds(30));
                 Notification.Notifier.INSTANCE.notifyInfo("Background process has started", "Check your system tray/status bar for the icon.\n"
                         + presetsToSaveNames.toString().substring(1, presetsToSaveNames.toString().length() - 1));
             });
         }
+        if (!runOnlyOnce) {
+            inBackground = true;
+            executor = Executors.newScheduledThreadPool(1);
+            SystemTray tray = SystemTray.getSystemTray();
 
-        inBackground = true;
-        executor = Executors.newScheduledThreadPool(1);
-        SystemTray tray = SystemTray.getSystemTray();
-
-        Image image = null;
-        try {
-            image = ImageIO.read(Background.class.getResourceAsStream("blob_emoji.png"));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+            Image image = null;
+            try {
+                image = ImageIO.read(Background.class.getResourceAsStream("blob_emoji.png"));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
 
-        //noinspection ConstantConditions
-        trayIcon = new TrayIcon(image, "blobsaver " + Main.appVersion);
-        trayIcon.setImageAutoSize(true);
+            //noinspection ConstantConditions
+            trayIcon = new TrayIcon(image, "blobsaver " + Main.appVersion);
+            trayIcon.setImageAutoSize(true);
 
-        MenuItem openItem = new MenuItem("Open window");
-        openItem.addActionListener((evt) -> Platform.runLater(Background::showStage));
-        openItem.setFont(Font.decode(null).deriveFont(java.awt.Font.BOLD)); // bold it
+            MenuItem openItem = new MenuItem("Open window");
+            openItem.addActionListener((evt) -> Platform.runLater(Background::showStage));
+            openItem.setFont(Font.decode(null).deriveFont(java.awt.Font.BOLD)); // bold it
 
-        MenuItem exitItem = new MenuItem("Quit");
-        exitItem.addActionListener(event -> {
-            executor.shutdownNow();
-            Platform.runLater(Platform::exit);
-            tray.remove(trayIcon);
-            System.exit(0);
-        });
+            MenuItem exitItem = new MenuItem("Quit");
+            exitItem.addActionListener(event -> {
+                executor.shutdownNow();
+                Platform.runLater(Platform::exit);
+                tray.remove(trayIcon);
+                System.exit(0);
+            });
 
-        // setup the popup menu for the application.
-        final PopupMenu popup = new PopupMenu();
-        popup.add(openItem);
-        popup.addSeparator();
-        popup.add(exitItem);
-        trayIcon.setPopupMenu(popup);
+            // setup the popup menu for the application.
+            final PopupMenu popup = new PopupMenu();
+            popup.add(openItem);
+            popup.addSeparator();
+            popup.add(exitItem);
+            trayIcon.setPopupMenu(popup);
 
 
-        // add the application tray icon to the system tray.
-        try {
-            tray.add(trayIcon);
-        } catch (AWTException e) {
-            e.printStackTrace();
-        }
-        log("in tray");
-
-        TimeUnit timeUnit;
-        int timeAmount = appPrefs.getInt("Time to run", 1);
-        switch (appPrefs.get("Time unit for background", "Days")) {
-            case "Minutes":
-                timeUnit = TimeUnit.MINUTES;
-                break;
-            case "Hours":
-                timeUnit = TimeUnit.HOURS;
-                break;
-            case "Days":
-                timeUnit = TimeUnit.DAYS;
-                break;
-            case "Weeks":
-                timeUnit = TimeUnit.DAYS;
-                timeAmount = timeAmount * 7;
-                break;
-            default:
-                timeUnit = TimeUnit.DAYS;
-                break;
+            // add the application tray icon to the system tray.
+            try {
+                tray.add(trayIcon);
+                log("in tray");
+            } catch (AWTException e) {
+                e.printStackTrace();
+            }
         }
-        executor.scheduleAtFixedRate(() -> {
+        if (runOnlyOnce) {
             if (!presetsToSave.isEmpty()) {
                 log("there are some presets to save");
                 presetsToSave.forEach(Background::saveBackgroundBlobs);
             }
-            log("done w execution of executor");
-        }, 0, timeAmount, timeUnit);
-        executor.scheduleAtFixedRate(() -> checkForUpdates(false), 4, 4, TimeUnit.DAYS);
+            inBackground = false;
+        } else {
+            TimeUnit timeUnit;
+            int timeAmount = appPrefs.getInt("Time to run", 1);
+            switch (appPrefs.get("Time unit for background", "Days")) {
+                case "Minutes":
+                    timeUnit = TimeUnit.MINUTES;
+                    break;
+                case "Hours":
+                    timeUnit = TimeUnit.HOURS;
+                    break;
+                case "Days":
+                    timeUnit = TimeUnit.DAYS;
+                    break;
+                case "Weeks":
+                    timeUnit = TimeUnit.DAYS;
+                    timeAmount = timeAmount * 7;
+                    break;
+                default:
+                    timeUnit = TimeUnit.DAYS;
+                    break;
+            }
+            executor.scheduleAtFixedRate(() -> {
+                if (!presetsToSave.isEmpty()) {
+                    log("there are some presets to save");
+                    presetsToSave.forEach(Background::saveBackgroundBlobs);
+                }
+                log("done w execution of executor");
+            }, 0, timeAmount, timeUnit);
+            executor.scheduleAtFixedRate(() -> checkForUpdates(false), 4, 4, TimeUnit.DAYS);
+        }
     }
 
     private static void saveBackgroundBlobs(int preset) {
-
         log("attempting to save for " + preset);
         Preferences presetPrefs = Preferences.userRoot().node("airsquared/blobsaver/preset" + preset);
 //        presetPrefs.put("Saved Versions", "[]");                                                       // for testing
@@ -442,6 +449,6 @@ private static void deleteTempFiles(File tsschecker) {
 
     @SuppressWarnings("unused")
     private static void log(String msg) {
-//        System.out.println(msg);
+        System.out.println(msg);
     }
 }
diff --git a/src/main/java/blobsaver/Controller.java b/src/main/java/blobsaver/Controller.java
@@ -20,7 +20,6 @@
 
 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;
@@ -86,6 +85,7 @@ public class Controller {
 
     @FXML private Button startBackgroundButton;
     @FXML private Button chooseTimeToRunButton;
+    @FXML private Button forceCheckForBlobs;
     @FXML private Button backgroundSettingsButton;
     @FXML private Button savePresetButton;
     @FXML private Button preset1Button;
@@ -578,12 +578,18 @@ private void presetButtonHandler(ActionEvent evt) {
             }
             if (btn.getText().startsWith("Cancel ")) {
                 presetsToSaveFor.remove(Integer.toString(preset));
+                if (presetsToSaveFor.isEmpty()) {
+                    appPrefs.putBoolean("Background setup", false);
+                }
                 log("removed " + preset + " from list");
                 backgroundSettingsButton.fire();
             } else {
                 presetsToSaveFor.add(Integer.toString(preset));
+                appPrefs.putBoolean("Background setup", true);
                 log("added preset" + preset + " to list");
-                Notification.Notifier.INSTANCE.notifyInfo("Testing preset to make sure it works", "If it doesn't, please\nremove and fix the error.");
+                Alert alert = new Alert(Alert.AlertType.INFORMATION, "If it doesn't work, please remove it, fix the error, and add it back");
+                alert.setTitle("Testing preset " + preset);
+                alert.setHeaderText("Testing preset");
                 backgroundSettingsButton.fire();
                 btn.fire();
                 goButton.fire();
@@ -651,18 +657,20 @@ private void savePreset(int preset) {
     public void savePresetHandler() {
         editingPresets = !editingPresets;
         if (editingPresets) {
-            savePresetButton.setText("Cancel");
+            savePresetButton.setText("Back");
             presetVBox.setEffect(borderGlow);
             presetButtons.forEach((Button btn) -> btn.setText("Save in " + btn.getText().substring("Load ".length())));
             goButton.setDefaultButton(false);
             goButton.setDisable(true);
-            backgroundSettingsButton.setDisable(true);
+            backgroundSettingsButton.setVisible(false);
+            backgroundSettingsButton.setManaged(false);
             savePresetButton.setDefaultButton(true);
         } else {
             savePresetButton.setDefaultButton(false);
             goButton.setDefaultButton(true);
             goButton.setDisable(false);
-            backgroundSettingsButton.setDisable(false);
+            backgroundSettingsButton.setVisible(true);
+            backgroundSettingsButton.setManaged(true);
             presetVBox.setEffect(null);
             savePresetButton.setText("Save");
             presetButtons.forEach((Button btn) -> btn.setText("Load " + btn.getText().substring("Save in ".length())));
@@ -811,7 +819,7 @@ public void aboutMenuHandler() {
     public void backgroundSettingsHandler() {
         choosingRunInBackground = !choosingRunInBackground;
         if (choosingRunInBackground) {
-            backgroundSettingsButton.setText("Cancel");
+            backgroundSettingsButton.setText("Back");
             presetVBox.setEffect(borderGlow);
             presetButtons.forEach((btn) -> {
                 ArrayList<String> presetsToSaveFor = new ArrayList<>();
@@ -831,15 +839,24 @@ public void backgroundSettingsHandler() {
             goButton.setDefaultButton(false);
             goButton.setDisable(true);
             savePresetButton.setDisable(true);
+            savePresetButton.setVisible(false);
+            savePresetButton.setManaged(false);
             backgroundSettingsButton.setDefaultButton(true);
             chooseTimeToRunButton.setVisible(true);
+            forceCheckForBlobs.setVisible(true);
             startBackgroundButton.setVisible(true);
+            if (appPrefs.getBoolean("Background setup", false)) {
+                startBackgroundButton.setDisable(true);
+                forceCheckForBlobs.setDisable(true);
+            }
         } else {
             backgroundSettingsButton.setDefaultButton(false);
             goButton.setDefaultButton(true);
             goButton.setDisable(false);
             presetVBox.setEffect(null);
             savePresetButton.setDisable(false);
+            savePresetButton.setVisible(true);
+            savePresetButton.setManaged(true);
             backgroundSettingsButton.setText("Background settings");
             presetButtons.forEach((btn) -> {
                 if (btn.getText().startsWith("Cancel ")) {
@@ -849,6 +866,9 @@ public void backgroundSettingsHandler() {
                 }
             });
             chooseTimeToRunButton.setVisible(false);
+            forceCheckForBlobs.setDisable(false);
+            forceCheckForBlobs.setVisible(false);
+            startBackgroundButton.setDisable(false);
             startBackgroundButton.setVisible(false);
         }
     }
@@ -921,14 +941,18 @@ public void startBackgroundHandler() {
             alert.showAndWait();
             appPrefs.putBoolean("Show background startup message", false);
             appPrefs.putBoolean("Start background immediately", true);
-            Background.startBackground();
+            Background.startBackground(false);
         } else {
-            Background.startBackground();
+            Background.startBackground(false);
             startBackgroundButton.setText("Cancel Background");
         }
     }
 
-    public void resetApp() {
+    public void forceCheckForBlobsHandler() {
+        Background.startBackground(true);
+    }
+
+    public void resetAppHandler() {
         try {
             Alert confirmationAlert = new Alert(Alert.AlertType.CONFIRMATION, "Are you sure you would like to reset this application to defaults?", ButtonType.NO, ButtonType.YES);
             confirmationAlert.showAndWait();
@@ -954,7 +978,7 @@ private void log(String msg) {
         System.out.println(msg);
     }
 
-    public void go() {
+    public void goButtonHandler() {
         boolean doReturn = false;
         if (ecidField.getText().equals("")) {
             ecidField.setEffect(errorBorder);
diff --git a/src/main/java/blobsaver/Main.java b/src/main/java/blobsaver/Main.java
@@ -83,7 +83,7 @@ public void start(Stage primaryStage) throws IOException {
             Controller.afterStageShowing();
             Platform.setImplicitExit(false);
             if (appPrefs.getBoolean("Start background immediately", false)) {
-                Background.startBackground();
+                Background.startBackground(false);
             }
             primaryStage.setOnCloseRequest(event -> {
                 event.consume();
diff --git a/src/main/resources/blobsaver/blobsaver.fxml b/src/main/resources/blobsaver/blobsaver.fxml
@@ -28,7 +28,7 @@
                           text="Check for valid blobs..."/>
                 <MenuItem mnemonicParsing="false" onAction="#checkForUpdatesHandler"
                           text="Check for Updates..."/>
-                <MenuItem mnemonicParsing="false" onAction="#resetApp" text="Clear all data"/>
+                <MenuItem mnemonicParsing="false" onAction="#resetAppHandler" text="Clear all data"/>
             </Menu>
             <Menu mnemonicParsing="false" text="Help">
                 <MenuItem mnemonicParsing="false" onAction="#newGithubIssue"
@@ -209,7 +209,8 @@
                     AnchorPane.rightAnchor="0.0"/>
         </AnchorPane>
         <Region VBox.vgrow="ALWAYS"/>
-        <Button fx:id="goButton" maxWidth="Infinity" mnemonicParsing="false" onAction="#go" prefWidth="Infinity"
+        <Button fx:id="goButton" maxWidth="Infinity" mnemonicParsing="false" onAction="#goButtonHandler"
+                prefWidth="Infinity"
                 text="Go">
             <VBox.margin>
                 <Insets bottom="10.0" left="10.0" right="10.0"/>
@@ -282,6 +283,12 @@
             </VBox.margin>
         </Button>
         <Region VBox.vgrow="ALWAYS"/>
+        <Button fx:id="forceCheckForBlobs" maxWidth="Infinity" mnemonicParsing="false"
+                onAction="#forceCheckForBlobsHandler" prefWidth="Infinity" text="Force check" visible="false">
+            <VBox.margin>
+                <Insets bottom="10.0"/>
+            </VBox.margin>
+        </Button>
         <Button fx:id="chooseTimeToRunButton" maxWidth="Infinity" mnemonicParsing="false"
                 onAction="#chooseTimeToRunHandler" prefWidth="Infinity" text="Change frequency" visible="false">
             <VBox.margin>

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public void start(Stage primaryStage) throws IOException {`
`83`	`83`	`Controller.afterStageShowing();`
`84`	`84`	`Platform.setImplicitExit(false);`
`85`	`85`	`if (appPrefs.getBoolean("Start background immediately", false)) {`
`86`		`- Background.startBackground();`
	`86`	`+ Background.startBackground(false);`
`87`	`87`	`}`
`88`	`88`	`primaryStage.setOnCloseRequest(event -> {`
`89`	`89`	`event.consume();`