Fix moving non zipped uploaded dataset to target folder (#8103)

scalableminds · Sep 25, 2024 · ce8ffb3 · ce8ffb3
1 parent e24ef21
commit ce8ffb3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -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
 

diff --git a/conf/messages b/conf/messages
@@ -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.

diff --git a/frontend/javascripts/admin/dataset/dataset_add_view.tsx b/frontend/javascripts/admin/dataset/dataset_add_view.tsx
@@ -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={{

diff --git a/util/src/main/scala/com/scalableminds/util/io/PathUtils.scala b/util/src/main/scala/com/scalableminds/util/io/PathUtils.scala
@@ -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))