Merge pull request #4794 from facchinm/upload_fail_handling

Handling gracefully upload failure

Author: sandeepmistry

app/src/processing/app/Sketch.java

@@ -1164,7 +1164,8 @@ private boolean exportApplet(String appletPath, boolean usingProgrammer)
 
   private boolean upload(String buildPath, String suggestedClassName, boolean usingProgrammer) throws Exception {
 
-    Uploader uploader = new UploaderUtils().getUploaderByPreferences(false);
+    UploaderUtils uploaderInstance = new UploaderUtils();
+    Uploader uploader = uploaderInstance.getUploaderByPreferences(false);
 
     boolean success = false;
     do {
@@ -1183,7 +1184,7 @@ private boolean upload(String buildPath, String suggestedClassName, boolean usin
 
       List<String> warningsAccumulator = new LinkedList<>();
       try {
-        success = new UploaderUtils().upload(data, uploader, buildPath, suggestedClassName, usingProgrammer, false, warningsAccumulator);
+        success = uploaderInstance.upload(data, uploader, buildPath, suggestedClassName, usingProgrammer, false, warningsAccumulator);
       } finally {
         if (uploader.requiresAuthorization() && !success) {
           PreferencesData.remove(uploader.getAuthorizationKey());
@@ -1198,6 +1199,14 @@ private boolean upload(String buildPath, String suggestedClassName, boolean usin
 
     } while (uploader.requiresAuthorization() && !success);
 
+    if (!success) {
+      String errorMessage = uploader.getFailureMessage();
+      if (errorMessage.equals("")) {
+        errorMessage = tr("An error occurred while uploading the sketch");
+      }
+      editor.statusError(errorMessage);
+    }
+
     return success;
   }
 

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

@@ -89,7 +89,7 @@ protected Uploader(boolean nup) {
   }
 
   private void init(boolean nup) {
-    this.error = null;
+    this.error = "";
     this.notFoundError = false;
     this.noUploadPort = nup;
   }
@@ -146,15 +146,13 @@ protected boolean executeUploadCommand(String command[]) throws Exception {
       e.printStackTrace();
     }
 
-    if (error != null) {
-      RunnerException exception = new RunnerException(error);
-      exception.hideStackTrace();
-      throw exception;
-    }
-
     return result == 0;
   }
 
+  public String getFailureMessage() {
+    return error;
+  }
+
   public void message(String s) {
     // selectively suppress a bunch of avrdude output for AVR109/Caterina that should already be quelled but isn't
     if (!verbose && StringUtils.stringContainsOneOf(s, STRINGS_TO_SUPPRESS)) {
@@ -164,8 +162,9 @@ public void message(String s) {
     System.err.print(s);
 
     // ignore cautions
-    if (s.contains("Error")) {
+    if (s.toLowerCase().contains("error")) {
       notFoundError = true;
+      error = s;
       return;
     }
     if (notFoundError) {

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

@@ -135,7 +135,7 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
       return runUploadTool(ssh, prefs);
     } catch (JSchException e) {
       String message = e.getMessage();
-      if ("Auth cancel".equals(message) || "Auth fail".equals(message)) {
+      if (message.contains("Auth cancel") || message.contains("Auth fail") || message.contains("authentication fail")) {
         return false;
       }
       if (e.getMessage().contains("Connection refused")) {