mirror of
https://github.com/Frooodle/Stirling-PDF.git
synced 2025-04-03 01:17:18 +02:00
Download cleanup
This commit is contained in:
Anthony Stirling
parent
1499e78795
commit
576d11f09a
@ -227,277 +227,205 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
document.querySelector("#errorContainer p").textContent = message;
|
document.querySelector("#errorContainer p").textContent = message;
|
||||||
document.querySelector("#traceContent").textContent = stackTrace;
|
document.querySelector("#traceContent").textContent = stackTrace;
|
||||||
}
|
}
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function () {
|
||||||
$('form').submit(async function(event) {
|
$('form').submit(async function (event) {
|
||||||
const boredWaiting = localStorage.getItem('boredWaiting');
|
event.preventDefault();
|
||||||
if (boredWaiting === 'enabled') {
|
|
||||||
$('#show-game-btn').show();
|
const url = this.action;
|
||||||
}
|
const files = $('#fileInput-input')[0].files;
|
||||||
var processing = "Processing..."
|
const formData = new FormData(this);
|
||||||
var submitButtonText = $('#submitBtn').text()
|
const override = $('#override').val() || '';
|
||||||
|
|
||||||
$('#submitBtn').text('Processing...');
|
|
||||||
console.log("start download code")
|
|
||||||
var files = $('#fileInput-input')[0].files;
|
|
||||||
var url = this.action;
|
|
||||||
console.log(url)
|
|
||||||
event.preventDefault(); // Prevent the default form handling behavior
|
|
||||||
|
|
||||||
/* Check if ${multiple} is false */
|
$('#submitBtn').text('Processing...');
|
||||||
var multiple = [[${multiple}]] || false;
|
|
||||||
var override = $('#override').val() || '';
|
try {
|
||||||
console.log("override=" + override)
|
if (override === 'multi' || files.length > 1 && override !== 'single') {
|
||||||
|
await submitMultiPdfForm(url, files);
|
||||||
if([[${remoteCall}]] === true) {
|
} else {
|
||||||
if (override === 'multi' || (!multiple && files.length > 1) && override !== 'single' ) {
|
const downloadDetails = await handleSingleDownload(url, formData);
|
||||||
console.log("multi parallel download")
|
|
||||||
await submitMultiPdfForm(event,url);
|
|
||||||
} else {
|
|
||||||
console.log("start single download")
|
|
||||||
|
|
||||||
// Get the selected download option from localStorage
|
|
||||||
const downloadOption = localStorage.getItem('downloadOption');
|
|
||||||
|
|
||||||
var formData = new FormData($('form')[0]);
|
|
||||||
|
|
||||||
// Send the request to the server using the fetch() API
|
|
||||||
const response = await fetch(url, {
|
|
||||||
method: 'POST',
|
|
||||||
body: formData
|
|
||||||
});
|
|
||||||
try {
|
|
||||||
if (!response) {
|
|
||||||
throw new Error('Received null response for file ' + i);
|
|
||||||
}
|
|
||||||
console.log("load single download")
|
|
||||||
|
|
||||||
|
|
||||||
// Extract the filename from the Content-Disposition header, if present
|
|
||||||
let filename = null;
|
|
||||||
const contentDispositionHeader = response.headers.get('Content-Disposition');
|
|
||||||
console.log(contentDispositionHeader)
|
|
||||||
if (contentDispositionHeader && contentDispositionHeader.indexOf('attachment') !== -1) {
|
|
||||||
filename = decodeURIComponent(contentDispositionHeader.split('filename=')[1].replace(/"/g, ''));
|
|
||||||
} else {
|
|
||||||
// If the Content-Disposition header is not present or does not contain the filename, use a default filename
|
|
||||||
filename = 'download';
|
|
||||||
}
|
|
||||||
console.log("filename=" + filename)
|
|
||||||
|
|
||||||
|
|
||||||
const contentType = response.headers.get('Content-Type');
|
|
||||||
console.log("contentType=" + contentType)
|
|
||||||
// Check if the response is a PDF or an image
|
|
||||||
if (contentType.includes('pdf') || contentType.includes('image')) {
|
|
||||||
const blob = await response.blob();
|
|
||||||
console.log("pdf/image")
|
|
||||||
|
|
||||||
// Perform the appropriate action based on the download option
|
|
||||||
if (downloadOption === 'sameWindow') {
|
|
||||||
console.log("same window")
|
|
||||||
|
|
||||||
// Open the file in the same window
|
|
||||||
window.location.href = URL.createObjectURL(blob);
|
|
||||||
} else if (downloadOption === 'newWindow') {
|
|
||||||
console.log("new window")
|
|
||||||
|
|
||||||
// Open the file in a new window
|
|
||||||
window.open(URL.createObjectURL(blob), '_blank');
|
|
||||||
} else {
|
|
||||||
console.log("else save")
|
|
||||||
|
|
||||||
// Download the file
|
|
||||||
const link = document.createElement('a');
|
|
||||||
link.href = URL.createObjectURL(blob);
|
|
||||||
link.download = filename;
|
|
||||||
link.click();
|
|
||||||
}
|
|
||||||
} else if (contentType.includes('json')) {
|
|
||||||
// Handle the JSON response
|
|
||||||
const json = await response.json();
|
|
||||||
// Format the error message
|
|
||||||
const errorMessage = JSON.stringify(json, null, 2);
|
|
||||||
// Display the error message in an alert
|
|
||||||
if(errorMessage.toLowerCase().includes('the password is incorrect') || errorMessage.toLowerCase().includes('Password is not provided')){
|
|
||||||
alert('[[#{error.pdfPassword}]]');
|
|
||||||
} else {
|
|
||||||
showErrorBanner(json.error + ':' + json.message, json.trace);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
const blob = await response.blob()
|
|
||||||
console.log("else save 2 zip")
|
|
||||||
|
|
||||||
// For ZIP files or other file types, just download the file
|
|
||||||
const link = document.createElement('a');
|
|
||||||
link.href = URL.createObjectURL(blob);
|
|
||||||
link.download = filename;
|
|
||||||
link.click();
|
|
||||||
}
|
|
||||||
} catch(error) {
|
|
||||||
console.log("error listener")
|
|
||||||
|
|
||||||
// Extract the error message and stack trace from the response
|
|
||||||
const errorMessage = error.message;
|
|
||||||
const stackTrace = error.stack;
|
|
||||||
|
|
||||||
// Create an error message to display to the user
|
|
||||||
const message = `${errorMessage}\n\n${stackTrace}`;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Display the error message to the user
|
// Determine the download option from localStorage
|
||||||
if(errorMessage.toLowerCase().includes('the password is incorrect') || errorMessage.toLowerCase().includes('Password is not provided')){
|
const downloadOption = localStorage.getItem('downloadOption');
|
||||||
showErrorBanner('[[#{error.pdfPassword}]]', stackTrace);
|
|
||||||
} else {
|
|
||||||
showErrorBanner('[[#{error.generic}]]', stackTrace);
|
|
||||||
}
|
|
||||||
$('#submitBtn').text(submitButtonText);
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
//Offline do nothing and let other scripts handle everything
|
|
||||||
|
|
||||||
}
|
|
||||||
$('#submitBtn').text(submitButtonText);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
async function submitMultiPdfForm(event, url) {
|
|
||||||
// Get the selected PDF files
|
|
||||||
let files = $('#fileInput-input')[0].files;
|
|
||||||
|
|
||||||
// Get the existing form data
|
// Handle the download action according to the selected option
|
||||||
let formData = new FormData($('form')[0]);
|
handleDownloadAction(downloadOption, downloadDetails.blob, downloadDetails.filename);
|
||||||
formData.delete('fileInput');
|
}
|
||||||
|
|
||||||
// Show the progress bar
|
$('#submitBtn').text('Submit');
|
||||||
$('#progressBarContainer').show();
|
} catch (error) {
|
||||||
|
handleDownloadError(error);
|
||||||
|
$('#submitBtn').text('Submit');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
// Initialize the progress bar
|
function handleDownloadAction(downloadOption, blob, filename) {
|
||||||
let progressBar = $('#progressBar');
|
const url = URL.createObjectURL(blob);
|
||||||
progressBar.css('width', '0%');
|
|
||||||
progressBar.attr('aria-valuenow', 0);
|
switch (downloadOption) {
|
||||||
progressBar.attr('aria-valuemax', files.length);
|
case 'sameWindow':
|
||||||
|
// Open the file in the same window
|
||||||
|
window.location.href = url;
|
||||||
|
break;
|
||||||
|
case 'newWindow':
|
||||||
|
// Open the file in a new window
|
||||||
|
window.open(url, '_blank');
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
// Download the file
|
||||||
|
const link = document.createElement('a');
|
||||||
|
link.href = url;
|
||||||
|
link.download = filename;
|
||||||
|
link.click();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Check the flag in localStorage, default to 4
|
async function handleSingleDownload(url, formData) {
|
||||||
const zipThreshold = parseInt(localStorage.getItem('zipThreshold'), 10) || 4;
|
const response = await fetch(url, {
|
||||||
const zipFiles = files.length > zipThreshold;
|
method: 'POST',
|
||||||
|
body: formData
|
||||||
|
});
|
||||||
|
|
||||||
// Initialize JSZip instance if needed
|
if (!response.ok) {
|
||||||
let jszip = null;
|
throw new Error(`HTTP error! status: ${response.status}`);
|
||||||
if (zipFiles) {
|
} else {
|
||||||
jszip = new JSZip();
|
const blob = await response.blob();
|
||||||
}
|
const filename = getFilenameFromContentDisposition(response.headers.get('Content-Disposition'));
|
||||||
|
return { blob, filename };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function getFilenameFromContentDisposition(contentDisposition) {
|
||||||
|
let filename;
|
||||||
|
|
||||||
// Submit each PDF file in parallel
|
if (contentDisposition && contentDisposition.indexOf('attachment') !== -1) {
|
||||||
let promises = [];
|
filename = decodeURIComponent(contentDisposition.split('filename=')[1].replace(/"/g, ''));
|
||||||
for (let i = 0; i < files.length; i++) {
|
} else {
|
||||||
let promise = new Promise(async function(resolve, reject) {
|
// If the Content-Disposition header is not present or does not contain the filename, use a default filename
|
||||||
let fileFormData = new FormData();
|
filename = 'download';
|
||||||
fileFormData.append('fileInput', files[i]);
|
}
|
||||||
for (let pair of formData.entries()) {
|
|
||||||
fileFormData.append(pair[0], pair[1]);
|
|
||||||
}
|
|
||||||
console.log(fileFormData);
|
|
||||||
|
|
||||||
try {
|
return filename;
|
||||||
let response = await fetch(url, {
|
}
|
||||||
method: 'POST',
|
|
||||||
body: fileFormData
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response) {
|
|
||||||
throw new Error('Received null response for file ' + i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`Error submitting request for file ${i}: ${response.status} ${response.statusText}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
let contentDisposition = response.headers.get('content-disposition');
|
|
||||||
let fileName = "file.pdf"
|
|
||||||
if (!contentDisposition) {
|
|
||||||
//throw new Error('Content-Disposition header not found for file ' + i);
|
|
||||||
} else {
|
|
||||||
fileName = decodeURIComponent(contentDisposition.split('filename=')[1].replace(/"/g, ''));
|
|
||||||
}
|
|
||||||
console.log('Received response for file ' + i + ': ' + response);
|
|
||||||
|
|
||||||
|
|
||||||
let blob = await response.blob();
|
async function handlePdfOrImageResponse(response, filename) {
|
||||||
if (zipFiles) {
|
const downloadOption = localStorage.getItem('downloadOption');
|
||||||
// Add the file to the ZIP archive
|
const blob = await response.blob();
|
||||||
jszip.file(fileName, blob);
|
const url = URL.createObjectURL(blob);
|
||||||
resolve();
|
if (downloadOption === 'sameWindow') {
|
||||||
} else {
|
window.location.href = url;
|
||||||
// Download the file directly
|
} else if (downloadOption === 'newWindow') {
|
||||||
let url = window.URL.createObjectURL(blob);
|
window.open(url, '_blank');
|
||||||
let a = document.createElement('a');
|
} else {
|
||||||
a.href = url;
|
downloadFile(url, filename);
|
||||||
a.download = fileName;
|
}
|
||||||
document.body.appendChild(a);
|
}
|
||||||
a.click();
|
|
||||||
a.remove();
|
|
||||||
resolve();
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error submitting request for file ' + i + ': ' + error);
|
|
||||||
|
|
||||||
// Set default values or fallbacks for error properties
|
async function handleJsonResponse(response) {
|
||||||
let status = error && error.status || 500;
|
const json = await response.json();
|
||||||
let statusText = error && error.statusText || 'Internal Server Error';
|
const errorMessage = JSON.stringify(json, null, 2);
|
||||||
let message = error && error.message || 'An error occurred while processing your request.';
|
if(errorMessage.toLowerCase().includes('the password is incorrect') || errorMessage.toLowerCase().includes('Password is not provided')){
|
||||||
|
alert('[[#{error.pdfPassword}]]');
|
||||||
|
} else {
|
||||||
|
showErrorBanner(json.error + ':' + json.message, json.trace);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Reject the Promise to signal that the request has failed
|
async function handleOtherResponse(response, filename) {
|
||||||
reject();
|
const blob = await response.blob();
|
||||||
// Redirect to error page with Spring Boot error parameters
|
const url = URL.createObjectURL(blob);
|
||||||
let url = '/error?status=' + status + '&error=' + encodeURIComponent(statusText) + '&message=' + encodeURIComponent(message);
|
downloadFile(url, filename);
|
||||||
window.location.href = url;
|
}
|
||||||
}
|
function handleDownloadError(error) {
|
||||||
});
|
const errorMessage = error.message;
|
||||||
|
showErrorBanner(errorMessage);
|
||||||
|
}
|
||||||
|
|
||||||
// Update the progress bar as each request finishes
|
let urls = []; // An array to hold all the URLs
|
||||||
promise.then(function() {
|
|
||||||
updateProgressBar(progressBar, files);
|
|
||||||
});
|
|
||||||
|
|
||||||
promises.push(promise);
|
function downloadFile(blob, filename) {
|
||||||
}
|
const url = URL.createObjectURL(blob);
|
||||||
|
const a = document.createElement('a');
|
||||||
|
a.href = url;
|
||||||
|
a.download = filename;
|
||||||
|
a.click();
|
||||||
|
urls.push(url); // Store the URL so it doesn't get garbage collected too soon
|
||||||
|
}
|
||||||
|
|
||||||
// Wait for all requests to finish
|
|
||||||
try {
|
async function submitMultiPdfForm(url, files) {
|
||||||
await Promise.all(promises);
|
const zipThreshold = parseInt(localStorage.getItem('zipThreshold'), 10) || 4;
|
||||||
} catch (error) {
|
const zipFiles = files.length > zipThreshold;
|
||||||
console.error('Error while uploading files: ' + error);
|
let jszip = null;
|
||||||
}
|
let progressBar = $('#progressBar');
|
||||||
|
progressBar.css('width', '0%');
|
||||||
|
progressBar.attr('aria-valuenow', 0);
|
||||||
|
progressBar.attr('aria-valuemax', Array.from(files).length);
|
||||||
|
if (zipFiles) {
|
||||||
|
jszip = new JSZip();
|
||||||
|
}
|
||||||
|
|
||||||
// Update the progress bar
|
// Get existing form data
|
||||||
progressBar.css('width', '100%');
|
let formData = new FormData($('form')[0]);
|
||||||
progressBar.attr('aria-valuenow', files.length);
|
formData.delete('fileInput');
|
||||||
|
|
||||||
// After all requests are finished, download the ZIP file if needed
|
const CONCURRENCY_LIMIT = 8;
|
||||||
if (zipFiles) {
|
const chunks = [];
|
||||||
try {
|
for (let i = 0; i < Array.from(files).length; i += CONCURRENCY_LIMIT) {
|
||||||
let content = await jszip.generateAsync({ type: "blob" });
|
chunks.push(Array.from(files).slice(i, i + CONCURRENCY_LIMIT));
|
||||||
let url = window.URL.createObjectURL(content);
|
}
|
||||||
let a = document.createElement('a');
|
|
||||||
a.href = url;
|
for (const chunk of chunks) {
|
||||||
a.download = "files.zip";
|
const promises = chunk.map(async file => {
|
||||||
document.body.appendChild(a);
|
let fileFormData = new FormData();
|
||||||
a.click();
|
fileFormData.append('fileInput', file);
|
||||||
a.remove();
|
|
||||||
} catch (error) {
|
// Add other form data
|
||||||
console.error('Error generating ZIP file: ' + error);
|
for (let pair of formData.entries()) {
|
||||||
}
|
fileFormData.append(pair[0], pair[1]);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
try {
|
||||||
|
const downloadDetails = await handleSingleDownload(url, fileFormData);
|
||||||
|
if (zipFiles) {
|
||||||
|
jszip.file(downloadDetails.filename, downloadDetails.blob);
|
||||||
|
} else {
|
||||||
|
downloadFile(downloadDetails.blob, downloadDetails.filename);
|
||||||
|
}
|
||||||
|
updateProgressBar(progressBar, Array.from(files).length);
|
||||||
|
} catch (error) {
|
||||||
|
handleDownloadError(error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
await Promise.all(promises);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (zipFiles) {
|
||||||
|
try {
|
||||||
|
const content = await jszip.generateAsync({ type: "blob" });
|
||||||
|
downloadFile(content, "files.zip");
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error generating ZIP file: ' + error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function updateProgressBar(progressBar, files) {
|
function updateProgressBar(progressBar, files) {
|
||||||
let progress = ((progressBar.attr('aria-valuenow') / files.length) * 100) + (100 / files.length);
|
let progress = ((progressBar.attr('aria-valuenow') / files.length) * 100) + (100 / files.length);
|
||||||
progressBar.css('width', progress + '%');
|
progressBar.css('width', progress + '%');
|
||||||
progressBar.attr('aria-valuenow', parseInt(progressBar.attr('aria-valuenow')) + 1);
|
progressBar.attr('aria-valuenow', parseInt(progressBar.attr('aria-valuenow')) + 1);
|
||||||
}
|
}
|
||||||
|
window.addEventListener('unload', () => {
|
||||||
|
for (const url of urls) {
|
||||||
|
URL.revokeObjectURL(url);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="custom-file-chooser">
|
<div class="custom-file-chooser">
|
||||||
|
|||||||
@ -41,6 +41,10 @@
|
|||||||
|
|
||||||
<!-- Help Modal -->
|
<!-- Help Modal -->
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
#errorContainer {
|
||||||
|
margin: 20px; /* adjust this value as needed */
|
||||||
|
}
|
||||||
|
|
||||||
#helpModalDialog {
|
#helpModalDialog {
|
||||||
width: 90%;
|
width: 90%;
|
||||||
max-width: 800px;
|
max-width: 800px;
|
||||||
@ -159,7 +163,7 @@ margin-top: 0;
|
|||||||
<a href="https://discord.gg/Cn8pWhQRxZ" id="discord-button" target="_blank">Discord - Submit Support post</a>
|
<a href="https://discord.gg/Cn8pWhQRxZ" id="discord-button" target="_blank">Discord - Submit Support post</a>
|
||||||
</div>
|
</div>
|
||||||
<a href="/" id="home-button">Go to Homepage</a>
|
<a href="/" id="home-button">Go to Homepage</a>
|
||||||
<a href="/" id="home-button">Close</a>
|
<a data-dismiss="modal" id="home-button">Close</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user