From 843d4d32d1de40c3d4fb6d765f2d4bfdcb525a86 Mon Sep 17 00:00:00 2001
From: Booteille <booteille@protonmail.com>
Date: Wed, 27 Nov 2024 05:44:50 +0100
Subject: [PATCH] Fix file size display

---
 themes/default/public/js/lufi-download.js | 17 ++++++++---------
 themes/default/templates/render.html.ep   |  8 ++++----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/themes/default/public/js/lufi-download.js b/themes/default/public/js/lufi-download.js
index 5e70021..848539e 100644
--- a/themes/default/public/js/lufi-download.js
+++ b/themes/default/public/js/lufi-download.js
@@ -10,19 +10,18 @@ document.addEventListener("DOMContentLoaded", () => {
   /**
    * Update the DOM depending on the situation
    *
-   * @param {LufiFile} lufiFile
    * @param {string} type Can be aborted, success or ongoing
    * @param {Node} existingCard Existing card to be replaced with the new one
    * @returns
    */
-  const updateDOM = (lufiFile = undefined, type) => {
+  const updateDOM = (type) => {
     const cardDOM = document
       .querySelector(`template#download-card-${type}`)
       .content.cloneNode(true).children[0];
 
-    if (lufiFile) {
-      cardDOM.querySelector(".file-size").innerText = filesize(lufiFile.size);
-    }
+    cardDOM.querySelector(".file-size").innerText = filesize(
+      cardDOM.querySelector(".file-size").getAttribute("data-filesize")
+    );
 
     downloadContainerDOM.replaceChildren(cardDOM);
 
@@ -98,7 +97,7 @@ document.addEventListener("DOMContentLoaded", () => {
         passwordInputDOM?.querySelector("#file-password").value
       )
       .andThen((job) => {
-        const cardDOM = updateDOM(job.lufiFile, "ongoing");
+        const cardDOM = updateDOM("ongoing");
 
         warnOnReload();
         job.onProgress(() => {
@@ -117,7 +116,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
           warnOnReload(false);
 
-          updateDOM(lufiFile, "aborted");
+          updateDOM("aborted");
 
           reloadButtonDOM.onclick = (event) => {
             event.preventDefault();
@@ -128,7 +127,7 @@ document.addEventListener("DOMContentLoaded", () => {
         return job.waitForCompletion();
       })
       .mapErr((error) => {
-        updateDOM(undefined, "error").querySelector(".message-card").innerText =
+        updateDOM("error").querySelector(".message-card").innerText =
           error.message;
 
         warnOnReload(false);
@@ -136,7 +135,7 @@ document.addEventListener("DOMContentLoaded", () => {
       .andThen((job) => {
         notify(i18n.fileDownloaded, job.lufiFile.name);
 
-        const downloadDOM = updateDOM(job.lufiFile, "success");
+        const downloadDOM = updateDOM("success");
 
         const blobURL = URL.createObjectURL(job.downloadedFile);
 
diff --git a/themes/default/templates/render.html.ep b/themes/default/templates/render.html.ep
index 1bf8eba..eeab9a0 100755
--- a/themes/default/templates/render.html.ep
+++ b/themes/default/templates/render.html.ep
@@ -27,7 +27,7 @@
       <template id="download-card-ongoing">
         <article class="download-card ongoing">
           <div class="file-description">
-            <p class="file-size"></p>
+            <p class="file-size" data-filesize="<%= stash('f')->filesize %>"></p>
           </div>
 
           <p class="wait-message"><%= l('Please wait while we are getting your file. We first need to download and decrypt all parts before you can get it.') %></p>
@@ -45,7 +45,7 @@
       <template id="download-card-aborted">
         <article class="download-card aborted">
           <div class="file-description">
-            <p class="file-size"></p>
+            <p class="file-size" data-filesize="<%= stash('f')->filesize %>"></p>
           </div>
           
           <p class="abort-message"></p>
@@ -57,7 +57,7 @@
       <template id="download-card-success">
         <article class="download-card success">
           <div class="file-description" data-isZipped="<%= (stash('f')->zipped) ? 'true' : 'false' %>">
-            <p class="file-size"></p>
+            <p class="file-size" data-filesize="<%= stash('f')->filesize %>"></p>
           </div>
           
           <a class="button action-download" autofocus href="#"><%= l('Get the file')%></a>
@@ -80,7 +80,7 @@
         <article class="download-card error">
           <div class="file-description">
             <p class="file-name"></p>
-            <p class="file-size"></p>
+            <p class="file-size" data-filesize="<%= stash('f')->filesize %>"></p>
           </div>
 
           <div class="message-card error"></div>