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.

Sign up for GitHub

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

Jump to bottom

Fix moving non zipped uploaded dataset to target folder #8103

Merged
merged 4 commits into from
Sep 25, 2024
Merged

Fix moving non zipped uploaded dataset to target folder #8103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39871fe
fix removing last name from path when moving uploaded non zipped dataset
Sep 25, 2024
151047b
add error message to failed try to move uploaded dataset
Sep 25, 2024
38ec571
remove redundant .
Sep 25, 2024
4f5f2ae
add pr to matching changelog entry
Sep 25, 2024
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
2 changes: 1 addition & 1 deletion CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- Some mesh-related actions were disabled in proofreading-mode when using meshfiles that were created for a mapping rather than an oversegmentation. [#8091](https://github.com/scalableminds/webknossos/pull/8091)

### Fixed
- Fixed a bug during dataset upload in case the configured `datastore.baseFolder` is an absolute path. [#8098](https://github.com/scalableminds/webknossos/pull/8098)
- Fixed a bug during dataset upload in case the configured `datastore.baseFolder` is an absolute path. [#8098](https://github.com/scalableminds/webknossos/pull/8098) [#8103](https://github.com/scalableminds/webknossos/pull/8103)

### Removed

Expand Down
1 change: 1 addition & 0 deletions conf/messages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ dataset.upload.couldNotLoadUnfinishedUploads=Could not load unfinished uploads o
dataset.upload.noFiles=Tried to finish upload with no files. May be a retry of a failed finish request, see previous errors.
dataset.upload.storageExceeded=Cannot upload dataset because the storage quota of the organization is exceeded.
dataset.upload.finishFailed=Failed to finalize dataset upload.
dataset.upload.moveToTarget.failed=Failed to move uploaded dataset to target directory.
dataset.explore.failed.readFile=Failed to read remote file
dataset.explore.magDtypeMismatch=Element class must be the same for all mags of a layer. Got {0}
dataset.explore.autoAdd.failed=Failed to automatically import the explored dataset.
Expand Down
2 changes: 1 addition & 1 deletion frontend/javascripts/admin/dataset/dataset_add_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ const getPostUploadModal = (
}}
>
The dataset was {addTypeToVerb[datasetAddType]} successfully
{datasetNeedsConversion ? " and a conversion job was started." : null}.
{datasetNeedsConversion ? " and a conversion job was started" : null}.
<br />
<div
style={{
Expand Down
2 changes: 1 addition & 1 deletion util/src/main/scala/com/scalableminds/util/io/PathUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ trait PathUtils extends LazyLogging {
private def removeOneName(path: Path): Path =
if (path.getNameCount == 1) {
Paths.get("")
} else path.subpath(0, path.getNameCount - 1)
} else path.getParent

def deleteDirectoryRecursively(path: Path): Box[Unit] = {
val directory = new Directory(new File(path.toString))
Expand Down