From 0cbecb1d6c229c0c44adeba050348fe67d4f7523 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 9 Apr 2025 15:01:31 -0700 Subject: [PATCH] Resolve file path resolution on Mac/Linux. --- src/main/decoder/decoder-utils.ts | 19 +++++++++++++++---- src/main/decoder/decoder.ts | 3 --- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/main/decoder/decoder-utils.ts b/src/main/decoder/decoder-utils.ts index 1d0c5fe..73bf777 100644 --- a/src/main/decoder/decoder-utils.ts +++ b/src/main/decoder/decoder-utils.ts @@ -8,13 +8,17 @@ const findFileCaseInsensitive = async ( ): Promise => { const directory: string = path.dirname(extensionlessFilePath); try { - const matchingFiles = fs - .readdirSync(directory) - .filter((file: string) => + const matchingFiles = fs.readdirSync(directory).filter((file: string) => { + return ( extensions.some((ext) => file.toLowerCase().endsWith(ext.toLowerCase()), - ), + ) && + path + .basename(file, path.extname(file)) + .toLowerCase() + .startsWith(path.basename(extensionlessFilePath).toLowerCase()) ); + }); const files: string[] = []; matchingFiles.forEach((file) => { const fullPath = path.join(directory, file); @@ -33,4 +37,11 @@ const findFileCaseInsensitive = async ( return null; }; +const getFilePathWithoutExtension = (filePath: string): string => { + return path.join( + path.dirname(filePath), + path.basename(filePath, path.extname(filePath)), + ); +}; + export { findFileCaseInsensitive }; diff --git a/src/main/decoder/decoder.ts b/src/main/decoder/decoder.ts index 98ea24d..a0f6d1f 100644 --- a/src/main/decoder/decoder.ts +++ b/src/main/decoder/decoder.ts @@ -125,9 +125,6 @@ async function ImportJob(filepath: string): Promise { log.info(`Job data saved to: ${filePath}`); } - //Temporarily adjust the claim number to ensure we are running on the right set of claims. - jobObject.clm_no = `ELECTRONAPP-${jobObject.clm_no}`; - const newAvailableJob: AvailableJobSchema = { uploaded_by: store.get("user.email"), bodyshopid: store.get("app.bodyshop.id"),