diff --git a/docs/01-introduction/file-formats.md b/docs/01-introduction/file-formats.md index b0f8b89947..be9794d976 100644 --- a/docs/01-introduction/file-formats.md +++ b/docs/01-introduction/file-formats.md @@ -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: @@ -14,7 +17,7 @@ The following table shows the accepted file formats: | Text, XML1 | 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 | diff --git a/docs/03-apis/api-v2/editing-values.md b/docs/03-apis/api-v2/editing-values.md index 83883c9733..c19094f28a 100644 --- a/docs/03-apis/api-v2/editing-values.md +++ b/docs/03-apis/api-v2/editing-values.md @@ -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 diff --git a/sipi/scripts/file_info.lua b/sipi/scripts/file_info.lua index 4d75dcdaf3..2fe40f291f 100644 --- a/sipi/scripts/file_info.lua +++ b/sipi/scripts/file_info.lua @@ -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" @@ -56,7 +55,6 @@ local image_mime_types = { local audio_mime_types = { AUDIO_MP3, - AUDIO_MP4, AUDIO_WAV, AUDIO_X_WAV, AUDIO_VND_WAVE @@ -94,7 +92,6 @@ local video_mime_types = { local audio_extensions = { "mp3", - "mp4", "wav" } diff --git a/webapi/src/main/resources/application.conf b/webapi/src/main/resources/application.conf index cba1a813a4..45496ea586 100644 --- a/webapi/src/main/resources/application.conf +++ b/webapi/src/main/resources/application.conf @@ -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", diff --git a/webapi/src/main/scala/org/knora/webapi/messages/util/ValueUtilV1.scala b/webapi/src/main/scala/org/knora/webapi/messages/util/ValueUtilV1.scala index 5646497795..7e9c3625c3 100644 --- a/webapi/src/main/scala/org/knora/webapi/messages/util/ValueUtilV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/messages/util/ValueUtilV1.scala @@ -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", diff --git a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV1.scala b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV1.scala index 5166737f90..301318ca38 100644 --- a/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV1.scala +++ b/webapi/src/main/scala/org/knora/webapi/routing/RouteUtilV1.scala @@ -278,7 +278,6 @@ object RouteUtilV1 { */ private val audioMimeTypes: Set[String] = Set( "audio/mpeg", - "audio/mp4", "audio/wav", "audio/x-wav", "audio/vnd.wave"