Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Propagate delimiter changes to LocalBlobStore. 

Propagates the changes to add delimiter support to the local blob
store. The prefix option no longer works with the non-recursive
option. The caller _must_ set the delimiter option to enable the same
functionality.
This commit is contained in:
Timur Alperovich 2015-07-13 17:19:13 -07:00 committed by Andrew Gaul
parent e4161a59bb
commit 19d54369db
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
View File

@ -344,8 +344,8 @@ public final class LocalBlobStore implements BlobStore {
} }
})); }));
if (!options.isRecursive()) { if (options.getDelimiter() != null) {
return extractCommonPrefixes(contents, storageStrategy.getSeparator(), options.getPrefix()); return extractCommonPrefixes(contents, options.getDelimiter(), options.getPrefix());
} }
return contents; return contents;
@ -472,14 +472,7 @@ public final class LocalBlobStore implements BlobStore {
if (prefix == null || prefix.isEmpty()) { if (prefix == null || prefix.isEmpty()) {
return name.indexOf(delimiter) == -1; return name.indexOf(delimiter) == -1;
} }
String prefixMatch; if (name.startsWith(prefix)) {
if (prefix.endsWith(delimiter)) {
prefixMatch = "^" + Pattern.quote(prefix) + ".*";
} else {
// We should correctly match strings like "foobar/" where the prefix is only "foo"
prefixMatch = "^" + Pattern.quote(prefix) + ".*" + Pattern.quote(delimiter) + ".*";
}
if (name.matches(prefixMatch)) {
String unprefixedName = name.replaceFirst(prefix, ""); String unprefixedName = name.replaceFirst(prefix, "");
if (unprefixedName.equals("")) { if (unprefixedName.equals("")) {
// we are the prefix in this case, return false // we are the prefix in this case, return false