Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix already upload of zarr datasets with already existing datasource-properties.json file #8268

Merged
merged 3 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released

### Fixed
- Fixed that listing datasets with the `api/datasets` route without compression failed due to missing permissions regarding public datasets. [#8249](https://github.com/scalableminds/webknossos/pull/8249)
- Fixed a bug that uploading a zarr dataset with an already existing `datasource-properties.json` file failed. [#8268](https://github.com/scalableminds/webknossos/pull/8268)
- Fixed that the frontend did not ensure a minium length for annotation layer names. Moreover, names starting with a `.` are also disallowed now. [#8244](https://github.com/scalableminds/webknossos/pull/8244)
- Fixed a bug where in the add remote dataset view the dataset name setting was not in sync with the datasource setting of the advanced tab making the form not submittable. [#8245](https://github.com/scalableminds/webknossos/pull/8245)
- Fix read and update dataset route for versions 8 and lower. [#8263](https://github.com/scalableminds/webknossos/pull/8263)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -466,10 +466,10 @@ class UploadService @Inject()(dataSourceRepository: DataSourceRepository,
}

private def guessTypeOfUploadedDataSource(dataSourceDir: Path): UploadedDataSourceType.Value =
if (looksLikeZarrArray(dataSourceDir, maxDepth = 2).openOr(false)) {
UploadedDataSourceType.ZARR
} else if (looksLikeExploredDataSource(dataSourceDir).openOr(false)) {
if (looksLikeExploredDataSource(dataSourceDir).openOr(false)) {
UploadedDataSourceType.EXPLORED
} else if (looksLikeZarrArray(dataSourceDir, maxDepth = 2).openOr(false)) {
UploadedDataSourceType.ZARR
} else if (looksLikeZarrArray(dataSourceDir, maxDepth = 3).openOr(false)) {
UploadedDataSourceType.ZARR_MULTILAYER
} else if (looksLikeNeuroglancerPrecomputed(dataSourceDir, 1).openOr(false)) {
Expand Down