Handle deletion of fully linked layer with all mags seperately linked

Author: frcroth

util/src/main/scala/com/scalableminds/util/mvc/Formatter.scala

@@ -92,6 +92,12 @@ trait Formatter {
         case _                                     => ""
       }
 
+    def firstException(failure: Failure): String =
+      failure.exception match {
+        case Full(exception) => exception.toString + ": "
+        case _               => ""
+      }
+
     def formatNextChain(chainBox: Box[Failure]): String = chainBox match {
       case Full(chainFailure) =>
         " <~ " + formatFailureChain(chainFailure, includeStackTraces, includeTime = false, messagesProviderOpt)
@@ -108,7 +114,8 @@ trait Formatter {
       }
 
     val serverTimeMsg = if (includeTime) s"[Server Time ${Instant.now}] " else ""
-    serverTimeMsg + formatOneFailure(failure) + formatStackTrace(failure) + formatNextChain(failure.chain)
+    serverTimeMsg + firstException(failure) + formatOneFailure(failure) + formatStackTrace(failure) + formatNextChain(
+      failure.chain)
   }
 
 }

webknossos-datastore/app/com/scalableminds/webknossos/datastore/helpers/DatasetDeleter.scala

@@ -10,7 +10,8 @@ import com.scalableminds.webknossos.datastore.services.DSRemoteWebknossosClient
 import com.scalableminds.webknossos.datastore.storage.DataVaultService
 import com.typesafe.scalalogging.LazyLogging
 import net.liftweb.common.Box.tryo
-import net.liftweb.common.{Box, EmptyBox, Full}
+import net.liftweb.common.{Box, Full}
+import org.apache.commons.io.FileUtils
 
 import java.io.File
 import java.nio.file.{Files, Path}
@@ -192,6 +193,11 @@ trait DatasetDeleter extends LazyLogging with DirectoryConstants {
     if (Files.exists(targetPath) && Files.isSymbolicLink(targetPath)) {
       Files.delete(targetPath)
     }
+    if (Files.exists(targetPath) && Files.isDirectory(targetPath)) {
+      // This happens when the fully linked layer consists of mag symlinks. The directory exists and is full of symlinked mags.
+      // We need to delete the directory before moving the layer.
+      FileUtils.deleteDirectory(targetPath.toFile)
+    }
     Files.move(layerPath, targetPath)
 
     // All symlinks are now broken, we need to recreate them