Working bin parser + front end

backend/src/main/java/com/mcmasterbaja/FileFetchResource.java

@@ -99,7 +99,7 @@ public List<FileInformation> getInformationForFolder(@PathParam("folderkey") Str
 
       List<FileInformation> fileInformationList = storageService.loadAll(targetPath)
         .map(path -> new FileInformation(
-          path.toString().replace("\\", "/"),
+          targetPath.relativize(path).toString(),
           fileMetadataService.readHeaders(path),
           path.toFile().lastModified()
         ))

backend/src/main/java/com/mcmasterbaja/FileUploadResource.java

@@ -49,26 +49,23 @@ public Response uploadFile(@MultipartForm FileUploadForm form) {
             break;
 
           case "bin":
-            fileName = fileName.substring(4, fileName.length() - 4) + "/";
-            logger.info("File name: " + fileName);
+            fileName = fileName.substring(4, fileName.length());
 
-            //storageService.store(form.fileData, Paths.get(fileName));
-
-            logger.info("Absolute location: " + storageService.getRootLocation().resolve(fileName).toString() + "/");
-
-            //logger.info("Bytes: " + form.fileData.readAllBytes().length);
+            logger.info("Parsing bin to: " 
+              + storageService.getRootLocation().resolve("csv").toString() 
+              + "/"
+              + fileName.substring(0, fileName.lastIndexOf('.'))
+              + "/");
 
             try {
               BinaryToCSV.bytesToCSV(
                 form.fileData.readAllBytes(),
-                storageService.getRootLocation().resolve(fileName).toString() + "/",
-                storageService.getRootLocation().resolve(fileName).toString(),
+                storageService.getRootLocation().resolve("csv/").toString(),
+                fileName,
                 true);
             } catch (UnsatisfiedLinkError e) {
               return Response.serverError().entity("File upload failed: " + e.getMessage()).build();
             }
-
-            //storageService.delete(Paths.get(fileName));
             break;
 
           case "mov":

backend/src/main/java/com/mcmasterbaja/binary_csv/BinaryToCSV.java

@@ -11,8 +11,8 @@ public class BinaryToCSV {
 
   static {
     String path = System.getProperty("user.dir");
-    path += relativePath + "/binary_to_csv_lib.dll";
-    System.out.println("PATH  " + path);
+    path += relativePath + "/libbinary_to_csv_lib.dylib";
+    // System.out.println("PATH  " + path);
     System.load(path);
   }
 

backend/src/main/java/com/mcmasterbaja/storage/DefaultFileMetadataService.java

@@ -34,7 +34,7 @@ public class DefaultFileMetadataService implements FileMetadataService {
 
   public String[] readHeaders(Path targetPath) {
     try {
-      logger.info("Reading headers from: " + targetPath);
+      // logger.info("Reading headers from: " + targetPath);
       return Files.lines(storageService.getRootLocation().resolve(targetPath)).findFirst().get().split(",");
     } catch (IOException e) {
       logger.error("Could not read headers", e);

binary-to-csv-lib/src/lib.rs

@@ -452,18 +452,18 @@ pub extern "system" fn Java_com_mcmasterbaja_binary_1csv_BinaryToCSV_bytesToCSV<
     let mut utilised_types: HashMap<DataType, BufWriter<std::fs::File>> =
         HashMap::with_capacity(DATA_TYPE_LEN);
     let extension_index = file_name.find('.').unwrap();
-    let path_no_extension = &file_name[0..extension_index];
+    let path_no_extension = destination.to_string() + "/" + &file_name[0..extension_index];
     if folder {
-        match std::fs::create_dir(path_no_extension) {
+        match std::fs::create_dir(&path_no_extension) {
             Ok(_) => println!("Created folder: {}", path_no_extension),
             Err(e) => {
                 if e.kind() == std::io::ErrorKind::AlreadyExists {
                     println!(
                         "Folder already exists: {}\nAttempting to delete and reparse",
                         path_no_extension
                     );
-                    std::fs::remove_dir_all(path_no_extension).unwrap();
-                    std::fs::create_dir(path_no_extension).unwrap();
+                    std::fs::remove_dir_all(&path_no_extension).unwrap();
+                    std::fs::create_dir(&path_no_extension).unwrap();
                 } else {
                     panic!("{}", e);
                 }
@@ -473,7 +473,7 @@ pub extern "system" fn Java_com_mcmasterbaja_binary_1csv_BinaryToCSV_bytesToCSV<
 
     for packet in parsed_packets {
         utilised_types.entry(packet.datatype).or_insert_with(|| {
-            get_writer(&packet.datatype, &destination, path_no_extension, folder)
+            get_writer(&packet.datatype, &destination, &path_no_extension, folder)
         });
 
         match packet.datatype {

front-end/src/components/modal/FileStorage.js

@@ -5,6 +5,7 @@ import RawFileBrowser, { Icons } from 'react-keyed-file-browser';
 import React from 'react';
 
 const formatSize = (size) => {
+  if (size === 0) return '0 B';
   // Finds the order of magnitude of the size in base 1024 (e.g. how many digits it would have)
   const magnitude = Math.floor(Math.log(size) / Math.log(1024));
   const units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'ZB', 'YB', 'RB', 'QB'];

front-end/src/lib/apiUtils.js

@@ -28,7 +28,12 @@ export const ApiUtil = {
   },
 
   /**
-     * @description Sends a GET request to the server to fetch a specific folder.
+     * @description Sends a GET request to the server to fetch fileInformation about a specific folder.
+     * Each file in the list is represented as an object with the following properties:
+     * - key: A  that represents the unique identifier of the file. This will be relative to the folder provided.
+     * - fileHeaders: An array of strings that represents the headers of the file.
+     * - size: A long that represents the size of the file.
+     * 
      * @param {string} folderKey - The unique identifier of the folder.
      * @returns {Promise<Response>} A promise that resolves to the server's response.
      */
@@ -134,7 +139,8 @@ export const ApiUtil = {
      */
   uploadFile: async (file) => {
     const formData = new FormData();
-    formData.set('file', file);
+    formData.set('fileName', file.name);
+    formData.set('fileData', file);
 
     const response = await fetch(`http://${window.location.hostname}:8080/upload/file`, {
       method: 'POST',