In the reports archive Skipping now the reports from plots.

virtualcell · Sep 19, 2021 · 2e9f112 · 2e9f112
1 parent 332d34f
commit 2e9f112
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/vcell-cli/src/main/java/org/vcell/cli/CLIUtils.java b/vcell-cli/src/main/java/org/vcell/cli/CLIUtils.java
@@ -9,6 +9,7 @@
 import cbit.vcell.solver.ode.ODESolverResultSet;
 import cbit.vcell.util.ColumnDescription;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.jlibsedml.*;
@@ -694,6 +695,13 @@ public static void zipResFiles(File dirPath) throws IOException {
             put("csv", "reports.zip");
             put("pdf", "plots.zip");
         }};
+
+        Set<String> filesToSkip = new HashSet<>();
+        srcFiles = listFilesForFolder(dirPath, "pdf");
+        for(File file : srcFiles) {
+        	String baseName = FilenameUtils.getBaseName(file.getName());
+        	filesToSkip.add(baseName);
+        }
 
         for (String ext : extensionListMap.keySet()) {
             srcFiles = listFilesForFolder(dirPath, ext);
@@ -705,6 +713,13 @@ public static void zipResFiles(File dirPath) throws IOException {
                 zipOutputStream = new ZipOutputStream(fileOutputStream);
                 if (srcFiles.size() != 0) System.out.println("Archiving resultant " + ext.toUpperCase() + " files to `" + extensionListMap.get(ext) + "`.");
                 for (File srcFile : srcFiles) {
+
+                	if("csv".equalsIgnoreCase(ext)) {
+                		String candidate = FilenameUtils.getBaseName(srcFile.getName());
+                		if(filesToSkip.contains(candidate)) {
+                			continue;	// skip reports with a corresponding (same name) image
+                		}
+                	}
 
                     fileInputstream = new FileInputStream(srcFile);