Pre-build command updates

* Moved pre-build command into separate member function to reduce code replication, better maintainablility and readability
* Added pre-build command to "upload using programmer" since it was (probably unintentional) missing there

Author: elektronikworkshop

src/arduino/arduino.ts

@@ -139,16 +139,8 @@ export class ArduinoApp {
         UsbDetector.getInstance().pauseListening();
         await vscode.workspace.saveAll(false);
 
-        if (dc.prebuild) {
-            arduinoChannel.info(`Run prebuild command: ${dc.prebuild}`);
-            const prebuildargs = dc.prebuild.split(" ");
-            const prebuildCommand = prebuildargs.shift();
-            try {
-                await util.spawn(prebuildCommand, arduinoChannel.channel, prebuildargs, { shell: true, cwd: ArduinoWorkspace.rootPath });
-            } catch (ex) {
-                arduinoChannel.error(`Run prebuild failed: \n${ex.error}`);
-                return;
-            }
+        if (!await this.runPreBuildCommand(dc)) {
+            return;
         }
 
         if (!compile && !this.useArduinoCli()) {
@@ -174,6 +166,10 @@ export class ArduinoApp {
             args.push("--port", dc.port);
         }
         args.push(appPath);
+        if (!await this.runPreBuildCommand(dc)) {
+            return;
+        }
+
         if (VscodeSettings.getInstance().logLevel === "verbose") {
             args.push("--verbose");
         }
@@ -228,16 +224,8 @@ export class ArduinoApp {
 
         arduinoChannel.start(`Verify sketch - ${dc.sketch}`);
 
-        if (dc.prebuild) {
-            arduinoChannel.info(`Run prebuild command: ${dc.prebuild}`);
-            const prebuildargs = dc.prebuild.split(" ");
-            const prebuildCommand = prebuildargs.shift();
-            try {
-                await util.spawn(prebuildCommand, arduinoChannel.channel, prebuildargs, { shell: true, cwd: ArduinoWorkspace.rootPath });
-            } catch (ex) {
-                arduinoChannel.error(`Run prebuild failed: \n${ex.error}`);
-                return;
-            }
+        if (!await this.runPreBuildCommand(dc)) {
+            return false;
         }
 
         const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
@@ -779,6 +767,33 @@ export class ArduinoApp {
         this._programmerManager = value;
     }
 
+    /**
+     * Runs the pre build command.
+     * Usually before one of
+     *  * verify
+     *  * upload
+     *  * upload using programmer
+     * @param dc Device context prepared during one of the above actions
+     * @returns True if successful, false on error.
+     */
+    protected async runPreBuildCommand(dc: DeviceContext): Promise<boolean> {
+        if (dc.prebuild) {
+            arduinoChannel.info(`Running pre-build command: ${dc.prebuild}`);
+            const prebuildargs = dc.prebuild.split(" ");
+            const prebuildCommand = prebuildargs.shift();
+            try {
+                await util.spawn(prebuildCommand,
+                                 arduinoChannel.channel,
+                                 prebuildargs,
+                                 { shell: true, cwd: ArduinoWorkspace.rootPath });
+            } catch (ex) {
+                arduinoChannel.error(`Running pre-build command failed: ${os.EOL}${ex.error}`);
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * Checks if the arduino cli is being used
      * @returns {bool} - true if arduino cli is being use