Add options to Write strategy for configure the creation of SipId fol…

…der inside ZIP
keeps · Nov 15, 2024 · fee73f5 · fee73f5
1 parent 34bb2c1
commit fee73f5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/...rg/roda_project/commons_ip2/model/impl/eark/out/writers/strategy/FolderWriteStrategy.java b/...rg/roda_project/commons_ip2/model/impl/eark/out/writers/strategy/FolderWriteStrategy.java
@@ -48,6 +48,12 @@ public Path write(Map<String, ZipEntryInfo> entries, SIP sip, String fileNameWit
     return dirPath;
   }
 
+  @Override
+  public Path write(Map<String, ZipEntryInfo> entries, SIP sip, String fileNameWithoutExtension, String fallbackName,
+    boolean createSipIdFolder, boolean deleteExisting) throws IPException, InterruptedException {
+    throw new UnsupportedOperationException("Method not implemented");
+  }
+
   private void writeToPath(final Map<String, ZipEntryInfo> entries, final Path path, String checksumAlgorithm)
     throws IPException, InterruptedException {
     try {

diff --git a/...java/org/roda_project/commons_ip2/model/impl/eark/out/writers/strategy/WriteStrategy.java b/...java/org/roda_project/commons_ip2/model/impl/eark/out/writers/strategy/WriteStrategy.java
@@ -17,5 +17,8 @@ public interface WriteStrategy {
   Path write(Map<String, ZipEntryInfo> entries, SIP sip, String fileNameWithoutExtension, String fallbackName,
     boolean deleteExisting) throws IPException, InterruptedException;
 
+  Path write(Map<String, ZipEntryInfo> entries, SIP sip, String fileNameWithoutExtension, String fallbackName,
+             boolean createSipIdFolder, boolean deleteExisting) throws IPException, InterruptedException;
+
   Path getDestinationPath();
 }
diff --git a/...a/org/roda_project/commons_ip2/model/impl/eark/out/writers/strategy/ZipWriteStrategy.java b/...a/org/roda_project/commons_ip2/model/impl/eark/out/writers/strategy/ZipWriteStrategy.java
@@ -28,10 +28,16 @@ public void setup(Path destinationPath) {
   @Override
   public Path write(Map<String, ZipEntryInfo> entries, SIP sip, String fileNameWithoutExtension, String fallbackName,
                     boolean deleteExisting) throws IPException, InterruptedException {
+    return write(entries, sip, fileNameWithoutExtension, fallbackName, true, deleteExisting);
+  }
+
+  @Override
+  public Path write(Map<String, ZipEntryInfo> entries, SIP sip, String fileNameWithoutExtension, String fallbackName,
+    boolean createSipIdFolder, boolean deleteExisting) throws IPException, InterruptedException {
     Path zipPath = getZipPath(destinationPath, fileNameWithoutExtension, fallbackName);
 
     try {
-      ZIPUtils.zip(entries, Files.newOutputStream(zipPath), sip, true, true);
+      ZIPUtils.zip(entries, Files.newOutputStream(zipPath), sip, createSipIdFolder, true);
     } catch (ClosedByInterruptException e) {
       throw new InterruptedException();
     } catch (IOException e) {