rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Code Issues Releases Activity

httpuploader first checks if the board is ready, then uploads the sketch

Browse Source
This commit is contained in:
Federico Fissore 2013-05-16 10:46:17 +02:00
parent ef9070e85c
commit f830e00916
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/processing/app/debug/HttpUploader.java
View File

@ -2,6 +2,7 @@ package processing.app.debug;
import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.multipart.FilePart; import org.apache.commons.httpclient.methods.multipart.FilePart;
import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity; import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
@ -29,15 +30,16 @@ public class HttpUploader extends Uploader {
private final HttpClient client; private final HttpClient client;
private final String ipAddress; private final String ipAddress;
private final String baseUrl;
public HttpUploader(String port) { public HttpUploader(String port) {
this.client = new HttpClient(); this.client = new HttpClient();
this.client.getHttpConnectionManager().getParams().setConnectionTimeout(5000);
Matcher matcher = IPV4_ADDRESS.matcher(port); Matcher matcher = IPV4_ADDRESS.matcher(port);
if (!matcher.find()) { if (!matcher.find()) {
throw new IllegalArgumentException(port); throw new IllegalArgumentException(port);
} }
this.ipAddress = matcher.group(1); this.ipAddress = matcher.group(1);
this.baseUrl = "https://" + ipAddress;
} }
public boolean requiresAuthorization() { public boolean requiresAuthorization() {
@ -55,6 +57,21 @@ public class HttpUploader extends Uploader {
return false; return false;
} }
this.client.getHttpConnectionManager().getParams().setConnectionTimeout(5000);
int sleptTimes = 1;
while (boardNotReady()) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
throw new RunnerException(e);
}
if (sleptTimes >= 3) {
throw new RunnerException("The board is not yet ready");
}
sleptTimes += 1;
}
FilePart sketch; FilePart sketch;
try { try {
sketch = new FilePart("sketch", new File(buildPath, className + ".hex")); sketch = new FilePart("sketch", new File(buildPath, className + ".hex"));
@ -88,8 +105,17 @@ public class HttpUploader extends Uploader {
} }
} }
protected boolean boardNotReady() {
GetMethod get = new GetMethod(baseUrl + "/ready");
try {
return client.executeMethod(get) != HttpStatus.SC_OK;
} catch (IOException e) {
return true;
}
}
protected PostMethod newPostMethod() { protected PostMethod newPostMethod() {
return new PostMethod("https://" + ipAddress + "/upload"); return new PostMethod(baseUrl + "/upload");
} }
@Override @Override