Commit 1a6be71

committed

Merge pull request arduino#4794 from facchinm/upload_fail_handling

Handling gracefully upload failure

2 parents 6521a7a + 0584b2c commit 1a6be71Copy full SHA for 1a6be71

File tree

3 files changed

+19

-11

lines changed

app/src/processing/app
- Sketch.java
arduino-core/src/cc/arduino/packages
- Uploader.java
- uploaders
  - SSHUploader.java

3 files changed

+19

-11

lines changed

`‎app/src/processing/app/Sketch.java‎`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1164,7 +1164,8 @@ private boolean exportApplet(String appletPath, boolean usingProgrammer)`
`1164`	`1164`
`1165`	`1165`	`private boolean upload(String buildPath, String suggestedClassName, boolean usingProgrammer) throws Exception {`
`1166`	`1166`
`1167`		`- Uploader uploader = new UploaderUtils().getUploaderByPreferences(false);`
	`1167`	`+ UploaderUtils uploaderInstance = new UploaderUtils();`
	`1168`	`+ Uploader uploader = uploaderInstance.getUploaderByPreferences(false);`
`1168`	`1169`
`1169`	`1170`	`boolean success = false;`
`1170`	`1171`	`do {`
`@@ -1183,7 +1184,7 @@ private boolean upload(String buildPath, String suggestedClassName, boolean usin`
`1183`	`1184`
`1184`	`1185`	`List<String> warningsAccumulator = new LinkedList<>();`
`1185`	`1186`	`try {`
`1186`		`- success = newUploaderUtils().upload(data, uploader, buildPath, suggestedClassName, usingProgrammer, false, warningsAccumulator);`
	`1187`	`+ success = uploaderInstance.upload(data, uploader, buildPath, suggestedClassName, usingProgrammer, false, warningsAccumulator);`
`1187`	`1188`	`} finally {`
`1188`	`1189`	`if (uploader.requiresAuthorization() && !success) {`
`1189`	`1190`	`PreferencesData.remove(uploader.getAuthorizationKey());`
`@@ -1198,6 +1199,14 @@ private boolean upload(String buildPath, String suggestedClassName, boolean usin`
`1198`	`1199`
`1199`	`1200`	`} while (uploader.requiresAuthorization() && !success);`
`1200`	`1201`
	`1202`	`+ if (!success) {`
	`1203`	`+ String errorMessage = uploader.getFailureMessage();`
	`1204`	`+ if (errorMessage.equals("")) {`
	`1205`	`+ errorMessage = tr("An error occurred while uploading the sketch");`
	`1206`	`+ }`
	`1207`	`+ editor.statusError(errorMessage);`
	`1208`	`+ }`
	`1209`	`+`
`1201`	`1210`	`return success;`
`1202`	`1211`	`}`
`1203`	`1212`

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

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ protected Uploader(boolean nup) {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`private void init(boolean nup) {`
`92`		`- this.error = null;`
	`92`	`+ this.error = "";`
`93`	`93`	`this.notFoundError = false;`
`94`	`94`	`this.noUploadPort = nup;`
`95`	`95`	`}`
`@@ -146,15 +146,13 @@ protected boolean executeUploadCommand(String command[]) throws Exception {`
`146`	`146`	`e.printStackTrace();`
`147`	`147`	`}`
`148`	`148`
`149`		`- if (error != null) {`
`150`		`- RunnerException exception = new RunnerException(error);`
`151`		`- exception.hideStackTrace();`
`152`		`- throw exception;`
`153`		`- }`
`154`		`-`
`155`	`149`	`return result == 0;`
`156`	`150`	`}`
`157`	`151`
	`152`	`+ public String getFailureMessage() {`
	`153`	`+ return error;`
	`154`	`+ }`
	`155`	`+`
`158`	`156`	`public void message(String s) {`
`159`	`157`	`// selectively suppress a bunch of avrdude output for AVR109/Caterina that should already be quelled but isn't`
`160`	`158`	`if (!verbose && StringUtils.stringContainsOneOf(s, STRINGS_TO_SUPPRESS)) {`
`@@ -164,8 +162,9 @@ public void message(String s) {`
`164`	`162`	`System.err.print(s);`
`165`	`163`
`166`	`164`	`// ignore cautions`
`167`		`- if (s.contains("Error")) {`
	`165`	`+ if (s.toLowerCase().contains("error")) {`
`168`	`166`	`notFoundError = true;`
	`167`	`+ error = s;`
`169`	`168`	`return;`
`170`	`169`	`}`
`171`	`170`	`if (notFoundError) {`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String`
`135`	`135`	`return runUploadTool(ssh, prefs);`
`136`	`136`	`} catch (JSchException e) {`
`137`	`137`	`String message = e.getMessage();`
`138`		`- if ("Auth cancel".equals(message) \|\| "Auth fail".equals(message)) {`
	`138`	`+ if (message.contains("Auth cancel") \|\| message.contains("Auth fail") \|\| message.contains("authentication fail")) {`
`139`	`139`	`return false;`
`140`	`140`	`}`
`141`	`141`	`if (e.getMessage().contains("Connection refused")) {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 1a6be71

File tree

3 files changed

3 files changed

`‎app/src/processing/app/Sketch.java‎`

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

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

0 commit comments