Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upload progress recipe #8493

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 134 additions & 0 deletions samples/guide/src/main/java/okhttp3/recipes/UploadProgress.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
/*
* Copyright (C) 2015 Square, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package okhttp3.recipes;

import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import okio.Buffer;
import okio.BufferedSink;
import okio.ForwardingSink;
import okio.Okio;
import okio.Sink;
import java.io.File;
import java.io.IOException;

public final class UploadProgress {
private static final String IMGUR_CLIENT_ID = "9199fdef135c122";
private static final MediaType MEDIA_TYPE_PNG = MediaType.get("image/png");

private final OkHttpClient client = new OkHttpClient();

public void run() throws Exception {
// Use the imgur image upload API as documented at https://api.imgur.com/endpoints/image
final ProgressListener progressListener = new ProgressListener() {
boolean firstUpdate = true;

@Override public void update(long bytesWritten, long contentLength, boolean done) {
if (done) {
System.out.println("completed");
} else {
if (firstUpdate) {
firstUpdate = false;
if (contentLength == -1) {
System.out.println("content-length: unknown");
} else {
System.out.format("content-length: %d\n", contentLength);
}
}

System.out.println(bytesWritten);

if (contentLength != -1) {
System.out.format("%d%% done\n", (100 * bytesWritten) / contentLength);
}
}
}
};

RequestBody requestBody = RequestBody.create(
new File("docs/images/logo-square.png"),
MEDIA_TYPE_PNG);

Request request = new Request.Builder()
.header("Authorization", "Client-ID " + IMGUR_CLIENT_ID)
.url("https://api.imgur.com/3/image")
.post(new ProgressRequestBody(requestBody, progressListener))
.build();

Response response = client.newCall(request).execute();
if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);

System.out.println(response.body().string());
}

public static void main(String... args) throws Exception {
new UploadProgress().run();
}

private static class ProgressRequestBody extends RequestBody {

private final ProgressListener progressListener;
private final RequestBody requestBody;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename to delegate ?


public ProgressRequestBody(RequestBody requestBody, ProgressListener progressListener) {
this.requestBody = requestBody;
this.progressListener = progressListener;
}

@Override
public MediaType contentType() {
return requestBody.contentType();
}

@Override
public long contentLength() throws IOException {
return requestBody.contentLength();
}

@Override
public void writeTo(BufferedSink sink) throws IOException {
BufferedSink bufferSink = Okio.buffer(sink(sink));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

supernit: bufferedSink, not bufferSink

requestBody.writeTo(bufferSink);
bufferSink.close();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this, the implementation of writeTo() shouldn’t close sink

}

public Sink sink(Sink sink) {
return new ForwardingSink(sink) {
private long totalBytesWritten = 0L;

@Override
public void write(Buffer source, long byteCount) throws IOException {
super.write(source, byteCount);
totalBytesWritten += byteCount;
progressListener.update(totalBytesWritten, contentLength(), false);
}

@Override
public void close() throws IOException {
super.close();
progressListener.update(totalBytesWritten, contentLength(),true);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

supernit: formatting. Space after ,

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MIGHT want to make this only call progressListener.update() once even if close() is called multiple times. You’re allowed to call close() multiple times but listeners shouldn’t be called more than once

}
};
}
}

interface ProgressListener {
void update(long bytesWritten, long contentLength, boolean done);
}
}