From d82663e27a23990a28208b69be34b055e87e8b8a Mon Sep 17 00:00:00 2001
From: Lazlo Westerhof <l.r.westerhof@uu.nl>
Date: Thu, 19 Oct 2023 09:49:38 +0200
Subject: [PATCH] YDA-5504: add filesize to checksum report

---
 deposit/deposit.py                      | 4 ++--
 deposit/static/deposit/js/data.js       | 3 ++-
 deposit/templates/deposit/data.html     | 3 +--
 research/research.py                    | 4 ++--
 research/static/research/js/research.js | 3 ++-
 research/templates/research/browse.html | 3 +--
 vault/static/vault/js/vault.js          | 3 ++-
 vault/templates/vault/browse.html       | 3 +--
 vault/vault.py                          | 4 ++--
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/deposit/deposit.py b/deposit/deposit.py
index 53b09fd5..ca865a49 100644
--- a/deposit/deposit.py
+++ b/deposit/deposit.py
@@ -105,13 +105,13 @@ def download_report() -> Response:
         ext = '.csv'
         if response['status'] == 'ok':
             for result in response["data"]:
-                output += f"{result['name']},{result['checksum']} \n"
+                output += f"{result['name']},{result['size']},{result['checksum']} \n"
     else:
         mime = 'text/plain'
         ext = '.txt'
         if response['status'] == 'ok':
             for result in response["data"]:
-                output += f"{result['name']} {result['checksum']} \n"
+                output += f"{result['name']} {result['size']} {result['checksum']} \n"
 
     return Response(
         output,
diff --git a/deposit/static/deposit/js/data.js b/deposit/static/deposit/js/data.js
index 009547ba..1786a9a9 100644
--- a/deposit/static/deposit/js/data.js
+++ b/deposit/static/deposit/js/data.js
@@ -158,10 +158,11 @@ $(function () {
       { coll: Yoda.basePath + folder }).then((data) => {
       let table = '<table class="table table-striped"><tbody>'
 
-      table += '<thead><tr><th>Filename</th><th>Checksum</th></thead>'
+      table += '<thead><tr><th>Filename</th><th>Size</th><th>Checksum</th></tr></thead>'
       $.each(data, function (index, obj) {
         table += `<tr>
                      <td>${obj.name}</td>
+                     <td>${obj.size}</td>
                      <td>${obj.checksum}</td>
                 </tr>`
       })
diff --git a/deposit/templates/deposit/data.html b/deposit/templates/deposit/data.html
index 8a5ac153..cc25cfad 100644
--- a/deposit/templates/deposit/data.html
+++ b/deposit/templates/deposit/data.html
@@ -368,8 +368,7 @@ <h5 class="modal-title">
             </div>
             <div class="modal-body">
                 <p>
-                    This overview shows files and their checksums.
-                    These checksums can de used to verify data integrity.
+                    This overview shows files and their sizes and checksums and can be used to verify data integrity.
                     The checksum algorithm used is <a href="https://en.wikipedia.org/wiki/SHA-2" target="_blank" title="SHA-256 checksum algorithm">SHA-256</a>.
                 </p>
                 <div id="checksumReport"></div>
diff --git a/research/research.py b/research/research.py
index a39d1bcf..2b1189d4 100644
--- a/research/research.py
+++ b/research/research.py
@@ -283,13 +283,13 @@ def download_report() -> Response:
         ext = '.csv'
         if response['status'] == 'ok':
             for result in response["data"]:
-                output += f"{result['name']},{result['checksum']} \n"
+                output += f"{result['name']},{result['size']},{result['checksum']} \n"
     else:
         mime = 'text/plain'
         ext = '.txt'
         if response['status'] == 'ok':
             for result in response["data"]:
-                output += f"{result['name']} {result['checksum']} \n"
+                output += f"{result['name']} {result['size']} {result['checksum']} \n"
 
     return Response(
         output,
diff --git a/research/static/research/js/research.js b/research/static/research/js/research.js
index 3eeb65ee..0ceb4f9b 100644
--- a/research/static/research/js/research.js
+++ b/research/static/research/js/research.js
@@ -177,10 +177,11 @@ $(function () {
       { coll: Yoda.basePath + folder }).then((data) => {
       let table = '<table class="table table-striped"><tbody>'
 
-      table += '<thead><tr><th>Filename</th><th>Checksum</th></thead>'
+      table += '<thead><tr><th>Filename</th><th>Size</th><th>Checksum</th></tr></thead>'
       $.each(data, function (index, obj) {
         table += `<tr>
                      <td>${obj.name}</td>
+                     <td>${obj.size}</td>
                      <td>${obj.checksum}</td>
                 </tr>`
       })
diff --git a/research/templates/research/browse.html b/research/templates/research/browse.html
index f8e15f5b..741504f4 100644
--- a/research/templates/research/browse.html
+++ b/research/templates/research/browse.html
@@ -61,8 +61,7 @@ <h5 class="modal-title">
             </div>
             <div class="modal-body">
                 <p>
-                    This overview shows files and their checksums.
-                    These checksums can de used to verify data integrity.
+                    This overview shows files and their sizes and checksums and can be used to verify data integrity.
                     The checksum algorithm used is <a href="https://en.wikipedia.org/wiki/SHA-2" target="_blank" title="SHA-256 checksum algorithm">SHA-256</a>.
                 </p>
                 <div id="checksumReport"></div>
diff --git a/vault/static/vault/js/vault.js b/vault/static/vault/js/vault.js
index a0ccb93d..39c3fd7a 100644
--- a/vault/static/vault/js/vault.js
+++ b/vault/static/vault/js/vault.js
@@ -74,10 +74,11 @@ $(function () {
       { coll: Yoda.basePath + folder }).then((data) => {
       let table = '<table class="table table-striped"><tbody>'
 
-      table += '<thead><tr><th>Filename</th><th>Checksum</th></thead>'
+      table += '<thead><tr><th>Filename</th><th>Size</th><th>Checksum</th></tr></thead>'
       $.each(data, function (index, obj) {
         table += `<tr>
                      <td>${obj.name}</td>
+                     <td>${obj.size}</td>
                      <td>${obj.checksum}</td>
                 </tr>`
       })
diff --git a/vault/templates/vault/browse.html b/vault/templates/vault/browse.html
index 5a649639..0f529513 100644
--- a/vault/templates/vault/browse.html
+++ b/vault/templates/vault/browse.html
@@ -126,8 +126,7 @@ <h5 class="modal-title">
             </div>
             <div class="modal-body">
                 <p>
-                    This overview shows files and their checksums.
-                    These checksums can de used to verify data integrity.
+                    This overview shows files and their sizes and checksums and can be used to verify data integrity.
                     The checksum algorithm used is <a href="https://en.wikipedia.org/wiki/SHA-2" target="_blank" title="SHA-256 checksum algorithm">SHA-256</a>.
                 </p>
                 <div id="checksumReport"></div>
diff --git a/vault/vault.py b/vault/vault.py
index b6fa31d8..a90195b9 100644
--- a/vault/vault.py
+++ b/vault/vault.py
@@ -132,13 +132,13 @@ def download_report() -> Response:
         ext = '.csv'
         if response['status'] == 'ok':
             for result in response["data"]:
-                output += f"{result['name']},{result['checksum']} \n"
+                output += f"{result['name']},{result['size']},{result['checksum']} \n"
     else:
         mime = 'text/plain'
         ext = '.txt'
         if response['status'] == 'ok':
             for result in response["data"]:
-                output += f"{result['name']} {result['checksum']} \n"
+                output += f"{result['name']} {result['size']} {result['checksum']} \n"
 
     return Response(
         output,