Skip to content

Commit eb2c11b

Browse files
committed
Fix minor suggestions from code review
1 parent 04922de commit eb2c11b

File tree

4 files changed

+184
-181
lines changed

4 files changed

+184
-181
lines changed

app/controllers/WKRemoteDataStoreController.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ class WKRemoteDataStoreController @Inject()(
259259
}
260260
}
261261

262-
def getDataset(name: String, key: String, datasetId: ObjectId): Action[AnyContent] =
262+
def getDatasource(name: String, key: String, datasetId: ObjectId): Action[AnyContent] =
263263
Action.async { implicit request =>
264264
dataStoreService.validateAccess(name, key) { _ =>
265265
for {

app/models/dataset/Dataset.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.scalableminds.util.tools.{Fox, JsonHelper}
88
import com.scalableminds.webknossos.datastore.dataformats.MagLocator
99
import com.scalableminds.webknossos.datastore.datareaders.AxisOrder
1010
import com.scalableminds.webknossos.datastore.helpers.DataSourceMagInfo
11-
import com.scalableminds.webknossos.datastore.models.{LengthUnit, VoxelSize, datasource}
11+
import com.scalableminds.webknossos.datastore.models.{LengthUnit, VoxelSize}
1212
import com.scalableminds.webknossos.datastore.models.datasource.DatasetViewConfiguration.DatasetViewConfiguration
1313
import com.scalableminds.webknossos.datastore.models.datasource.LayerViewConfiguration.LayerViewConfiguration
1414
import com.scalableminds.webknossos.datastore.models.datasource.inbox.{InboxDataSourceLike => InboxDataSource}
@@ -20,22 +20,22 @@ import com.scalableminds.webknossos.datastore.models.datasource.{
2020
CoordinateTransformation,
2121
CoordinateTransformationType,
2222
DataFormat,
23-
DatasetLayerAttachments => AttachmentWrapper,
2423
DataSourceId,
2524
ElementClass,
2625
LayerAttachment,
2726
LayerAttachmentDataFormat,
2827
LayerAttachmentType,
29-
SegmentationLayerLike,
3028
ThinPlateSplineCorrespondences,
31-
DataLayerLike => DataLayer
29+
DataLayerLike => DataLayer,
30+
DatasetLayerAttachments => AttachmentWrapper
3231
}
3332
import com.scalableminds.webknossos.datastore.services.MagPathInfo
3433
import com.scalableminds.webknossos.schema.Tables._
3534
import controllers.DatasetUpdateParameters
3635

3736
import javax.inject.Inject
3837
import models.organization.OrganizationDAO
38+
import net.liftweb.common.Box.tryo
3939
import play.api.i18n.{Messages, MessagesProvider}
4040
import play.api.libs.json._
4141
import slick.dbio.DBIO
@@ -1060,7 +1060,7 @@ class DatasetLayerAttachmentsDAO @Inject()(sqlClient: SqlClient)(implicit ec: Ex
10601060
def parseRow(row: DatasetLayerAttachmentsRow): Fox[LayerAttachment] =
10611061
for {
10621062
dataFormat <- LayerAttachmentDataFormat.fromString(row.dataformat).toFox ?~> "Could not parse data format"
1063-
uri = new URI(row.path)
1063+
uri <- tryo(new URI(row.path)).toFox
10641064
} yield LayerAttachment(row.name, uri, dataFormat)
10651065

10661066
def parseAttachments(rows: List[DatasetLayerAttachmentsRow]): Fox[AttachmentWrapper] =

0 commit comments

Comments
 (0)