Change flight log export filenames

nur557 · nur557 · commit 785164435fa6 · 2025-06-29T17:46:19.000+02:00
diff --git a/src/modules/flightlog.js b/src/modules/flightlog.js
@@ -1,6 +1,8 @@
 import fs from "fs";
 import path from "path";
 import { dialog } from "electron";
+import { formatDateTime } from "@/utils/date.js";
+import { flightLogFilename } from "./ipc.js";
 
 export function exportFlightLogToCSVs(flightLog) {
   let flightLogSections = ["imu", "baro", "flightInfo", "orientationInfo", "filteredDataInfo", "gnssInfo", "flightStates", "eventInfo", "voltageInfo"];
@@ -13,11 +15,10 @@ export function exportFlightLogToCSVs(flightLog) {
     return;
   }
 
-  const exportFolderPath = path.join(paths[0]);
+  const userFolderPath = path.join(paths[0]);
+  const exportFolderPath = `${userFolderPath}/${flightLogFilename}_export_${formatDateTime(new Date())}`;
 
-  if (!fs.existsSync(exportFolderPath)) {
-    fs.mkdirSync(exportFolderPath);
-  }
+  fs.mkdirSync(`${exportFolderPath}`);
 
   for (let flightLogSection of flightLogSections) {
     fs.writeFile(`${exportFolderPath}/${flightLogSection}.csv`, objectArrayToCSV(flightLogSection, flightLog[flightLogSection]), "utf8", function (err) {
@@ -41,10 +42,6 @@ export function exportFlightLogChartsToHTML(flightLogChartsHTML) {
 
   const exportFolderPath = path.join(paths[0]);
 
-  if (!fs.existsSync(exportFolderPath)) {
-    fs.mkdirSync(exportFolderPath);
-  }
-
   const flightLogHtmlDocument = `
     <!DOCTYPE html>
     <html>
@@ -57,7 +54,7 @@ export function exportFlightLogChartsToHTML(flightLogChartsHTML) {
     </html>
   `;
 
-  fs.writeFile(`${exportFolderPath}/plots.html`, flightLogHtmlDocument, 'utf8', function (err) {
+  fs.writeFile(`${exportFolderPath}/${flightLogFilename}_plots_${formatDateTime(new Date())}.html`, flightLogHtmlDocument, 'utf8', function (err) {
     if (err) {
       console.log("An error occurred while writing HTML Object to File.");
       return console.log(err);
diff --git a/src/modules/ipc.js b/src/modules/ipc.js
@@ -3,6 +3,9 @@ import fs from "fs";
 import { parseFlightLog } from "./logparser.js"
 import { exportFlightLogToCSVs, exportFlightLogChartsToHTML } from "./flightlog.js"
 import { connect, disconnect, command, cliCommand, getList } from "./serial.js";
+import { getFilename } from "../utils/file.js";
+
+export let flightLogFilename = "";
 
 export function subscribeListeners() {
   ipcMain.on("BOARD:CONFIG", async (event, key) => {
@@ -59,6 +62,8 @@ export function subscribeListeners() {
       return
     }
 
+    flightLogFilename = getFilename(file.slice(0, -4)); // Remove the .cfl extension
+
     let data = fs.readFileSync(file, { encoding: "binary" });
     if (!data || !data.length) {
       event.sender.send("LOAD_FLIGHTLOG", { error: "File is empty" });
diff --git a/src/utils/date.js b/src/utils/date.js
@@ -0,0 +1,15 @@
+export function formatDateTime(date) {
+  if (!(date instanceof Date)) {
+    console.error("Invalid date object provided.");
+    return "";
+  }
+
+  const options = { year: "numeric", month: "2-digit", day: "2-digit" };
+  const formattedDate = date
+    .toLocaleDateString("en-US", options)
+    .replace(/\//g, "");
+
+  const formattedTime = date.toLocaleTimeString("en-UK").replace(/:/g, "");
+
+  return `${formattedDate}_${formattedTime}`;
+}
diff --git a/src/utils/file.js b/src/utils/file.js
@@ -0,0 +1,13 @@
+export function getFilename(filePath) {
+  // Use a regex to split by either / or \ (to handle both Unix and Windows paths)
+  // Then pop the last element
+  const parts = filePath.split(/[\\/]/);
+  const filename = parts.pop();
+  
+  // Handle cases where the path might end with a slash, resulting in an empty string
+  if (filename === '' && parts.length > 0) {
+      return parts.pop(); // Get the name of the directory itself
+  }
+
+  return filename;
+}
