|
@@ -21,17 +21,17 @@ public class LoadTools {
|
|
|
|
|
|
private static void download(Transfer t, ProgressListener progressListener) throws IOException {
|
|
|
Request request = new Request.Builder()
|
|
|
- .url(t.from)
|
|
|
- .build();
|
|
|
+ .url(t.from)
|
|
|
+ .build();
|
|
|
|
|
|
OkHttpClient client = new OkHttpClient.Builder()
|
|
|
- .addNetworkInterceptor(chain -> {
|
|
|
- Response originalResponse = chain.proceed(chain.request());
|
|
|
- return originalResponse.newBuilder()
|
|
|
- .body(new ProgressResponseBody(originalResponse.body(), progressListener))
|
|
|
- .build();
|
|
|
- })
|
|
|
- .build();
|
|
|
+ .addNetworkInterceptor(chain -> {
|
|
|
+ Response originalResponse = chain.proceed(chain.request());
|
|
|
+ return originalResponse.newBuilder()
|
|
|
+ .body(new ProgressResponseBody(originalResponse.body(), progressListener))
|
|
|
+ .build();
|
|
|
+ })
|
|
|
+ .build();
|
|
|
var call = client.newCall(request);
|
|
|
t.call = call;
|
|
|
call.enqueue(new Callback() {
|
|
@@ -71,59 +71,60 @@ public class LoadTools {
|
|
|
};
|
|
|
|
|
|
OkHttpClient client = new OkHttpClient();
|
|
|
- Request request = new Request.Builder()
|
|
|
- .url(t.to)
|
|
|
- .post(requestBody)
|
|
|
- .build();
|
|
|
+ var requestBuilder = new Request.Builder().url(t.to);
|
|
|
+ if(t.toMethod.equals("PUT"))
|
|
|
+ requestBuilder.put(requestBody);
|
|
|
+ else
|
|
|
+ requestBuilder.post(requestBody);
|
|
|
|
|
|
+ var request=requestBuilder.build();
|
|
|
client.newCall(request).enqueue(
|
|
|
- new Callback() {
|
|
|
- @Override
|
|
|
- public void onFailure(Call call, IOException e) {
|
|
|
- t.uploadError = e.toString();
|
|
|
+ new Callback() {
|
|
|
+ @Override
|
|
|
+ public void onFailure(Call call, IOException e) {
|
|
|
+ t.uploadError = e.toString();
|
|
|
+ finishTransfer(t);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onResponse(Call call, Response response) throws IOException {
|
|
|
+ if (!response.isSuccessful()) {
|
|
|
+ t.uploadError = response.toString();
|
|
|
finishTransfer(t);
|
|
|
}
|
|
|
-
|
|
|
- @Override
|
|
|
- public void onResponse(Call call, Response response) throws IOException {
|
|
|
- if (!response.isSuccessful()) {
|
|
|
- t.uploadError = response.toString();
|
|
|
- finishTransfer(t);
|
|
|
- }
|
|
|
- t.uploadCode = response.code();
|
|
|
- t.uploadResponseBody = response.body().string();
|
|
|
- t.uploadDone = true;
|
|
|
- if (t.cpeeCallback != null) {
|
|
|
- try {
|
|
|
- OkHttpClient client = new OkHttpClient();
|
|
|
- Request request = new Request.Builder()
|
|
|
- .url(t.cpeeCallback + "/")
|
|
|
- .put(RequestBody.create(MEDIA_TYPE_JSON, "[{}]"))
|
|
|
- .build();
|
|
|
- logger.info("putting to {}", t.cpeeCallback);
|
|
|
- Response res = client.newCall(request).execute();
|
|
|
- logger.info("result {}", res.toString());
|
|
|
- t.cpeeCallbackResult = res.body().string();
|
|
|
- t.cpeeCallbackCode = res.code();
|
|
|
- t.cpeeCallbackMessage = res.message();
|
|
|
- } catch (Exception e) {
|
|
|
- logger.warn("cpee callback failed", e);
|
|
|
- t.cpeeCallbackError = e.getMessage();
|
|
|
- finishTransfer(t);
|
|
|
- }
|
|
|
- }
|
|
|
- else {
|
|
|
+ t.uploadCode = response.code();
|
|
|
+ t.uploadResponseBody = response.body().string();
|
|
|
+ t.uploadDone = true;
|
|
|
+ if (t.cpeeCallback != null) {
|
|
|
+ try {
|
|
|
+ OkHttpClient client = new OkHttpClient();
|
|
|
+ Request request = new Request.Builder()
|
|
|
+ .url(t.cpeeCallback + "/")
|
|
|
+ .put(RequestBody.create(MEDIA_TYPE_JSON, "[{}]"))
|
|
|
+ .build();
|
|
|
+ logger.info("putting to {}", t.cpeeCallback);
|
|
|
+ Response res = client.newCall(request).execute();
|
|
|
+ logger.info("result {}", res.toString());
|
|
|
+ t.cpeeCallbackResult = res.body().string();
|
|
|
+ t.cpeeCallbackCode = res.code();
|
|
|
+ t.cpeeCallbackMessage = res.message();
|
|
|
+ } catch (Exception e) {
|
|
|
+ logger.warn("cpee callback failed", e);
|
|
|
+ t.cpeeCallbackError = e.getMessage();
|
|
|
finishTransfer(t);
|
|
|
}
|
|
|
}
|
|
|
+ else {
|
|
|
+ finishTransfer(t);
|
|
|
+ }
|
|
|
}
|
|
|
+ }
|
|
|
);
|
|
|
}
|
|
|
|
|
|
public static void startTransfer(Transfer t) throws IOException {
|
|
|
final ProgressListener progressListener = new ProgressListener() {
|
|
|
boolean firstUpdate = true;
|
|
|
-
|
|
|
@Override
|
|
|
public void update(long bytesRead, long contentLength, boolean done) {
|
|
|
if (done) {
|