Merged in task/dspace-cris-2025_02_x/DSC-2830 (pull request DSpace#5752)

DSC-2830

Approved-by: Mykhaylo Boychuk

Author: vins01-4science

dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickThumbnailFilter.java

@@ -15,6 +15,7 @@
 import java.util.regex.PatternSyntaxException;
 
 import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.dspace.content.Bitstream;
@@ -85,23 +86,20 @@ public String getDescription() {
 
     public File inputStreamToTempFile(InputStream source, String prefix, String suffix) throws IOException {
         File f = File.createTempFile(prefix, suffix);
-        f.deleteOnExit();
-        FileOutputStream fos = new FileOutputStream(f);
-
-        byte[] buffer = new byte[1024];
-        int len = source.read(buffer);
-        while (len != -1) {
-            fos.write(buffer, 0, len);
-            len = source.read(buffer);
+        try (FileOutputStream fos = new FileOutputStream(f)) {
+            byte[] buffer = new byte[8192];
+            int len = source.read(buffer);
+            while (len != -1) {
+                fos.write(buffer, 0, len);
+                len = source.read(buffer);
+            }
         }
-        fos.close();
         return f;
     }
 
     public File getThumbnailFile(File f, boolean verbose)
         throws IOException, InterruptedException, IM4JavaException {
         File f2 = new File(f.getParentFile(), f.getName() + ".jpg");
-        f2.deleteOnExit();
         ConvertCmd cmd = new ConvertCmd();
         IMOperation op = new IMOperation();
         op.autoOrient();
@@ -123,11 +121,7 @@ public File getThumbnailFile(File f, boolean verbose)
      */
     public File getImageFile(File f, boolean verbose)
         throws IOException, InterruptedException, IM4JavaException {
-        // Writing an intermediate file to disk is inefficient, but since we're
-        // doing it anyway, we should use a lossless format. IM's internal MIFF
-        // is lossless like PNG and TIFF, but much faster.
         File f2 = new File(f.getParentFile(), f.getName() + ".miff");
-        f2.deleteOnExit();
         ConvertCmd cmd = new ConvertCmd();
         IMOperation op = new IMOperation();
 
@@ -154,9 +148,15 @@ public File getImageFile(File f, boolean verbose)
         // same size as the MediaBox if it doesn't exist. Also note that we
         // only need to check the first page, since that's what we use for
         // generating the thumbnail (PDPage uses a zero-based index).
-        PDPage pdfPage = Loader.loadPDF(f).getPage(0);
-        PDRectangle pdfPageMediaBox = pdfPage.getMediaBox();
-        PDRectangle pdfPageCropBox = pdfPage.getCropBox();
+        PDRectangle pdfPageMediaBox;
+        PDRectangle pdfPageCropBox;
+        try (
+            PDDocument pdfDoc = Loader.loadPDF(f)
+        ) {
+            PDPage pdfPage = pdfDoc.getPage(0);
+            pdfPageMediaBox = pdfPage.getMediaBox();
+            pdfPageCropBox = pdfPage.getCropBox();
+        }
 
         // This option must come *before* we open the input file.
         if (pdfPageCropBox != pdfPageMediaBox) {

dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickVideoThumbnailFilter.java

@@ -59,7 +59,6 @@ public InputStream getDestinationStream(Item currentItem, InputStream source, bo
     public File getThumbnailFile(File f, boolean verbose)
         throws IOException, InterruptedException, IM4JavaException {
         File f2 = new File(f.getParentFile(), f.getName() + ".jpg");
-        f2.deleteOnExit();
         ConvertCmd cmd = new ConvertCmd();
         IMOperation op = new IMOperation();
         op.autoOrient();

dspace-api/src/main/java/org/dspace/app/mediafilter/JPEGFilter.java

@@ -230,30 +230,37 @@ protected InputStream getThumb(
     ) throws Exception {
 
         File tempFile = File.createTempFile("temp", ".tmp");
-        tempFile.deleteOnExit();
 
         // Write to temp file
         try (FileOutputStream fos = new FileOutputStream(tempFile)) {
-            byte[] buffer = new byte[4096];
+            byte[] buffer = new byte[8192];
             int len;
             while ((len = source.read(buffer)) != -1) {
                 fos.write(buffer, 0, len);
             }
         }
 
-        int rotation = 0;
-        try (FileInputStream fis = new FileInputStream(tempFile)) {
-            rotation = getImageRotationUsingImageReader(fis);
-        }
+        try {
+            int rotation;
+            try (FileInputStream fis = new FileInputStream(tempFile)) {
+                rotation = getImageRotationUsingImageReader(fis);
+            }
 
-        try (FileInputStream fis = new FileInputStream(tempFile)) {
-            // read in bitstream's image
-            BufferedImage buf = ImageIO.read(fis);
+            try (FileInputStream fis = new FileInputStream(tempFile)) {
+                BufferedImage buf = ImageIO.read(fis);
+                if (buf == null) {
+                    throw new IOException("No image reader found for bitstream");
+                }
 
-            return getThumbDim(
-                currentItem, buf, verbose, xmax, ymax, blurring, hqscaling, brandHeight, brandFontPoint, rotation,
-                brandFont
-            );
+                return getThumbDim(
+                    currentItem, buf, verbose, xmax, ymax, blurring, hqscaling, brandHeight, brandFontPoint, rotation,
+                    brandFont
+                );
+            }
+        } finally {
+            if (tempFile != null && tempFile.exists()) {
+                tempFile.delete();
+            }
         }
     }
 
@@ -327,29 +334,30 @@ public InputStream getThumbDim(Item currentItem, BufferedImage buf, boolean verb
 
         // now render the image into the thumbnail buffer
         Graphics2D g2d = thumbnail.createGraphics();
-        g2d.drawImage(correctedImage, 0, 0, xsize, ysize, null);
+        try {
+            g2d.drawImage(correctedImage, 0, 0, xsize, ysize, null);
 
-        if (brandHeight != 0) {
-            ConfigurationService configurationService
-                    = DSpaceServicesFactory.getInstance().getConfigurationService();
-            Brand brand = new Brand(xsize, brandHeight, new Font(brandFont, Font.PLAIN, brandFontPoint), 5);
-            BufferedImage brandImage = brand.create(configurationService.getProperty("webui.preview.brand"),
-                                                    configurationService.getProperty("webui.preview.brand.abbrev"),
-                                                    currentItem == null ? "" : "hdl:" + currentItem.getHandle());
+            if (brandHeight != 0) {
+                ConfigurationService configurationService
+                        = DSpaceServicesFactory.getInstance().getConfigurationService();
+                Brand brand = new Brand(xsize, brandHeight, new Font(brandFont, Font.PLAIN, brandFontPoint), 5);
+                BufferedImage brandImage = brand.create(configurationService.getProperty("webui.preview.brand"),
+                                                        configurationService.getProperty("webui.preview.brand.abbrev"),
+                                                        currentItem == null ? "" : "hdl:" + currentItem.getHandle());
 
-            g2d.drawImage(brandImage, 0, ysize, xsize, 20, null);
-        }
+                g2d.drawImage(brandImage, 0, ysize, xsize, 20, null);
+            }
 
+            ByteArrayInputStream bais;
+            try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+                ImageIO.write(thumbnail, "jpeg", baos);
+                bais = new ByteArrayInputStream(baos.toByteArray());
+            }
 
-        ByteArrayInputStream bais;
-        // now create an input stream for the thumbnail buffer and return it
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-            ImageIO.write(thumbnail, "jpeg", baos);
-            // now get the array
-            bais = new ByteArrayInputStream(baos.toByteArray());
+            return bais;
+        } finally {
+            g2d.dispose();
         }
-
-        return bais; // hope this gets written out before its garbage collected!
     }
 
 

dspace-api/src/main/java/org/dspace/app/mediafilter/PDFBoxThumbnail.java

@@ -73,7 +73,7 @@ public InputStream getDestinationStream(Item currentItem, InputStream source, bo
         BufferedImage buf;
 
         // Render the page image.
-        try ( PDDocument doc = Loader.loadPDF(new RandomAccessReadBuffer(source)); ) {
+        try ( PDDocument doc = Loader.loadPDF(new RandomAccessReadBuffer(source)) ) {
             PDFRenderer renderer = new PDFRenderer(doc);
             buf = renderer.renderImage(0);
         } catch (InvalidPasswordException ex) {