diff --git a/themes/default/public/js/lufi-down.js b/themes/default/public/js/lufi-down.js
index 8a1b7ab..e3cb8a9 100755
--- a/themes/default/public/js/lufi-down.js
+++ b/themes/default/public/js/lufi-down.js
@@ -187,23 +187,23 @@ const updateProgress = (lufiFile) => {
document.getElementById("pbt").innerHTML = `${percent}%`;
};
-const showZipContent = (blob) => {
+const showZipContent = (zipFile) => {
const showZipContentDOM = document.getElementById("showZipContent");
const showZipContentDOMListener = () => {
- JSZip.loadAsync(blob).then((zip) => {
+ lufi.decompress(zipFile).andThen((files) => {
const newElement = document.createElement("div");
let innerHTML = `
${i18n.zipContent}
`;
- zip.forEach(function (_relativePath, zipEntry) {
+ files.forEach((file) => {
innerHTML += `-
- ${escapeHtml(zipEntry.name)}
- (${filesize(zipEntry._data.uncompressedSize, {
+ ${escapeHtml(file.name)}
+ (${filesize(file.size, {
base: 10,
})})
@@ -217,17 +217,16 @@ const showZipContent = (blob) => {
pbd.append(newElement);
- console.debug();
-
document.querySelectorAll(".download-zip-content").forEach((element) => {
const elementListener = (e) => {
e.preventDefault();
- var filename = element.getAttribute("download");
- zip.files[filename].async("blob").then((blob) => {
- element.removeEventListener("click", elementListener);
- element.setAttribute("href", URL.createObjectURL(blob));
- element.click();
- });
+
+ const filename = element.getAttribute("download");
+ const file = files.find((file) => file.name === filename);
+
+ element.removeEventListener("click", elementListener);
+ element.setAttribute("href", URL.createObjectURL(file));
+ element.click();
};
element.addEventListener("click", elementListener);
diff --git a/themes/default/templates/index.html.ep b/themes/default/templates/index.html.ep
index 66314b7..af3e2ad 100755
--- a/themes/default/templates/index.html.ep
+++ b/themes/default/templates/index.html.ep
@@ -161,7 +161,6 @@
%= javascript '/partial/index.js'
% }
%= javascript '/js/filesize.min.js'
-%= javascript '/js/jszip.min.js'
%= javascript '/js/lufi-notifications.js'
%= javascript '/js/lufi-up.js', type => 'module'
% }
diff --git a/themes/default/templates/render.html.ep b/themes/default/templates/render.html.ep
index 87724e9..75f7e0c 100755
--- a/themes/default/templates/render.html.ep
+++ b/themes/default/templates/render.html.ep
@@ -43,7 +43,6 @@
%= javascript '/partial/render.js?nbslices='.stash('f')->nbslices.'&file='.stash('f')->short
%= javascript '/js/filesize.min.js'
-%= javascript '/js/jszip.min.js'
%= javascript '/js/lufi-notifications.js'
%= javascript '/js/lufi-down.js', type => 'module'
% }