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

Use path and path prefix correctly in S3

Browse Source
This commit is contained in:
Julian Raufelder 2021-05-11 17:04:07 +02:00
parent 5e0f88bcff
commit bf2341af21
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudNodeFactory.java
View File

@ -33,7 +33,7 @@ class S3CloudNodeFactory {
} }
private static String getNodePath(S3Folder parent, String name) { private static String getNodePath(S3Folder parent, String name) {
return parent.getKey() + name; return parent.getPath() + "/" + name;
} }
public static String getNameFromKey(String key) { public static String getNameFromKey(String key) {

5
data/src/main/java/org/cryptomator/data/cloud/s3/S3File.java
View File

@ -8,6 +8,8 @@ import java.util.Date;
class S3File implements CloudFile, S3Node { class S3File implements CloudFile, S3Node {
private static final String DELIMITER = "/";
private final S3Folder parent; private final S3Folder parent;
private final String name; private final String name;
private final String path; private final String path;
@ -39,6 +41,9 @@ class S3File implements CloudFile, S3Node {
@Override @Override
public String getKey() { public String getKey() {
if (path.startsWith(DELIMITER)) {
return path.substring(DELIMITER.length());
}
return path; return path;
} }

3
data/src/main/java/org/cryptomator/data/cloud/s3/S3Folder.java
View File

@ -34,6 +34,9 @@ class S3Folder implements CloudFolder, S3Node {
@Override @Override
public String getKey() { public String getKey() {
if (path.startsWith(DELIMITER)) {
return path.substring(DELIMITER.length()) + DELIMITER;
}
return path + DELIMITER; return path + DELIMITER;
} }

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

@ -184,7 +184,7 @@ class S3Impl {
targetKey = S3CloudNodeFactory.file((S3Folder) target, node.getName()).getKey(); targetKey = S3CloudNodeFactory.file((S3Folder) target, node.getName()).getKey();
} }
CopySource copySource = CopySource.builder().bucket(cloud.s3Bucket()).object(node.getPath()).build(); CopySource copySource = CopySource.builder().bucket(cloud.s3Bucket()).object(node.getKey()).build();
CopyObjectArgs copyObjectArgs = CopyObjectArgs.builder().bucket(cloud.s3Bucket()).object(targetKey).source(copySource).build(); CopyObjectArgs copyObjectArgs = CopyObjectArgs.builder().bucket(cloud.s3Bucket()).object(targetKey).source(copySource).build();
try { try {
@ -206,8 +206,8 @@ class S3Impl {
return S3CloudNodeFactory.folder(target.getParent(), target.getName()); return S3CloudNodeFactory.folder(target.getParent(), target.getName());
} else { } else {
CopySource copySource = CopySource.builder().bucket(cloud.s3Bucket()).object(source.getPath()).build(); CopySource copySource = CopySource.builder().bucket(cloud.s3Bucket()).object(source.getKey()).build();
CopyObjectArgs copyObjectArgs = CopyObjectArgs.builder().bucket(cloud.s3Bucket()).object(target.getPath()).source(copySource).build(); CopyObjectArgs copyObjectArgs = CopyObjectArgs.builder().bucket(cloud.s3Bucket()).object(target.getKey()).source(copySource).build();
try { try {
ObjectWriteResponse result = client().copyObject(copyObjectArgs); ObjectWriteResponse result = client().copyObject(copyObjectArgs);
@ -247,7 +247,7 @@ class S3Impl {
StatObjectResponse statObjectResponse = client().statObject(StatObjectArgs // StatObjectResponse statObjectResponse = client().statObject(StatObjectArgs //
.builder() // .builder() //
.bucket(cloud.s3Bucket()) // .bucket(cloud.s3Bucket()) //
.object(file.getPath()) // .object(file.getKey()) //
.build()); .build());
progressAware.onProgress(Progress.completed(UploadState.upload(file))); progressAware.onProgress(Progress.completed(UploadState.upload(file)));
return S3CloudNodeFactory.file(file.getParent(), file.getName(), Optional.of(statObjectResponse.size()), Optional.of(Date.from(statObjectResponse.lastModified().toInstant()))); return S3CloudNodeFactory.file(file.getParent(), file.getName(), Optional.of(statObjectResponse.size()), Optional.of(Date.from(statObjectResponse.lastModified().toInstant())));
@ -262,7 +262,7 @@ class S3Impl {
public void read(S3File file, OutputStream data, final ProgressAware<DownloadState> progressAware) throws IOException, BackendException { public void read(S3File file, OutputStream data, final ProgressAware<DownloadState> progressAware) throws IOException, BackendException {
progressAware.onProgress(Progress.started(DownloadState.download(file))); progressAware.onProgress(Progress.started(DownloadState.download(file)));
GetObjectArgs getObjectArgs = GetObjectArgs.builder().bucket(cloud.s3Bucket()).object(file.getPath()).build(); GetObjectArgs getObjectArgs = GetObjectArgs.builder().bucket(cloud.s3Bucket()).object(file.getKey()).build();
try (GetObjectResponse response = client().getObject(getObjectArgs); // try (GetObjectResponse response = client().getObject(getObjectArgs); //
TransferredBytesAwareOutputStream out = new TransferredBytesAwareOutputStream(data) { TransferredBytesAwareOutputStream out = new TransferredBytesAwareOutputStream(data) {