Make paths absolute and update the USB command

Author: JaciBrunning

src/main/java/jaci/openrio/toast/core/ToastBootstrap.java

@@ -83,8 +83,8 @@ public static void main(String[] args) {
         }
 
         if (isSimulation) {
-            toastHome = new File("toast/");
-            robotHome = new File("./");
+            toastHome = new File("toast/").getAbsoluteFile();
+            robotHome = new File("./").getAbsoluteFile();
         }
 
         toastHome.mkdirs();

src/main/java/jaci/openrio/toast/core/ToastConfiguration.java

@@ -20,8 +20,9 @@ public static void init() {
 
     public static enum Property {
         THREAD_POOL_SIZE("threading.pool_size", 2, "The amount of threads in the Thread Pool. The more threads, the more concurrent operations. This should be kept at 2 for most cases, but can be bumped up if required."),
-        THREADED_LOADING("experimental.threaded_loading", false, "WARNING: EXPERIMENTAL CODE. DO NOT USE IN COMPETITION UNLESS YOU KNOW WHAT YOU ARE DOING! Should module loading be threaded? This has the advantage of speeding up loading times, but may be unstable for modules which aren't properly configured for concurrency."),
+        THREADED_LOADING("experimental.threaded_loading", false, "Should module loading be threaded? This has the advantage of speeding up loading times, but may be unstable for modules which aren't properly configured for concurrency."),
         //THREADED_TICKING("experimental.threaded_ticking", false, "Should ticking by the StateTracker (autonomous, teleop, test, disabled, etc), be Threaded for each listener? This makes ticking run quickly and concurrently, but may be unstable for modules that aren't properly configured for concurrent operations."),
+        JET_FUEL("jet.fuel", "steel beams", "JET FUEL CAN'T MELT STEEL BEAMS"),
         ;
 
         String key;
@@ -31,6 +32,8 @@ public static enum Property {
         Object value;
 
         Property(String key, Object defaultValue, String comment) {
+            if (key.startsWith("experimental."))
+                comment = "WARNING: EXPERIMENTAL CODE. DO NOT USE IN COMPETITION UNLESS YOU KNOW WHAT YOU ARE DOING! " + comment;
             this.key = key;
             this.defaultValue = defaultValue;
             this.comments = MathHelper.splitStringByWords(comment, 15);

src/main/java/jaci/openrio/toast/core/command/cmd/CommandUSB.java

@@ -7,7 +7,10 @@
 import jaci.openrio.toast.core.io.usb.USBMassStorage;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.CopyOption;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -20,7 +23,9 @@ public String getCommandName() {
 
     @Override
     public void invokeCommand(int argLength, String[] args, String command) {
-        if (argLength == 1) {
+        if (argLength == 1 || argLength == 2) {
+            boolean specified = argLength == 2;
+
             if (args[0].equals("generate")) {
                 int count = 0;
                 for (File file : USBMassStorage.invalidDrives) {
@@ -39,30 +44,62 @@ public void invokeCommand(int argLength, String[] args, String command) {
             } else if (args[0].equals("dump")) {
                 for (MassStorageDevice drive : USBMassStorage.connectedDevices) {
                     long time = System.currentTimeMillis();
-                    File root = new File(drive.toast_directory, "usb_dumps/dump_" + time);
+                    File root = new File(drive.dump_directory, "dump_" + time);
                     try {
-                        copyDirectory(ToastBootstrap.toastHome, root);
-                        Toast.log().info("Data Dump Successful: dump_" + time + " on drive: " + drive.drive_name);
+                        if (!specified || drive.drive_name.equalsIgnoreCase(args[1])) {
+                            copyDirectory(ToastBootstrap.toastHome, root);
+                            Toast.log().info("Data Dump Successful: dump_" + time + " on drive: " + drive.drive_name);
+                        }
                     } catch (IOException e) {
                         Toast.log().error("Could not Dump Toast Files on drive: " + drive.drive_name);
                         Toast.log().exception(e);
                     }
                 }
-            }
+            } else if (args[0].equals("load")) {
+                for (MassStorageDevice drive : USBMassStorage.connectedDevices) {
+                    try {
+                        if (!specified || drive.drive_name.equalsIgnoreCase(args[1])) {
+                            copyDirectory(drive.toast_directory, ToastBootstrap.toastHome);
+                            Toast.log().info("Data Load Successful From Drive: " + drive.drive_name);
+                        }
+                    } catch (IOException e) {
+                        Toast.log().error("Could not Load Toast Files from drive: " + drive.drive_name);
+                        Toast.log().exception(e);
+                    }
+                }
+            } else
+                usage();
         } else {
-            Toast.log().info("Usage: usb <generate|dump>");
+            usage();
         }
     }
 
+    private void usage() {
+        Toast.log().warn("Usage: usb <generate|dump|load> [drive_name]");
+    }
+
     private void copyDirectory(File source, File dest) throws IOException {
         for (File f : source.listFiles()) {
-            if (f.isDirectory())
-                copyDirectory(f, dest);
-            else {
-                Path resolve = dest.toPath().resolve(f.toPath());
-                resolve.toFile().getParentFile().mkdirs();
-                Files.copy(f.getAbsoluteFile().toPath(), resolve);
-            }
+            File sourceFile = new File(source, f.getName());
+            File destFile = new File(dest, f.getName());
+            if (f.isDirectory()) {
+                destFile.mkdirs();
+                copyDirectory(sourceFile, destFile);
+            } else
+                copyFile(sourceFile, destFile);
+        }
+    }
+
+    private void copyFile(File source, File dest) throws IOException {
+        FileInputStream inputStream = new FileInputStream(source);
+        FileOutputStream outputStream = new FileOutputStream(dest);
+        int lengthStream;
+        byte[] buff = new byte[1024];
+        while ((lengthStream = inputStream.read(buff)) > 0) {
+            outputStream.write(buff, 0, lengthStream);
         }
+        outputStream.close();
+        inputStream.close();
     }
+
 }

src/main/java/jaci/openrio/toast/core/io/usb/MassStorageDevice.java

@@ -32,6 +32,11 @@ public class MassStorageDevice {
      * The directory that Toast files should be stored in on the drive
      */
     public File toast_directory;
+
+    /**
+     * The directory that USB Dumps are kept in
+     */
+    public File dump_directory;
     public boolean override_modules;
     public boolean concurrent_modules;
 
@@ -40,6 +45,7 @@ public MassStorageDevice(File path, GroovyPreferences autorun, String name) {
         this.preferences = autorun;
         this.drive_name = name;
         this.toast_directory = new File(path, autorun.getString("toast.directory"));
+        this.dump_directory = new File(path, autorun.getString("toast.dumps"));
         this.toast_directory.mkdirs();
         this.override_modules = autorun.getBoolean("toast.override_modules");
         this.concurrent_modules = autorun.getBoolean("toast.concurrent_modules");

src/main/java/jaci/openrio/toast/core/io/usb/USBMassStorage.java

@@ -55,11 +55,11 @@ public static void crawlSym(File file) {
             }
 
             GroovyPreferences pref = new GroovyPreferences(configuration);
-            String drive_name = pref.getString("toast.device_name");
+            String drive_name = pref.getString("toast.device_name").replace(" ", "_");
             MassStorageDevice device = new MassStorageDevice(canon, pref, drive_name);
             connectedDevices.add(device);
             if (device.override_modules && !device.concurrent_modules) override = true;
-            logger.info("USB Mass Storage Device Detected -- Valid! " + canon);
+            logger.info("USB Mass Storage Device Detected -- Valid! " + canon + " (" + device.drive_name + ")");
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/resources/assets/toast/autorun_default.conf

@@ -1,10 +1,13 @@
 toast {
     // The name you wish to give to your USB Drive. This should be unique. Including your Team Number is good practise
-    device_name = "Team #### USB Device"
+    device_name = "Team_####_USB_Device"
 
     // The directory you wish to use for your Toast files
     directory = "toast"
 
+    // The directory you wish for Toast Dumps to save on
+    dumps = "toast_usb_dumps"
+
     // Should this USB drive override modules? If true, modules loaded in the robot's local files will be disabled.
     // If false, modules on the robot's local files will be enabled, but modules on the USB device will be disabled.
     // Keep in mind, if one USB drive has this true, it loads from ALL usb devices.