removed creating of tempFile from inputstream, used imputstream directly

Author: Paurikova2

dspace-api/src/main/java/org/dspace/content/PreviewContentServiceImpl.java

@@ -14,11 +14,9 @@
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -31,6 +29,8 @@
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
@@ -311,38 +311,40 @@ private void addFilePath(List<String> filePaths, String path, long size) {
         filePaths.add(fileInfo);
     }
 
-    /**
-     * Processes a TAR file, extracting its entries and adding their paths to the provided list.
-     * @param filePaths the list to populate with the extracted file paths
-     * @param tempFile  the temporary TAR file to process
-     * @throws IOException if an I/O error occurs while reading the TAR file
-     */
-    private void processTarFile(List<String> filePaths, Path tempFile) throws IOException {
-        try (InputStream fi = Files.newInputStream(tempFile);
-             TarArchiveInputStream tis = new TarArchiveInputStream(fi)) {
+//    /**
+//     * Processes a TAR file, extracting its entries and adding their paths to the provided list.
+//     * @param filePaths the list to populate with the extracted file paths
+//     * @param tempFile  the temporary TAR file to process
+//     * @throws IOException if an I/O error occurs while reading the TAR file
+//     */
+    private void processTarFile(List<String> filePaths, InputStream inputStream) throws IOException {
+        try (TarArchiveInputStream tis = new TarArchiveInputStream(inputStream)) {
             TarArchiveEntry entry;
             while ((entry = tis.getNextTarEntry()) != null) {
+                // Add the file path and its size (from the TAR entry)
                 addFilePath(filePaths, entry.getName(), entry.getSize());
             }
         }
     }
 
-    /**
-     * Processes a ZIP file, extracting its entries and adding their paths to the provided list.
-     * @param filePaths      the list to populate with the extracted file paths
-     * @param zipFileSystem  the FileSystem object representing the ZIP file
-     * @throws IOException if an I/O error occurs while reading the ZIP file
-     */
-    private void processZipFile(List<String> filePaths, FileSystem zipFileSystem) throws IOException {
-        Path root = zipFileSystem.getPath("/");
-        Files.walk(root).forEach(path -> {
-            try {
-                long fileSize = Files.size(path);
-                addFilePath(filePaths, path.toString().substring(1), fileSize);
-            } catch (IOException e) {
-                log.error("An error occurred while getting the size of the zip file.", e);
+//    /**
+//     * Processes a ZIP file, extracting its entries and adding their paths to the provided list.
+//     * @param filePaths      the list to populate with the extracted file paths
+//     * @param zipFileSystem  the FileSystem object representing the ZIP file
+//     * @throws IOException if an I/O error occurs while reading the ZIP file
+//     */
+    private void processZipFile(List<String> filePaths, InputStream inputStream) throws IOException {
+        try (ZipInputStream zipInputStream = new ZipInputStream(inputStream)) {
+            ZipEntry entry;
+            // Read each entry in the ZIP file
+            while ((entry = zipInputStream.getNextEntry()) != null) {
+                if (!entry.isDirectory()) {
+                    // For each file in the ZIP, you can get its size and path
+                    long fileSize = entry.getSize();
+                    addFilePath(filePaths, entry.getName(), fileSize);
+                }
             }
-        });
+        }
     }
 
     /**
@@ -414,26 +416,26 @@ private String buildXmlResponse(List<String> filePaths) {
      */
     private String extractFile(InputStream inputStream, String fileType) throws Exception {
         List<String> filePaths = new ArrayList<>();
-        Path tempFile = null;
+        //Path tempFile = null;
         FileSystem zipFileSystem = null;
 
         try {
             // Create a temporary file based on the file type
-            tempFile = createTempFile(fileType);
+            //tempFile = createTempFile(fileType);
 
             // Copy the input stream to the temporary file
-            Files.copy(inputStream, tempFile, StandardCopyOption.REPLACE_EXISTING);
+            //Files.copy(inputStream, tempFile, StandardCopyOption.REPLACE_EXISTING);
 
             // Process the file based on its type
             if (ARCHIVE_TYPE_TAR.equals(fileType)) {
-                processTarFile(filePaths, tempFile);
+                processTarFile(filePaths, inputStream);
             } else {
-                zipFileSystem = FileSystems.newFileSystem(tempFile, (ClassLoader) null);
-                processZipFile(filePaths, zipFileSystem);
+                //zipFileSystem = FileSystems.newFileSystem(tempFile, (ClassLoader) null);
+                processZipFile(filePaths, inputStream);
             }
         } finally {
             closeFileSystem(zipFileSystem);
-            deleteTempFile(tempFile);
+            //deleteTempFile(tempFile);
         }
 
         return buildXmlResponse(filePaths);