Images are unzipped but are not correctly upacked

Author: Tobias Wiessner

de/uni_stuttgart/ils/reqif4j/reqif/ReqIFz.java

@@ -1,20 +1,28 @@
 package de.uni_stuttgart.ils.reqif4j.reqif;
 
+import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 public class ReqIFz extends ReqIFFile {
+    private String extendFilename = "_unzipped";
 
     public ReqIFz(String filePath) throws IOException {
-        File destDir = new File(filePath + "_unzipped"); // Extract to a separate directory
+        File destDir = new File(filePath);
+        String pathWithoutFileExtension = removeFileExtension(destDir.getAbsolutePath(), true);
+        destDir = new File(pathWithoutFileExtension + extendFilename);
         if (!destDir.exists() && !destDir.mkdirs()) {
             throw new IOException("Failed to create extraction directory " + destDir);
         }
 
         byte[] buffer = new byte[1024];
+        Map<String, InputStream> picturesIS = new HashMap<>();
+
         try (ZipInputStream zis = new ZipInputStream(new FileInputStream(filePath))) {
             ZipEntry zipEntry = zis.getNextEntry();
 
@@ -43,26 +51,27 @@ public ReqIFz(String filePath) throws IOException {
                     if (zipEntry.getName().endsWith("reqif")) {
                         this.numberOfReqIFDocuments++;
                         String reqifBaseName = zipEntry.getName().split("\\.")[0];
-                        Map<String, InputStream> picturesIS = new HashMap<>();
-
-                        // Iterate again for images within the same loop
-                        try (ZipInputStream imageZis = new ZipInputStream(new FileInputStream(filePath))) {
-                            ZipEntry imageEntry = imageZis.getNextEntry();
-                            while (imageEntry != null) {
-                                String pictureFileName = new File(imageEntry.getName()).getName();
-                                if (pictureFileName.endsWith("png") || pictureFileName.endsWith("jpeg") || pictureFileName.endsWith("jpg")) {
-                                    picturesIS.put(pictureFileName, new FileInputStream(new File(destDir, imageEntry.getName())));
-                                }
-                                imageEntry = imageZis.getNextEntry();
-                            }
-                        }
-
-                        this.picturesInReqIFDocument.put(reqifBaseName, picturesIS);
                         this.reqifDocuments.put(zipEntry.getName(), new ReqIFDocument(new FileInputStream(newFile), filePath, zipEntry.getName()));
+                    } else if (zipEntry.getName().endsWith("png") || zipEntry.getName().endsWith("jpeg") || zipEntry.getName().endsWith("jpg")) {
+                        picturesIS.put(zipEntry.getName(), new FileInputStream(newFile));
                     }
                 }
                 zipEntry = zis.getNextEntry();
             }
         }
+
+        // Assuming you want to associate pictures with ReqIF documents
+        for (String reqifBaseName : this.reqifDocuments.keySet()) {
+            this.picturesInReqIFDocument.put(reqifBaseName, picturesIS);
+        }
+    }
+
+    public static String removeFileExtension(String filename, boolean removeAllExtensions) {
+        if (filename == null || filename.isEmpty()) {
+            return filename;
+        }
+
+        String extPattern = "(?<!^)[.]" + (removeAllExtensions ? ".*" : "[^.]*$");
+        return filename.replaceAll(extPattern, "");
     }
-}
+}