Merge pull request #8722 from alanorth/update-bitstream-format-registry

Update bitstream format registry
DSpace · Apr 3, 2023 · 5641844 · 5641844
2 parents 2d8b2b7 + e777142
commit 5641844
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 5 deletions.
diff --git a/...torage/rdbms/sqlmigration/h2/V7.6_2023.03.24__Update_PNG_in_bitstream_format_registry.sql b/...torage/rdbms/sqlmigration/h2/V7.6_2023.03.24__Update_PNG_in_bitstream_format_registry.sql
@@ -0,0 +1,17 @@
+--
+-- The contents of this file are subject to the license and copyright
+-- detailed in the LICENSE and NOTICE files at the root of the source
+-- tree and available online at
+--
+-- http://www.dspace.org/license/
+--
+
+-----------------------------------------------------------------------------------
+-- Update short description for PNG mimetype in the bitstream format registry
+-- See: https://github.com/DSpace/DSpace/pull/8722
+-----------------------------------------------------------------------------------
+
+UPDATE bitstreamformatregistry
+SET short_description='PNG'
+WHERE short_description='image/png'
+  AND mimetype='image/png';
diff --git a/...ge/rdbms/sqlmigration/oracle/V7.6_2023.03.24__Update_PNG_in_bitstream_format_registry.sql b/...ge/rdbms/sqlmigration/oracle/V7.6_2023.03.24__Update_PNG_in_bitstream_format_registry.sql
@@ -0,0 +1,17 @@
+--
+-- The contents of this file are subject to the license and copyright
+-- detailed in the LICENSE and NOTICE files at the root of the source
+-- tree and available online at
+--
+-- http://www.dspace.org/license/
+--
+
+-----------------------------------------------------------------------------------
+-- Update short description for PNG mimetype in the bitstream format registry
+-- See: https://github.com/DSpace/DSpace/pull/8722
+-----------------------------------------------------------------------------------
+
+UPDATE bitstreamformatregistry
+SET short_description='PNG'
+WHERE short_description='image/png'
+  AND mimetype='image/png';
diff --git a/.../rdbms/sqlmigration/postgres/V7.6_2023.03.24__Update_PNG_in_bitstream_format_registry.sql b/.../rdbms/sqlmigration/postgres/V7.6_2023.03.24__Update_PNG_in_bitstream_format_registry.sql
@@ -0,0 +1,17 @@
+--
+-- The contents of this file are subject to the license and copyright
+-- detailed in the LICENSE and NOTICE files at the root of the source
+-- tree and available online at
+--
+-- http://www.dspace.org/license/
+--
+
+-----------------------------------------------------------------------------------
+-- Update short description for PNG mimetype in the bitstream format registry
+-- See: https://github.com/DSpace/DSpace/pull/8722
+-----------------------------------------------------------------------------------
+
+UPDATE bitstreamformatregistry
+SET short_description='PNG'
+WHERE short_description='image/png'
+  AND mimetype='image/png';
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamFormatRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamFormatRestRepositoryIT.java
@@ -56,7 +56,7 @@ public class BitstreamFormatRestRepositoryIT extends AbstractControllerIntegrati
     @Autowired
     private BitstreamFormatConverter bitstreamFormatConverter;
 
-    private final int DEFAULT_AMOUNT_FORMATS = 82;
+    private final int DEFAULT_AMOUNT_FORMATS = 84;
 
     @Test
     public void findAllPaginationTest() throws Exception {

diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg
@@ -492,9 +492,9 @@ filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = OpenDo
 filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = OpenDocument Text
 filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = RTF
 filter.org.dspace.app.mediafilter.TikaTextExtractionFilter.inputFormats = Text
-filter.org.dspace.app.mediafilter.JPEGFilter.inputFormats = BMP, GIF, JPEG, image/png
-filter.org.dspace.app.mediafilter.BrandedPreviewJPEGFilter.inputFormats = BMP, GIF, JPEG, image/png
-filter.org.dspace.app.mediafilter.ImageMagickImageThumbnailFilter.inputFormats = BMP, GIF, image/png, JPG, TIFF, JPEG, JPEG 2000
+filter.org.dspace.app.mediafilter.JPEGFilter.inputFormats = BMP, GIF, JPEG, PNG
+filter.org.dspace.app.mediafilter.BrandedPreviewJPEGFilter.inputFormats = BMP, GIF, JPEG, PNG
+filter.org.dspace.app.mediafilter.ImageMagickImageThumbnailFilter.inputFormats = BMP, GIF, PNG, JPG, TIFF, JPEG, JPEG 2000
 filter.org.dspace.app.mediafilter.ImageMagickPdfThumbnailFilter.inputFormats = Adobe PDF
 filter.org.dspace.app.mediafilter.PDFBoxThumbnail.inputFormats = Adobe PDF
 

diff --git a/dspace/config/registries/bitstream-formats.xml b/dspace/config/registries/bitstream-formats.xml
@@ -201,7 +201,7 @@
 
   <bitstream-type>
     <mimetype>image/png</mimetype>
-    <short_description>image/png</short_description>
+    <short_description>PNG</short_description>
     <description>Portable Network Graphics</description>
     <support_level>1</support_level>
     <internal>false</internal>
@@ -800,4 +800,22 @@
         <extension>mp3</extension>
     </bitstream-type>
 
+    <bitstream-type>
+        <mimetype>image/webp</mimetype>
+        <short_description>WebP</short_description>
+        <description>WebP is a modern image format that provides superior lossless and lossy compression for images on the web.</description>
+        <support_level>1</support_level>
+        <internal>false</internal>
+        <extension>webp</extension>
+    </bitstream-type>
+
+    <bitstream-type>
+        <mimetype>image/avif</mimetype>
+        <short_description>AVIF</short_description>
+        <description>AV1 Image File Format (AVIF) is an open, royalty-free image file format specification for storing images or image sequences compressed with AV1 in the HEIF container format.</description>
+        <support_level>1</support_level>
+        <internal>false</internal>
+        <extension>avif</extension>
+    </bitstream-type>
+
 </dspace-bitstream-types>