AddTypeFolder uses Paths and getFile simplified

McMaster-Baja-Racing · May 13, 2024 · 4df5cc8 · 4df5cc8
1 parent 6157045
commit 4df5cc8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/backend/src/main/java/com/mcmasterbaja/FileFetchResource.java b/backend/src/main/java/com/mcmasterbaja/FileFetchResource.java
@@ -42,15 +42,13 @@ public List<String> getAllFiles() {
   // TODO: What exception is thrown when it can't find the file?
   @GET
   @jakarta.ws.rs.Path("/{filekey}")
-  public RestResponse<File> getFile(@PathParam("filekey") String filekey) {
+  public File getFile(@PathParam("filekey") String filekey) {
     logger.info("Getting file: " + filekey);
 
     Path targetPath = addTypeFolder(filekey);
     File file = storageService.load(targetPath).toFile();
 
-    return ResponseBuilder.ok(file, MediaType.APPLICATION_OCTET_STREAM)
-        .header("Content-Disposition", "attachment; filename=\"" + file.getName() + "\"")
-        .build();
+    return file;
   }
 
   @GET
@@ -160,6 +158,7 @@ public List<FileTimespan> getTimespan(@PathParam("folderkey") String folderkey)
   }
 
   private Path addTypeFolder(String fileKey) {
-    return Paths.get(fileMetadataService.getTypeFolder(fileKey)).resolve(fileKey);
+    String typeFolder = fileMetadataService.getTypeFolder(Paths.get(fileKey));
+    return storageService.load(Paths.get(typeFolder)).resolve(fileKey);
   }
 }
diff --git a/backend/src/main/java/com/mcmasterbaja/services/DefaultFileMetadataService.java b/backend/src/main/java/com/mcmasterbaja/services/DefaultFileMetadataService.java
@@ -120,7 +120,7 @@ public boolean canComputeTimespan(Path folderPath) {
   }
 
   public LocalDateTime[] getTimespan(Path targetPath, LocalDateTime zeroTime) {
-    switch (getTypeFolder(targetPath.toString())) {
+    switch (getTypeFolder(targetPath)) {
       case "csv":
         return getTimespanCSV(targetPath, zeroTime);
       case "mp4":
@@ -172,7 +172,8 @@ public LocalDateTime getZeroTime(Path folderPath) {
     }
   }
 
-  public String getTypeFolder(String pathString) {
+  public String getTypeFolder(Path targetPath) {
+    String pathString = targetPath.toString();
     int dotIndex = pathString.lastIndexOf(".");
     if (pathString == "" || pathString == null || dotIndex == -1) return ""; // No file extension
 

diff --git a/backend/src/main/java/com/mcmasterbaja/services/FileMetadataService.java b/backend/src/main/java/com/mcmasterbaja/services/FileMetadataService.java
@@ -69,5 +69,5 @@ public interface FileMetadataService {
    * @param pathString The Path of the file to analyze.
    * @return The desired type folder.
    */
-  String getTypeFolder(String pathString);
+  String getTypeFolder(Path targetPath);
 }