AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Improve chunked upload 2.0 in S3

Browse Source
This commit is contained in:
Julian Raufelder 2021-04-29 17:03:49 +02:00 committed by Manuel Jenny
parent 06c23abc62
commit 3894df1587
No known key found for this signature in database
GPG Key ID: 1C80FE62B2BEAA18
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/src/main/java/org/cryptomator/data/cloud/s3/S3Impl.java
View File

@ -204,7 +204,7 @@ class S3Impl {
progressAware.onProgress(Progress.started(UploadState.upload(file))); progressAware.onProgress(Progress.started(UploadState.upload(file)));
final CompletableFuture<ObjectMetadata> result = new CompletableFuture<>(); final CompletableFuture<Optional<ObjectMetadata>> result = new CompletableFuture<>();
if (size <= CHUNKED_UPLOAD_MAX_SIZE) { if (size <= CHUNKED_UPLOAD_MAX_SIZE) {
uploadFile(file, data, progressAware, result, size); uploadFile(file, data, progressAware, result, size);
@ -213,8 +213,8 @@ class S3Impl {
} }
try { try {
ObjectMetadata objectMetadata = result.get(); Optional<ObjectMetadata> objectMetadataOptional = result.get();
objectMetadata = objectMetadata == null ? client().getObjectMetadata(cloud.s3Bucket(), file.getPath()) : objectMetadata; ObjectMetadata objectMetadata = objectMetadataOptional.orElseGet(() -> client().getObjectMetadata(cloud.s3Bucket(), file.getPath()));
progressAware.onProgress(Progress.completed(UploadState.upload(file))); progressAware.onProgress(Progress.completed(UploadState.upload(file)));
return S3CloudNodeFactory.file(file.getParent(), file.getName(), objectMetadata); return S3CloudNodeFactory.file(file.getParent(), file.getName(), objectMetadata);
} catch (ExecutionException | InterruptedException e) { } catch (ExecutionException | InterruptedException e) {
@ -223,7 +223,7 @@ class S3Impl {
} }
private void uploadFile(final S3File file, DataSource data, final ProgressAware<UploadState> progressAware, CompletableFuture<ObjectMetadata> result, final long size) // private void uploadFile(final S3File file, DataSource data, final ProgressAware<UploadState> progressAware, CompletableFuture<Optional<ObjectMetadata>> result, final long size) //
throws IOException { throws IOException {
AtomicLong bytesTransferred = new AtomicLong(0); AtomicLong bytesTransferred = new AtomicLong(0);
ProgressListener listener = progressEvent -> { ProgressListener listener = progressEvent -> {
@ -241,10 +241,10 @@ class S3Impl {
PutObjectRequest request = new PutObjectRequest(cloud.s3Bucket(), file.getPath(), data.open(context), metadata); PutObjectRequest request = new PutObjectRequest(cloud.s3Bucket(), file.getPath(), data.open(context), metadata);
request.setGeneralProgressListener(listener); request.setGeneralProgressListener(listener);
result.complete(client().putObject(request).getMetadata()); result.complete(Optional.of(client().putObject(request).getMetadata()));
} }
private void uploadChunkedFile(final S3File file, DataSource data, final ProgressAware<UploadState> progressAware, CompletableFuture<ObjectMetadata> result, final long size) // private void uploadChunkedFile(final S3File file, DataSource data, final ProgressAware<UploadState> progressAware, CompletableFuture<Optional<ObjectMetadata>> result, final long size) //
throws IOException { throws IOException {
TransferUtility tu = TransferUtility // TransferUtility tu = TransferUtility //
@ -259,7 +259,7 @@ class S3Impl {
public void onStateChanged(int id, TransferState state) { public void onStateChanged(int id, TransferState state) {
if (state.equals(TransferState.COMPLETED)) { if (state.equals(TransferState.COMPLETED)) {
progressAware.onProgress(Progress.completed(UploadState.upload(file))); progressAware.onProgress(Progress.completed(UploadState.upload(file)));
result.complete(null); result.complete(Optional.empty());
} }
} }