Fail on missing port only if necessary

Should fix arduino#8052

Author: facchinm

app/src/processing/app/SketchController.java

@@ -27,6 +27,7 @@
 import cc.arduino.CompilerProgressListener;
 import cc.arduino.UploaderUtils;
 import cc.arduino.packages.Uploader;
+import cc.arduino.packages.uploaders.MissingSerialPortException;
 import processing.app.debug.RunnerException;
 import processing.app.forms.PasswordAuthorizationDialog;
 import processing.app.helpers.FileUtils;
@@ -734,6 +735,9 @@ private boolean upload(String suggestedClassName, boolean usingProgrammer) throw
       List<String> warningsAccumulator = new LinkedList<>();
       try {
         success = uploaderInstance.upload(sketch, uploader, suggestedClassName, usingProgrammer, false, warningsAccumulator);
+      } catch (MissingSerialPortException e) {
+        editor.statusError(tr("Please select a Port before Upload"));
+        return false;
       } finally {
         if (uploader.requiresAuthorization() && !success) {
           PreferencesData.remove(uploader.getAuthorizationKey());

arduino-core/src/cc/arduino/UploaderUtils.java

@@ -51,10 +51,9 @@ public Uploader getUploaderByPreferences(boolean noUploadPort) {
     BoardPort boardPort = null;
     if (!noUploadPort) {
       String port = PreferencesData.get("serial.port");
-      if (port == null || port.isEmpty()) {
-        return null;
+      if (port != null && !port.isEmpty()) {
+        boardPort = BaseNoGui.getDiscoveryManager().find(port);
       }
-      boardPort = BaseNoGui.getDiscoveryManager().find(port);
     }
 
     return new UploaderFactory().newUploader(target.getBoards().get(board), boardPort, noUploadPort);

arduino-core/src/cc/arduino/packages/UploaderFactory.java

@@ -38,7 +38,7 @@ public class UploaderFactory {
 
   public Uploader newUploader(TargetBoard board, BoardPort port, boolean noUploadPort) {
     if (noUploadPort) {
-      return new SerialUploader(true);
+      return new SerialUploader(port, true);
     }
 
     if (port != null && "network".equals(port.getProtocol())) {
@@ -48,7 +48,7 @@ public Uploader newUploader(TargetBoard board, BoardPort port, boolean noUploadP
       return new SSHUploader(port);
     }
 
-    return new SerialUploader();
+    return new SerialUploader(port);
   }
 
 }

arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java

@@ -51,14 +51,24 @@
 
 public class SerialUploader extends Uploader {
 
+  private BoardPort boardPort;
+
   public SerialUploader()
   {
     super();
+    this.boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
   }
 
-  public SerialUploader(boolean noUploadPort)
+  public SerialUploader(BoardPort port)
+  {
+    super();
+    this.boardPort = port;
+  }
+
+  public SerialUploader(BoardPort port, boolean noUploadPort)
   {
     super(noUploadPort);
+    this.boardPort = port;
   }
 
   @Override
@@ -108,6 +118,7 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
       boolean uploadResult;
       try {
         String pattern = prefs.getOrExcept("upload.pattern");
+        validatePattern(pattern, prefs);
         String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
         uploadResult = executeUploadCommand(cmd);
       } catch (Exception e) {
@@ -178,9 +189,9 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
       Thread.sleep(100);
       BaseNoGui.getDiscoveryManager().getSerialDiscoverer().forceRefresh();
       Thread.sleep(100);
+      boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
     }
 
-    BoardPort boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
     try {
       prefs.put("serial.port.iserial", boardPort.getPrefs().getOrExcept("iserial"));
     } catch (Exception e) {
@@ -203,6 +214,7 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
     boolean uploadResult;
     try {
       String pattern = prefs.getOrExcept("upload.pattern");
+      validatePattern(pattern, prefs);
       String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
       uploadResult = executeUploadCommand(cmd);
     } catch (RunnerException e) {
@@ -251,7 +263,13 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
     return uploadResult;
   }
 
-  private String waitForUploadPort(String uploadPort, List<String> before) throws InterruptedException, RunnerException {
+  private void validatePattern(String pattern, PreferencesMap prefs) throws MissingSerialPortException {
+	if (pattern.contains("serial.port") && boardPort == null) {
+		throw new MissingSerialPortException();
+	}
+  }
+
+private String waitForUploadPort(String uploadPort, List<String> before) throws InterruptedException, RunnerException {
     // Wait for a port to appear on the list
     int elapsed = 0;
     while (elapsed < 10000) {
@@ -339,6 +357,7 @@ private boolean uploadUsingProgrammer(String buildPath, String className) throws
       // }
 
       String pattern = prefs.getOrExcept("program.pattern");
+      validatePattern(pattern, prefs);
       String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
       return executeUploadCommand(cmd);
     } catch (RunnerException e) {
@@ -403,11 +422,13 @@ public boolean burnBootloader() throws Exception {
     new LoadVIDPIDSpecificPreferences().load(prefs);
 
     String pattern = prefs.getOrExcept("erase.pattern");
+    validatePattern(pattern, prefs);
     String[] cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
     if (!executeUploadCommand(cmd))
       return false;
 
     pattern = prefs.getOrExcept("bootloader.pattern");
+    validatePattern(pattern, prefs);
     cmd = StringReplacer.formatAndSplit(pattern, prefs, true);
     return executeUploadCommand(cmd);
   }