Only count files which will be added to RO bundle towards total limit

Author: Mark Robinson

src/main/java/org/commonwl/viewer/domain/CWLCollection.java

@@ -128,8 +128,13 @@ private void addDocs(List<RepositoryContents> repoContents) throws IOException {
                 addDocs(subdirectory);
 
             } else if (repoContent.getType().equals(FILE)) {
-                // Keep track of total file size for limit
-                totalFileSize += repoContent.getSize();
+
+                // Keep track of total file size for limit - only track files which
+                // will be added to the RO bundle due to being small enough
+                if (repoContent.getSize() <= singleFileSizeLimit) {
+                    totalFileSize += repoContent.getSize();
+                }
+
                 if (totalFileSize <= totalFileSizeLimit) {
                     // Get the file extension
                     int eIndex = repoContent.getName().lastIndexOf('.') + 1;

src/main/resources/application.properties

@@ -20,7 +20,7 @@ cacheDays = 1
 # be externally linked in the Research Object Bundle
 singleFileSizeLimit = 5242880
 
-# File size limit for the contents of the entire repository path in bytes
+# File size limit for the contents of the research object bundle (not counting external links)
 totalFileSizeLimit = 1073741824
 
 #=======================