add size to "download all" link #6118

IQSS · Jul 1, 2020 · 3f4ac7f · 3f4ac7f
1 parent c1a6126
commit 3f4ac7f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -17,6 +17,7 @@
 import edu.harvard.iq.dataverse.datacapturemodule.ScriptRequestResponse;
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
 import edu.harvard.iq.dataverse.dataset.DatasetUtil;
+import edu.harvard.iq.dataverse.datasetutility.FileSizeChecker;
 import edu.harvard.iq.dataverse.datavariable.VariableServiceBean;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.CommandContext;
@@ -91,9 +92,11 @@
 import javax.faces.model.SelectItem;
 import java.util.logging.Level;
 import edu.harvard.iq.dataverse.datasetutility.WorldMapPermissionHelper;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.AbstractSubmitToArchiveCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateNewDatasetCommand;
+import edu.harvard.iq.dataverse.engine.command.impl.GetDatasetStorageSizeCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.GetLatestPublishedDatasetVersionCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.RequestRsyncScriptCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.PublishDatasetResult;
@@ -2887,6 +2890,16 @@ public void setSelectedNonDownloadableFiles(List<FileMetadata> selectedNonDownlo
         this.selectedNonDownloadableFiles = selectedNonDownloadableFiles;
     }
 
+    public String getSizeOfDataset() {
+        GetDatasetStorageSizeCommand cmd = new GetDatasetStorageSizeCommand(dvRequestService.getDataverseRequest(), dataset, false, GetDatasetStorageSizeCommand.Mode.DOWNLOAD, workingVersion);
+        try {
+            long bytes = commandEngine.submit(cmd);
+            return FileSizeChecker.bytesToHumanReadable(bytes);
+        } catch (CommandException ex) {
+            return "";
+        }
+    }
+
     public void validateAllFilesForDownloadArchival() {
         selectAllFiles();
         boolean guestbookRequired = isDownloadPopupRequired();

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -145,19 +145,19 @@
                                                         <!-- NORMAL DOWNLOAD BUTTON (NO TABULAR FILES) -->
                                                         <li jsf:rendered="#{!DatasetPage.isHasTabular()}">
                                                             <p:commandLink update="@form" actionListener="#{DatasetPage.validateAllFilesForDownloadArchival()}">
-                                                                #{bundle.download}
+                                                                #{bundle.download} (ZIP, #{DatasetPage.sizeOfDataset})
                                                             </p:commandLink>
                                                         </li>
                                                         <!-- DOWNLOAD ORIGINAL BUTTON (TABULAR FILES PRESENT) -->
                                                         <li jsf:rendered="#{DatasetPage.isHasTabular()}">
                                                             <p:commandLink update="@form" actionListener="#{DatasetPage.validateAllFilesForDownloadOriginal()}">
-                                                                #{bundle.downloadOriginal}
+                                                                #{bundle.downloadOriginal} (ZIP, #{DatasetPage.sizeOfDataset})
                                                             </p:commandLink>
                                                         </li>
                                                         <!-- DOWNLOAD ARCHIVAL FILES (TABULAR FILES PRESENT) -->
                                                         <li jsf:rendered="#{DatasetPage.isHasTabular()}">
                                                             <p:commandLink update="@form" actionListener="#{DatasetPage.validateAllFilesForDownloadArchival()}">
-                                                                #{bundle.downloadArchival}
+                                                                #{bundle.downloadArchival} (ZIP, #{DatasetPage.sizeOfDataset})
                                                             </p:commandLink>
                                                         </li>
                                                     </ui:fragment>