Fix: Log as Text feature, delete old setting files

Author: retiutut

CHANGELOG.md

@@ -3,6 +3,10 @@ Use OpenBCIHub v2.0.9 please.
 
 ## Beta 1
 
+### Bug fixes
+* Fix 'Open Log as Text' feature in ConsoleLog
+* Delete old/broken user and default settings when attempting to load
+
 ### Improvements
 
 #### SSVEP

OpenBCI_GUI/ConsoleLog.pde

@@ -131,25 +131,27 @@ static class ConsoleWindow extends PApplet {
 
     void openLogFileAsText() {
         try {
-            println("Opening console log as text file!");
+            println("ConsoleLog: Opening console log as text file!");
             File file = new File (outputStream.getFilePath());
             Desktop desktop = Desktop.getDesktop();
-            if(file.exists()) {
+            if (file.exists()) {
                 desktop.open(file);
+            } else {
+                println("ConsoleLog: ERROR - Unable to open console log as text file...");
             }
         } catch (IOException e) {}
     }
 
     void copyFullTextToClipboard() {
-        println("Copying console log to clipboard!");
+        println("ConsoleLog: Copying console log to clipboard!");
         String stringToCopy = outputStream.getFullLog();
         String formattedCodeBlock = "```\n" + stringToCopy + "\n```";
         clipboardCopy.copyString(formattedCodeBlock);
     }
 
     void copyLastLineToClipboard() {
         clipboardCopy.copyString(outputStream.getLastLine());
-        println("Previous line copied to clipboard.");
+        println("ConsoleLog: Previous line copied to clipboard.");
     }
 
     void updateButtonPositions() {
@@ -167,7 +169,7 @@ static class ConsoleWindow extends PApplet {
     }
 
     void exit() {
-        println("ConsoleWindow: Console closed!");
+        println("ConsoleLog: Console closed!");
         instance = null;
         dispose();
     }
@@ -215,7 +217,7 @@ static class ConsoleWindow extends PApplet {
                 data = (String)pasteObject(DataFlavor.stringFlavor);
             }
             catch (Exception e) {
-                println("Error getting String from clipboard: " + e);
+                println("ConsoleLog: Error getting String from clipboard: " + e);
             }
             return data;
         }
@@ -300,7 +302,7 @@ class CustomOutputStream extends PrintStream {
     }
 
     public String getFilePath() {
-        return sketchPath() + System.getProperty("file.separator") + filePath;
+        return filePath;
     }
 
     public String getLastLine() {

OpenBCI_GUI/SoftwareSettings.pde

@@ -379,12 +379,12 @@ class SoftwareSettings {
             this.load(settingsFileToLoad);
             errorUserSettingsNotFound = false;
         } catch (Exception e) {
-            e.printStackTrace();
+            //e.printStackTrace();
             println("InitSettings: " + settingsFileToLoad + " not found or other error.");
             errorUserSettingsNotFound = true;
-            File f = new File(sketchPath()+System.getProperty("file.separator")+settingsFileToLoad);
+            File f = new File(settingsFileToLoad);
             if (f.exists()) {
-                if (f.delete()) println("SoftwareSettings: Removed old settings file.");
+                if (f.delete()) println("SoftwareSettings: Removed old/broken settings file.");
             }
         }
     }
@@ -1532,7 +1532,7 @@ class SoftwareSettings {
             output("The new data source is " + dataModeVersionToPrint + " and NCHAN = [" + nchan + "]. Data source error: Default Settings Loaded."); //Show a normal message for loading Default Settings
         } else if (errorUserSettingsNotFound) {
             verbosePrint("OpenBCI_GUI: initSystem: -- Init 5 -- " + "Load settings error: File not found. " + millis()); //Print the error to console
-            output("The new data source is " + dataModeVersionToPrint + " and NCHAN = [" + nchan + "]. User settings error: Default Settings Loaded."); //Show a normal message for loading Default Settings
+            output("The new data source is " + dataModeVersionToPrint + " and NCHAN = [" + nchan + "]. User Settings Error: Default Settings Loaded."); //Show a normal message for loading Default Settings
         } else {
             verbosePrint("OpenBCI_GUI: initSystem: -- Init 5 -- " + "Load settings error: Connection Error: Failed to apply channel settings to Cyton" + millis()); //Print the error to console
             outputError(dataModeVersionToPrint + " and NCHAN = [" + nchan + "]. Connection Error: Channel settings failed to apply to Cyton."); //Show a normal message for loading Default Settings
@@ -1553,14 +1553,27 @@ class SoftwareSettings {
             errorUserSettingsNotFound = true;
         }
         //Output message when Loading settings is complete
+        String err = null;
         if (chanNumError == false && dataSourceError == false && errorUserSettingsNotFound == false && loadErrorCytonEvent == false) {
             outputSuccess("Settings Loaded!");
         } else if (chanNumError) {
-            outputError("Load Settings Error: Invalid number of channels");
+            err = "Invalid number of channels";
         } else if (dataSourceError) {
-            outputError("Load Settings Error: Invalid data source");
-        } else {
-            outputError("Load settings error: " + settingsFileToLoad + " not found. ");
+            err = "Invalid data source";
+        } else if (errorUserSettingsNotFound) {
+            err = settingsFileToLoad + " not found.";
+        }
+
+        if (err != null) {
+            println("Load Settings Error: " + err);
+            File f = new File(settingsFileToLoad);
+            if (f.exists()) {
+                if (f.delete()) {
+                    outputError("Found old/broken GUI settings. Please reconfigure the GUI and save new settings.");
+                } else {
+                    outputError("SoftwareSettings: Error deleting old/broken settings file...");
+                }
+            }
         }
     }
 
@@ -1595,14 +1608,15 @@ class SoftwareSettings {
             this.load(defaultSettingsFileToLoad);
             outputSuccess("Default Settings Loaded!");
         } catch (Exception e) {
-            outputError("Default Settings Error: New settings will be made next system start.");
-            File f = new File(sketchPath()+System.getProperty("file.separator")+defaultSettingsFileToLoad);
-            if (f.delete()) {
-                println("Old settings file succesfully deleted.");
-            } else {
-                println("Error deleting file...");
+            outputError("Default Settings Error: Valid Default Settings will be saved next system start.");
+            File f = new File(defaultSettingsFileToLoad);
+            if (f.exists()) {
+                if (f.delete()) {
+                    println("SoftwareSettings: Old/Broken Default Settings file succesfully deleted.");
+                } else {
+                    println("SoftwareSettings: Error deleting Default Settings file...");
+                }
             }
-
         }
     }
 
@@ -1659,8 +1673,8 @@ void loadConfigFile(File selection) {
                 outputError("Settings Error: Data Source Mismatch Detected");
             } else {
                 outputError("Error trying to load settings file, possibly from previous GUI. Removing old settings.");
+                if (selection.exists()) selection.delete();
             }
-            if (selection.exists()) selection.delete();
         }
         settings.loadDialogName = null; //reset this variable for future use
     }