Fixed problems with finding json files

Mechanical-Advantage · Nov 22, 2023 · 41219df · 41219df
1 parent 7a88823
commit 41219df
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 295 deletions.
diff --git a/src/main/deploy/NewPath.json → src/main/deploy/trajectories/NewPath.json b/src/main/deploy/NewPath.json → src/main/deploy/trajectories/NewPath.json
diff --git a/src/main/java/org/littletonrobotics/frc2023/util/trajectory/ChoreoTrajectoryFactory.java b/src/main/java/org/littletonrobotics/frc2023/util/trajectory/ChoreoTrajectoryFactory.java
diff --git a/src/main/java/org/littletonrobotics/frc2023/util/trajectory/CustomSwerveDriveController.java b/src/main/java/org/littletonrobotics/frc2023/util/trajectory/CustomSwerveDriveController.java
diff --git a/src/main/java/org/littletonrobotics/frc2023/util/trajectory/CustomTrajectoryFactory.java b/src/main/java/org/littletonrobotics/frc2023/util/trajectory/CustomTrajectoryFactory.java
diff --git a/src/main/java/org/littletonrobotics/frc2023/util/trajectory/TrajectoryImplementation.java b/src/main/java/org/littletonrobotics/frc2023/util/trajectory/TrajectoryImplementation.java
diff --git a/...n/java/org/littletonrobotics/frc2023/util/trajectory/updated/ChoreoTrajectoryFactory.java b/...n/java/org/littletonrobotics/frc2023/util/trajectory/updated/ChoreoTrajectoryFactory.java
@@ -28,16 +28,16 @@ public class ChoreoTrajectoryFactory {
   private static final HashMap<String, File> FILE_HASH_MAP = new HashMap<>();
   // load trajectory files into map
   static {
-    File trajectory_dir = Filesystem.getDeployDirectory();
+    File trajectory_dir = new File(Filesystem.getDeployDirectory(), "trajectories");
     if (trajectory_dir.isDirectory() && trajectory_dir.listFiles() != null) {
       for (File file : trajectory_dir.listFiles()) {
         String fileName = file.getName();
         // check if json
-        int pointIndex = fileName.lastIndexOf(".");
-        String type = fileName.substring(pointIndex);
+        int pointIndex = fileName.lastIndexOf('.');
+        String type = (pointIndex == -1) ? "not json" : fileName.substring(pointIndex);
         if (!type.equals(".json")) continue;
         // use name of file without ".json"
-        String trimmedName = fileName.substring(0, pointIndex - 1);
+        String trimmedName = fileName.substring(0, pointIndex);
         FILE_HASH_MAP.put(trimmedName, file);
       }
     }