Skip to content

Commit

Permalink
Fix windows s3 uri slashes. Update dependencies.
Browse files Browse the repository at this point in the history
 * Update scijava, update n5 exceptions.
 * Upgrade dependencies to latest version.
 * Fix subpath deduction in uninitialized s3 client case.
  • Loading branch information
kgabor committed Mar 21, 2024
1 parent 42d6ee8 commit d3a7252
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 15 deletions.
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>36.0.0</version>
<version>37.0.0</version>
</parent>

<groupId>org.bigdataviewer</groupId>
Expand Down Expand Up @@ -87,9 +87,9 @@
<license.licenseName>bsd_2</license.licenseName>
<license.copyrightOwners>BigDataViewer developers.</license.copyrightOwners>

<n5.version>3.0.2</n5.version>
<n5-aws-s3.version>4.0.1</n5-aws-s3.version>
<n5-zarr.version>1.0.1</n5-zarr.version>
<n5.version>3.2.0</n5.version>
<n5-aws-s3.version>4.1.2</n5-aws-s3.version>
<n5-zarr.version>1.3.1</n5-zarr.version>

<!-- NB: Deploy releases to the SciJava Maven repository. -->
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
Expand Down
17 changes: 9 additions & 8 deletions src/main/java/bdv/img/omezarr/MultiscaleImage.java
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,10 @@ public ZarrKeyValueReader build() throws N5Exception {
*/
public ZarrKeyValueReaderBuilder getSubImage(final String subPath) {
final ZarrKeyValueReaderBuilder z = new ZarrKeyValueReaderBuilder(this);
if (s3Client == null) {
z.multiscalePath = Paths.get(z.multiscalePath, subPath).toString();
} else {
if (s3Mode) {
z.multiscalePath = z.multiscalePath + "/" + subPath;
} else {
z.multiscalePath = Paths.get(z.multiscalePath, subPath).toString();
}
return z;
}
Expand Down Expand Up @@ -279,7 +279,7 @@ private void initImages()
{
if (imgs != null)
return;
try {
// try {
// final ZarrKeyValueReader zarrKeyValueReader = zarrKeyValueReaderBuilder.create();
// Initialize the images for all resolutions.
//
Expand All @@ -297,10 +297,11 @@ private void initImages()
else
vimgs[ resolution ] = VolatileViews.wrapAsVolatile( imgs[ resolution ], queue );
}
} catch (IOException e) {
e.printStackTrace();
throw new RuntimeException(e);
}
// }
// catch (IOException e) {
// e.printStackTrace();
// throw new RuntimeException(e);
// }

}

Expand Down
8 changes: 5 additions & 3 deletions src/main/java/bdv/img/omezarr/XmlIoZarrImageLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ public Element toXml(final ZarrImageLoader imgLoader, final File basePath )
@Override
public ZarrImageLoader fromXml(final Element elem, final File basePath, final AbstractSequenceDescription< ?, ?, ? > sequenceDescription )
{
final File zpath = loadPath( elem, "zarr", basePath );
final Element zgroupsElem = elem.getChild( "zgroups" );
final TreeMap<ViewId, String > zgroups = new TreeMap<>();
// TODO validate that sequenceDescription and zgroups have the same entries
Expand All @@ -105,11 +104,14 @@ public ZarrImageLoader fromXml(final Element elem, final File basePath, final Ab
final MultiscaleImage.ZarrKeyValueReaderBuilder keyValueReaderBuilder;
if (s3Bucket==null)
{
keyValueReaderBuilder = new MultiscaleImage.ZarrKeyValueReaderBuilder(zpath.getAbsolutePath());
final File zpath = loadPath( elem, "zarr", basePath );
keyValueReaderBuilder = new MultiscaleImage.ZarrKeyValueReaderBuilder(zpath.getAbsolutePath());
}
else
{
keyValueReaderBuilder = new MultiscaleImage.ZarrKeyValueReaderBuilder(s3Bucket.getText(), zpath.toString());
// `File` class should not be used for uri manipulation as it replaces slashes with backslashes on Windows
keyValueReaderBuilder = new MultiscaleImage.ZarrKeyValueReaderBuilder(s3Bucket.getText(),
elem.getChildText("zarr"));
}
return new ZarrImageLoader(keyValueReaderBuilder, zgroups, sequenceDescription);
}
Expand Down

0 comments on commit d3a7252

Please sign in to comment.