Merge pull request #480 from justinlampley/CopyAllBinFilesAfterBuild

Copy all elrs and bin files to the tmp output directory
ExpressLRS · Feb 27, 2023 · 7153b0c · 7153b0c
2 parents 9e9cfcc + 7ab742b
commit 7153b0c
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 25 deletions.
diff --git a/src/api/src/library/FirmwareBuilder/index.ts b/src/api/src/library/FirmwareBuilder/index.ts
@@ -42,18 +42,35 @@ export default class FirmwareBuilder {
     };
   }
 
+  getFirmwareBuildPath(target: string, firmwarePath: string): string {
+    return path.join(firmwarePath, '.pio', 'build', target);
+  }
+
+  getFirmwareBinFiles(target: string, firmwarePath: string): string[] {
+    const firmwareBuildPath = this.getFirmwareBuildPath(target, firmwarePath);
+    const binaryExtensions = ['.elrs', '.bin'];
+
+    const firmwareBinFiles = fs
+      .readdirSync(firmwareBuildPath)
+      .filter((filename) => binaryExtensions.includes(path.extname(filename)));
+
+    return firmwareBinFiles.map((filename) =>
+      path.join(firmwareBuildPath, filename)
+    );
+  }
+
   getFirmwareBinPath(target: string, firmwarePath: string): string {
-    const paths = [
-      path.join(firmwarePath, '.pio', 'build', target, 'firmware.elrs'),
-      path.join(firmwarePath, '.pio', 'build', target, 'backpack.bin'),
-    ];
-    // eslint-disable-next-line no-restricted-syntax
-    for (const location of paths) {
-      if (fs.existsSync(location)) {
-        return location;
-      }
-    }
-    return path.join(firmwarePath, '.pio', 'build', target, 'firmware.bin');
+    const firmwareBuildPath = this.getFirmwareBuildPath(target, firmwarePath);
+    const firmwareBinFiles = this.getFirmwareBinFiles(target, firmwarePath);
+    const searchValues = ['firmware.elrs', 'backpack.bin', 'firmware.bin'];
+
+    const matchedBinFile = firmwareBinFiles.find((firmwareBinPath) =>
+      searchValues.find(
+        (searchValue) => searchValue === path.basename(firmwareBinPath)
+      )
+    );
+
+    return matchedBinFile || path.join(firmwareBuildPath, 'firmware.bin');
   }
 
   private async storeUserDefines(firmwarePath: string, userDefinesTxt: string) {

diff --git a/src/api/src/services/Firmware/index.ts b/src/api/src/services/Firmware/index.ts
@@ -423,22 +423,25 @@ export default class FirmwareService {
             path.join(os.tmpdir(), `${params.target}_`)
           );
 
-          // copy with original filename to tmpPath
-          const tmpFirmwareBinPathOriginalName = path.join(
-            tmpPath,
-            path.basename(firmwareBinPath)
+          // copy all binary files to tmpPath
+          const binaryFiles = this.builder.getFirmwareBinFiles(
+            params.target,
+            firmwarePath
           );
-          try {
-            await fs.promises.copyFile(
-              firmwareBinPath,
-              tmpFirmwareBinPathOriginalName
-            );
-          } catch (err) {
-            this.logger?.error(
-              `error copying file from ${firmwareBinPath} to ${tmpFirmwareBinPathOriginalName}: ${err}`
-            );
-          }
 
+          binaryFiles.forEach((file) => {
+            const newPath = path.join(tmpPath, path.basename(file));
+
+            try {
+              fs.copyFileSync(file, newPath);
+            } catch (err) {
+              this.logger?.error(
+                `error copying file from ${firmwareBinPath} to ${newPath}: ${err}`
+              );
+            }
+          });
+
+          // copy named bin file to tmpPath
           const tmpFirmwareBinPath = path.join(
             tmpPath,
             `${newFirmwareBaseName}${firmwareExtension}`