Remove WKWDataFormat

scalableminds · Mar 18, 2024 · c9f752a · c9f752a
1 parent 2849111
commit c9f752a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/...-datastore/app/com/scalableminds/webknossos/datastore/dataformats/wkw/WKWDataFormat.scala b/...-datastore/app/com/scalableminds/webknossos/datastore/dataformats/wkw/WKWDataFormat.scala
diff --git a/...ossos-datastore/app/com/scalableminds/webknossos/datastore/datareaders/wkw/WKWArray.scala b/...ossos-datastore/app/com/scalableminds/webknossos/datastore/datareaders/wkw/WKWArray.scala
@@ -5,12 +5,7 @@ import com.scalableminds.util.cache.AlfuCache
 import com.scalableminds.util.tools.Fox.box2Fox
 import com.scalableminds.util.tools.Fox
 import com.scalableminds.util.tools.JsonHelper.bool2Box
-import com.scalableminds.webknossos.datastore.dataformats.wkw.{
-  MortonEncoding,
-  WKWDataFormat,
-  WKWDataFormatHelper,
-  WKWHeader
-}
+import com.scalableminds.webknossos.datastore.dataformats.wkw.{MortonEncoding, WKWDataFormatHelper, WKWHeader}
 import com.scalableminds.webknossos.datastore.datareaders.{AxisOrder, ChunkUtils, DatasetArray}
 import com.scalableminds.webknossos.datastore.datavault.VaultPath
 import com.scalableminds.webknossos.datastore.models.datasource.{AdditionalAxis, DataSourceId}
@@ -22,14 +17,13 @@ import java.io.ByteArrayInputStream
 import scala.collection.immutable.NumericRange
 import scala.concurrent.ExecutionContext
 
-object WKWArray {
+object WKWArray extends WKWDataFormatHelper {
   def open(path: VaultPath,
            dataSourceId: DataSourceId,
            layerName: String,
            sharedChunkContentsCache: AlfuCache[String, MultiArray])(implicit ec: ExecutionContext): Fox[WKWArray] =
     for {
-      headerBytes <- (path / WKWDataFormat.FILENAME_HEADER_WKW)
-        .readBytes() ?~> s"Could not read header at ${WKWDataFormat.FILENAME_HEADER_WKW}"
+      headerBytes <- (path / FILENAME_HEADER_WKW).readBytes() ?~> s"Could not read header at ${FILENAME_HEADER_WKW}"
       dataInputStream = new LittleEndianDataInputStream(new ByteArrayInputStream(headerBytes))
       header <- WKWHeader(dataInputStream, readJumpTable = false).toFox
       array <- tryo(new WKWArray(path,

diff --git a/...tastore/app/com/scalableminds/webknossos/datastore/services/uploading/UploadService.scala b/...tastore/app/com/scalableminds/webknossos/datastore/services/uploading/UploadService.scala
@@ -4,8 +4,7 @@ import com.google.inject.Inject
 import com.scalableminds.util.io.PathUtils.ensureDirectoryBox
 import com.scalableminds.util.io.{PathUtils, ZipIO}
 import com.scalableminds.util.tools.{BoxImplicits, Fox, FoxImplicits}
-import com.scalableminds.webknossos.datastore.dataformats.wkw.WKWDataFormat.FILENAME_HEADER_WKW
-import com.scalableminds.webknossos.datastore.dataformats.wkw.{WKWDataLayer, WKWSegmentationLayer}
+import com.scalableminds.webknossos.datastore.dataformats.wkw.{WKWDataFormatHelper, WKWDataLayer, WKWSegmentationLayer}
 import com.scalableminds.webknossos.datastore.datareaders.n5.N5Header.FILENAME_ATTRIBUTES_JSON
 import com.scalableminds.webknossos.datastore.datareaders.n5.{N5Header, N5Metadata}
 import com.scalableminds.webknossos.datastore.datareaders.precomputed.PrecomputedHeader.FILENAME_INFO
@@ -75,6 +74,7 @@ class UploadService @Inject()(dataSourceRepository: DataSourceRepository,
     with DirectoryConstants
     with FoxImplicits
     with BoxImplicits
+      with WKWDataFormatHelper
     with LazyLogging {
 
   /* Redis stores different information for each upload, with different prefixes in the keys: