mirror
/
s3proxy
kopia lustrzana https://github.com/gaul/s3proxy
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Include root when checking list prefix

pull/719/head
Andrew Gaul 2024-12-01 22:56:50 -08:00
rodzic 9cc91bd014
commit 289573ee0e
1 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
src/main/java/org/gaul/s3proxy/nio2blob/AbstractNio2BlobStore.java
Wyświetl plik

@ -219,7 +219,7 @@ public abstract class AbstractNio2BlobStore extends BaseBlobStore {
} }
} }
private static void listHelper(ImmutableSortedSet.Builder<StorageMetadata> builder, private void listHelper(ImmutableSortedSet.Builder<StorageMetadata> builder,
String container, Path parent, String prefix, String delimiter) String container, Path parent, String prefix, String delimiter)
throws IOException { throws IOException {
logger.debug("recursing at: {} with prefix: {}", parent, prefix); logger.debug("recursing at: {} with prefix: {}", parent, prefix);
@ -229,7 +229,7 @@ public abstract class AbstractNio2BlobStore extends BaseBlobStore {
try (var stream = Files.newDirectoryStream(parent)) { try (var stream = Files.newDirectoryStream(parent)) {
for (var path : stream) { for (var path : stream) {
logger.debug("examining: {}", path); logger.debug("examining: {}", path);
if (!path.toString().startsWith(prefix.substring(1))) { if (!path.toString().startsWith(root + prefix)) {
continue; continue;
} else if (Files.isDirectory(path)) { } else if (Files.isDirectory(path)) {
if (!"/".equals(delimiter)) { if (!"/".equals(delimiter)) {
@ -239,7 +239,7 @@ public abstract class AbstractNio2BlobStore extends BaseBlobStore {
// Add a prefix if the directory blob exists or if the delimiter causes us not to recuse. // Add a prefix if the directory blob exists or if the delimiter causes us not to recuse.
var view = Files.getFileAttributeView(path, UserDefinedFileAttributeView.class); var view = Files.getFileAttributeView(path, UserDefinedFileAttributeView.class);
if (view != null && Set.copyOf(view.list()).contains(XATTR_CONTENT_MD5) || "/".equals(delimiter)) { if (view != null && Set.copyOf(view.list()).contains(XATTR_CONTENT_MD5) || "/".equals(delimiter)) {
var name = path.toString().substring((container + "/").length()); var name = path.toString().substring((root + "/" + container + "/").length());
builder.add(new StorageMetadataImpl( builder.add(new StorageMetadataImpl(
StorageType.RELATIVE_PATH, StorageType.RELATIVE_PATH,
/*id=*/ null, name + "/", /*id=*/ null, name + "/",
@ -249,7 +249,7 @@ public abstract class AbstractNio2BlobStore extends BaseBlobStore {
Map.of(), /*size=*/ null, Tier.STANDARD)); Map.of(), /*size=*/ null, Tier.STANDARD));
} }
} else { } else {
var name = path.toString().substring((container + "/").length()); var name = path.toString().substring((root + "/" + container + "/").length());
logger.debug("adding: {}", name); logger.debug("adding: {}", name);
var attr = Files.readAttributes(path, BasicFileAttributes.class); var attr = Files.readAttributes(path, BasicFileAttributes.class);
var lastModifiedTime = new Date(attr.lastModifiedTime().toMillis()); var lastModifiedTime = new Date(attr.lastModifiedTime().toMillis());