Skip to content

Commit

Permalink
Merge branch 'main' into wip/dev-1112-skip-test-with-success
Browse files Browse the repository at this point in the history
  • Loading branch information
irinaschubert committed Sep 6, 2022
2 parents d5d6b41 + 2fbf664 commit bb1ac5d
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 15 deletions.
7 changes: 5 additions & 2 deletions docs/01-introduction/file-formats.md
View file
Expand Up @@ -5,7 +5,10 @@

# File Formats in DSP-API

Currently, only a limited number of file formats is accepted to be uploaded onto DSP. Some metadata is extracted from the files during the ingest but the file formats are not validated. Only image file formats are currently migrated into another format. Both, the migrated version of the file and the original are kept.
Currently, only a limited number of file formats is accepted to be uploaded onto DSP.
Some metadata is extracted from the files during the ingest but the file formats are not validated.
Only image file formats are currently migrated into another format.
Both, the migrated version of the file and the original are kept.

The following table shows the accepted file formats:

Expand All @@ -14,7 +17,7 @@ The following table shows the accepted file formats:
| Text, XML<sup>1</sup> | TXT, XML, XSL, XSD | No |
| Tables | CSV, XLS, XLSX | No |
| 2D Images | JPG, JPEG, JP2, PNG, TIF, TIFF | Yes, converted to JPEG 2000 by [Sipi](https://github.com/dasch-swiss/sipi) |
| Audio | MPEG (MP3), MP4, WAV | No |
| Audio | MPEG (MP3), WAV | No |
| Video | MP4 | No |
| Office | PDF, DOC, DOCX, PPT, PPTX | No |
| Archives | ZIP, TAR, GZ, Z, TAR.GZ, TGZ, GZIP, 7Z | No |
Expand Down
2 changes: 1 addition & 1 deletion docs/03-apis/api-v2/editing-values.md
View file
Expand Up @@ -236,7 +236,7 @@ the following types of files:

* Images: JPEG, JPEG2000, TIFF, or PNG which are stored internally as JPEG2000
* Documents: PDF
* Audio: MPEG, MP4, or Waveform audio file format (.wav, .x-wav, .vnd.wave)
* Audio: MPEG or Waveform audio file format (.wav, .x-wav, .vnd.wave)
* Text files: TXT, XML, or CSV
* Video files: MP4
* Archive files: ZIP, TAR, GZIP
Expand Down
12 changes: 6 additions & 6 deletions project/Dependencies.scala
View file
Expand Up @@ -20,7 +20,7 @@ object Dependencies {
val AkkaActorVersion = "2.6.19"
val JenaVersion = "4.6.0"

val ZioVersion = "2.0.0"
val ZioVersion = "2.0.2"
val ZioHttpVersion = "2.0.0-RC4"
val ZioJsonVersion = "0.3.0-RC11"
val ZioConfigVersion = "3.0.2"
Expand All @@ -40,8 +40,8 @@ object Dependencies {
val zioConfig = "dev.zio" %% "zio-config" % ZioConfigVersion
val zioConfigMagnolia = "dev.zio" %% "zio-config-magnolia" % ZioConfigVersion
val zioConfigTypesafe = "dev.zio" %% "zio-config-typesafe" % ZioConfigVersion
val zioTest = "dev.zio" %% "zio-test" % "2.0.1"
val zioTestSbt = "dev.zio" %% "zio-test-sbt" % "2.0.1"
val zioTest = "dev.zio" %% "zio-test" % "2.0.2"
val zioTestSbt = "dev.zio" %% "zio-test-sbt" % "2.0.2"

// akka
val akkaActor = "com.typesafe.akka" %% "akka-actor" % AkkaActorVersion // Scala 3 compatible
Expand All @@ -61,8 +61,8 @@ object Dependencies {

// Metrics
val aspectjweaver = "org.aspectj" % "aspectjweaver" % "1.9.9.1"
val kamonCore = "io.kamon" %% "kamon-core" % "2.5.7" // Scala 3 compatible
val kamonScalaFuture = "io.kamon" %% "kamon-scala-future" % "2.5.7" // Scala 3 incompatible
val kamonCore = "io.kamon" %% "kamon-core" % "2.5.8" // Scala 3 compatible
val kamonScalaFuture = "io.kamon" %% "kamon-scala-future" % "2.5.8" // Scala 3 incompatible

// input validation
val commonsValidator =
Expand Down Expand Up @@ -96,7 +96,7 @@ object Dependencies {
val swaggerAkkaHttp = "com.github.swagger-akka-http" %% "swagger-akka-http" % "1.6.0" // Scala 3 incompatible
val titaniumJSONLD = "com.apicatalog" % "titanium-json-ld" % "1.3.1"
val xmlunitCore = "org.xmlunit" % "xmlunit-core" % "2.9.0"
val jacksonDatabind = "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.3"
val jacksonDatabind = "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.4"

// test
val akkaHttpTestkit = "com.typesafe.akka" %% "akka-http-testkit" % AkkaHttpVersion // Scala 3 incompatible
Expand Down
3 changes: 0 additions & 3 deletions sipi/scripts/file_info.lua
View file
Expand Up @@ -25,7 +25,6 @@ local APPLICATION_XML = "application/xml"
local TEXT_XML = "text/xml"
local TEXT_PLAIN = "text/plain"
local AUDIO_MP3 = "audio/mpeg"
local AUDIO_MP4 = "audio/mp4"
local AUDIO_WAV = "audio/wav"
local AUDIO_X_WAV = "audio/x-wav"
local AUDIO_VND_WAVE = "audio/vnd.wave"
Expand Down Expand Up @@ -56,7 +55,6 @@ local image_mime_types = {

local audio_mime_types = {
AUDIO_MP3,
AUDIO_MP4,
AUDIO_WAV,
AUDIO_X_WAV,
AUDIO_VND_WAVE
Expand Down Expand Up @@ -94,7 +92,6 @@ local video_mime_types = {

local audio_extensions = {
"mp3",
"mp4",
"wav"
}

Expand Down
2 changes: 1 addition & 1 deletion webapi/src/main/resources/application.conf
View file
Expand Up @@ -326,7 +326,7 @@ app {
]
text-mime-types = ["application/xml", "text/xml", "text/csv", "text/plain"]
video-mime-types = ["video/mp4"]
audio-mime-types = ["audio/mpeg", "audio/mp4", "audio/wav", "audio/x-wav", "audio/vnd.wave"]
audio-mime-types = ["audio/mpeg", "audio/wav", "audio/x-wav", "audio/vnd.wave"]
archive-mime-types = [
"application/zip",
"application/x-tar",
Expand Down
1 change: 0 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/messages/util/ValueUtilV1.scala
View file
Expand Up @@ -165,7 +165,6 @@ class ValueUtilV1(private val settings: KnoraSettingsImpl) {
"application/zip" -> "ZIP",
"application/x-compressed-zip" -> "ZIP",
"audio/mpeg" -> "AUDIO",
"audio/mp4" -> "AUDIO",
"audio/wav" -> "AUDIO",
"audio/x-wav" -> "AUDIO",
"audio/vnd.wave" -> "AUDIO",
Expand Down
1 change: 0 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV1.scala
View file
Expand Up @@ -278,7 +278,6 @@ object RouteUtilV1 {
*/
private val audioMimeTypes: Set[String] = Set(
"audio/mpeg",
"audio/mp4",
"audio/wav",
"audio/x-wav",
"audio/vnd.wave"
Expand Down

0 comments on commit bb1ac5d

Please sign in to comment.