CLI fixes

Author: airsquared

src/main/java/airsquared/blobsaver/app/Analytics.java

@@ -86,7 +86,7 @@ private static String getBaseUrl() {
     }
 
     private static String getUUID() {
-        if (System.getenv("GITHUB_ACTIONS").equals("true")) {
+        if (System.getenv().containsKey("GITHUB_ACTIONS")) {
             return "GITHUB_ACTIONS";
         }
         if (Prefs.getAnalyticsUUID() == null) {

src/main/java/airsquared/blobsaver/app/CLI.java

@@ -28,13 +28,15 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.HashSet;
+import java.util.Scanner;
 import java.util.concurrent.Callable;
 import java.util.prefs.InvalidPreferencesFormatException;
 import java.util.stream.Collectors;
 
-@Command(name = "blobsaver", version = {CLI.warning, Main.appVersion}, header = CLI.warning,
+@Command(name = "blobsaver", versionProvider = CLI.VersionProvider.class, header = CLI.warning,
         optionListHeading = "  You can separate options and their parameters with either a space or '='.%n",
-        mixinStandardHelpOptions = true, sortOptions = false, sortSynopsis = false, usageHelpAutoWidth = true, abbreviateSynopsis = true)
+        mixinStandardHelpOptions = true, sortOptions = false, usageHelpAutoWidth = true, sortSynopsis = false,
+        abbreviateSynopsis = true, synopsisSubcommandLabel = "")
 public class CLI implements Callable<Void> {
 
     public static final String warning = "Warning: blobsaver's CLI is in alpha. Commands, options, and exit codes may change at any time.%n";
@@ -55,7 +57,7 @@ public class CLI implements Callable<Void> {
     Prefs.SavedDevice disableBackground;
 
     @ArgGroup
-    BackgroundControls backgroundControls;
+    BackgroundControls backgroundControls = new BackgroundControls();
     static class BackgroundControls {
         @Option(names = "--start-background-service", description = "Register background saving service with the OS.")
         boolean startBackground;
@@ -155,12 +157,52 @@ public Void call() throws TSS.TSSException, IOException, InvalidPreferencesForma
             Background.saveAllBackgroundBlobs();
         }
         if (exportPath != null) {
+            if (!exportPath.isFile() && !exportPath.getName().endsWith(".xml") && !exportPath.toString().startsWith("/dev")) {
+                exportPath.mkdirs();
+                exportPath = new File(exportPath, "blobsaver.xml");
+            }
             Prefs.export(exportPath);
             System.out.println("Successfully exported saved devices.");
         }
         return null;
     }
 
+    @SuppressWarnings("unused")
+    @Command(name = "clear-app-data", description = "Remove all of blobsaver's data including saved devices.")
+    void clearAppData() {
+        System.out.print("Are you sure you would like to permanently clear all blobsaver data? ");
+        var answer = new Scanner(System.in).nextLine();
+        if (answer.toLowerCase().matches("y|ye|yes")) {
+            Utils.clearAppData();
+            System.out.println("The application data has been removed.");
+        }
+    }
+
+    @SuppressWarnings("unused")
+    @Command(name = "donate", description = "https://www.paypal.me/airsqrd")
+    void donate() {
+        System.out.println("You can donate at https://www.paypal.me/airsqrd or with GitHub Sponsors at https://github.com/sponsors/airsquared.");
+    }
+
+    public static class VersionProvider implements IVersionProvider {
+        @Override
+        public String[] getVersion() {
+            String[] output = {CLI.warning, "blobsaver " + Main.appVersion, Main.copyright, null};
+            try {
+                var newVersion = Utils.LatestVersion.request();
+                if (Main.appVersion.equals(newVersion.toString())) {
+                    output[3] = "You are on the latest version.";
+                } else {
+                    output[3] = "New Update Available: " + newVersion + ". Update at%n https://github.com/airsquared/blobsaver/releases";
+                }
+            } catch (Exception e) {
+                output[3] = "Unable to check for updates.";
+            }
+
+            return output;
+        }
+    }
+
     private void checkArgs(String... names) {
         var missing = new HashSet<ArgSpec>();
         for (String name : names) {

src/main/java/airsquared/blobsaver/app/Controller.java

@@ -357,7 +357,7 @@ public void aboutMenuHandler(Event ignored) {
 
         alert.setTitle("About");
         alert.setHeaderText("blobsaver " + Main.appVersion);
-        alert.setContentText("blobsaver Copyright (c) 2021 airsquared\n\n" +
+        alert.setContentText("blobsaver " + Main.copyright + "\n\n" +
                 "This program is licensed under GNU GPL v3.0-only");
         Utils.resizeAlertButtons(alert);
 
@@ -498,7 +498,7 @@ public void forceCheckForBlobsHandler() {
     public void resetAppHandler() {
         ButtonType result = Utils.showConfirmAlert("Are you sure you would like to clear all blobsaver data?");
         if (ButtonType.OK.equals(result)) {
-            Prefs.resetPrefs();
+            Utils.clearAppData();
             Utils.showInfoAlert("The application data has been removed. \nThe application will now exit.");
             Main.exit();
         }

src/main/java/airsquared/blobsaver/app/Main.java

@@ -39,6 +39,7 @@
 public class Main {
 
     static final String appVersion = "v3.4.1";
+    static final String copyright = "Copyright (c) 2023 airsquared";
     static Stage primaryStage;
     // make sure to set system property before running (automatically set if running from gradle)
     static final File jarDirectory;
@@ -63,7 +64,7 @@ public static void main(String[] args) {
         fixCertificateError();
         if (args.length == 1 && args[0].equals("--background-autosave")) {
             Background.saveAllBackgroundBlobs(); // don't unnecessarily initialize any FX
-        } else if (args.length > 0) {
+        } else if (args.length > 0 || System.getenv().containsKey("BLOBSAVER_CLI_ONLY")) {
             System.exit(CLI.launch(args));
         } else {
             JavaFxApplication.launch(JavaFxApplication.class, args);

src/main/java/airsquared/blobsaver/app/Utils.java

@@ -195,6 +195,16 @@ static File getLibrariesUsedFile() {
         return librariesUsedFile;
     }
 
+    static void clearAppData() {
+        try {
+            if (Background.isBackgroundEnabled()) {
+                Background.stopBackground();
+            }
+        } catch (Exception ignored) {
+        }
+        Prefs.resetPrefs();
+    }
+
     static void newGithubIssue() {
         openURL("https://github.com/airsquared/blobsaver/issues/new/choose");
     }