From e43e6d18b99e7c41baf2c9d744998e11ebfb11a7 Mon Sep 17 00:00:00 2001
From: Stirling-PDF-Bot <Stirling-PDF-Bot@stirlingtools.com>
Date: Wed, 17 Jan 2024 23:52:12 +0000
Subject: [PATCH 1/7] Update 3rd Party Licenses

---
 .../resources/static/3rdPartyLicenses.json    | 78 +++++++++++++++++--
 1 file changed, 72 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/static/3rdPartyLicenses.json b/src/main/resources/static/3rdPartyLicenses.json
index 88263b1d..699be591 100644
--- a/src/main/resources/static/3rdPartyLicenses.json
+++ b/src/main/resources/static/3rdPartyLicenses.json
@@ -357,22 +357,29 @@
         {
             "moduleName": "org.apache.pdfbox:fontbox",
             "moduleUrl": "https://pdfbox.apache.org",
-            "moduleVersion": "2.0.30",
-            "moduleLicense": "Apache License, Version 2.0",
+            "moduleVersion": "3.0.1",
+            "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "org.apache.pdfbox:pdfbox",
             "moduleUrl": "https://pdfbox.apache.org",
-            "moduleVersion": "2.0.30",
-            "moduleLicense": "Apache License, Version 2.0",
+            "moduleVersion": "3.0.1",
+            "moduleLicense": "Apache-2.0",
+            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
+        {
+            "moduleName": "org.apache.pdfbox:pdfbox-io",
+            "moduleUrl": "https://pdfbox.apache.org",
+            "moduleVersion": "3.0.1",
+            "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
             "moduleName": "org.apache.pdfbox:xmpbox",
             "moduleUrl": "https://pdfbox.apache.org",
-            "moduleVersion": "2.0.30",
-            "moduleLicense": "Apache License, Version 2.0",
+            "moduleVersion": "3.0.1",
+            "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
         {
@@ -450,6 +457,12 @@
             "moduleLicense": "BSD 2-Clause License",
             "moduleLicenseUrl": "https://opensource.org/licenses/BSD-2-Clause"
         },
+        {
+            "moduleName": "org.commonmark:commonmark-ext-gfm-tables",
+            "moduleVersion": "0.21.0",
+            "moduleLicense": "BSD 2-Clause License",
+            "moduleLicenseUrl": "https://opensource.org/licenses/BSD-2-Clause"
+        },
         {
             "moduleName": "org.eclipse.angus:angus-activation",
             "moduleUrl": "https://www.eclipse.org",
@@ -506,6 +519,52 @@
             "moduleLicense": "Public Domain",
             "moduleLicenseUrl": "http://repository.jboss.org/licenses/cc0-1.0.txt"
         },
+        {
+            "moduleName": "org.junit.jupiter:junit-jupiter",
+            "moduleUrl": "https://junit.org/junit5/",
+            "moduleVersion": "5.10.1",
+            "moduleLicense": "Eclipse Public License v2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html"
+        },
+        {
+            "moduleName": "org.junit.jupiter:junit-jupiter-api",
+            "moduleUrl": "https://junit.org/junit5/",
+            "moduleVersion": "5.10.1",
+            "moduleLicense": "Eclipse Public License v2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html"
+        },
+        {
+            "moduleName": "org.junit.jupiter:junit-jupiter-engine",
+            "moduleUrl": "https://junit.org/junit5/",
+            "moduleVersion": "5.10.1",
+            "moduleLicense": "Eclipse Public License v2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html"
+        },
+        {
+            "moduleName": "org.junit.jupiter:junit-jupiter-params",
+            "moduleUrl": "https://junit.org/junit5/",
+            "moduleVersion": "5.10.1",
+            "moduleLicense": "Eclipse Public License v2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html"
+        },
+        {
+            "moduleName": "org.junit.platform:junit-platform-commons",
+            "moduleUrl": "https://junit.org/junit5/",
+            "moduleVersion": "1.10.1",
+            "moduleLicense": "Eclipse Public License v2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html"
+        },
+        {
+            "moduleName": "org.junit.platform:junit-platform-engine",
+            "moduleUrl": "https://junit.org/junit5/",
+            "moduleVersion": "1.10.1",
+            "moduleLicense": "Eclipse Public License v2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-v20.html"
+        },
+        {
+            "moduleName": "org.junit:junit-bom",
+            "moduleVersion": "5.10.1"
+        },
         {
             "moduleName": "org.latencyutils:LatencyUtils",
             "moduleUrl": "http://latencyutils.github.io/LatencyUtils/",
@@ -513,6 +572,13 @@
             "moduleLicense": "Public Domain, per Creative Commons CC0",
             "moduleLicenseUrl": "http://creativecommons.org/publicdomain/zero/1.0/"
         },
+        {
+            "moduleName": "org.opentest4j:opentest4j",
+            "moduleUrl": "https://github.com/ota4j-team/opentest4j",
+            "moduleVersion": "1.3.0",
+            "moduleLicense": "The Apache License, Version 2.0",
+            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
         {
             "moduleName": "org.slf4j:jul-to-slf4j",
             "moduleUrl": "http://www.slf4j.org",

From 18d289d3b7d6c1f4ecf57be383f125df3385cace Mon Sep 17 00:00:00 2001
From: Dan Henry <dhenry437@gmail.com>
Date: Thu, 18 Jan 2024 12:07:02 +1100
Subject: [PATCH 2/7] Move filename input logic to its own function

---
 .../static/js/multitool/PdfContainer.js       | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/static/js/multitool/PdfContainer.js b/src/main/resources/static/js/multitool/PdfContainer.js
index 4a53c961..4ae7f434 100644
--- a/src/main/resources/static/js/multitool/PdfContainer.js
+++ b/src/main/resources/static/js/multitool/PdfContainer.js
@@ -74,26 +74,7 @@ class PdfContainer {
         input.onchange = async(e) => {
             const files = e.target.files;
             if (files.length > 0) {
-                const filenameInput = document.getElementById('filename-input');
-                const pagesContainer = document.getElementById('pages-container');
-                const downloadBtn = document.getElementById('export-button');
-
-                filenameInput.disabled = false;
-
-                if (pagesContainer.childElementCount === 0) {
-                    filenameInput.value = "";
-                    this.filename = null;
-                    downloadBtn.disabled = true;
-                } else {
-                    this.filename = filenameInput.value;
-                }
-
-                if (this.filename === null || this.filename === undefined) {
-                    filenameInput.value = files[0].name;
-                } else {
-                    filenameInput.value = this.filename;
-                }
-
+                updateFilenameInput()
             }
 
             this.addPdfsFromFiles(files, nextSiblingElement);
@@ -102,6 +83,28 @@ class PdfContainer {
         input.click();
     }
 
+    updateFilenameInput() {
+        const filenameInput = document.getElementById('filename-input');
+        const pagesContainer = document.getElementById('pages-container');
+        const downloadBtn = document.getElementById('export-button');
+
+        filenameInput.disabled = false;
+
+        if (pagesContainer.childElementCount === 0) {
+            filenameInput.value = "";
+            this.filename = null;
+            downloadBtn.disabled = true;
+        } else {
+            this.filename = filenameInput.value;
+        }
+
+        if (this.filename === null || this.filename === undefined) {
+            filenameInput.value = files[0].name;
+        } else {
+            filenameInput.value = this.filename;
+        }
+    }
+
     async addPdfsFromFiles(files, nextSiblingElement) {
         this.fileName = files[0].name;
         for (var i=0; i < files.length; i++) {
@@ -275,7 +278,7 @@ class PdfContainer {
     }
 
     updateFilename() {
-       const filenameInput = document.getElementById('filename-input');
+        const filenameInput = document.getElementById('filename-input');
         const downloadBtn = document.getElementById('export-button');
 
         if (filenameInput.value === "") {

From 1bd17eded6c1c25c4b2caa2fad731b92668aaeb4 Mon Sep 17 00:00:00 2001
From: Dan Henry <dhenry437@gmail.com>
Date: Thu, 18 Jan 2024 12:08:32 +1100
Subject: [PATCH 3/7] call updateFilenameInput on file drop

---
 src/main/resources/static/js/multitool/fileInput.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/resources/static/js/multitool/fileInput.js b/src/main/resources/static/js/multitool/fileInput.js
index 1a76bd48..fa64d47b 100644
--- a/src/main/resources/static/js/multitool/fileInput.js
+++ b/src/main/resources/static/js/multitool/fileInput.js
@@ -1,3 +1,5 @@
+import PdfContainer from "./PdfContainer";
+
 const addFileDragListener = (callback) => {
     let overlay;
     let dragCounter = 0;
@@ -43,10 +45,14 @@ const addFileDragListener = (callback) => {
             console.error(err);
             //maybe
         }).finally(() => {
+            // Hide and remove the overlay
             if (overlay) {
                 overlay.remove();
                 overlay = null;
             }
+
+            // Enable/disable filename input
+            PdfContainer.updateFilenameInput()
         });
     };
 

From a5165b04cd48d70ee161203a62daf2b933e7f17d Mon Sep 17 00:00:00 2001
From: sbplat <71648843+sbplat@users.noreply.github.com>
Date: Thu, 18 Jan 2024 01:08:31 -0500
Subject: [PATCH 4/7] fix(multi-tool): refactor fileInput.js into a class, fix
 filename variable typos, and update updateFilename logic for dropping files

---
 .../security/UserAuthenticationFilter.java    |   2 +-
 .../api/SplitPdfBySectionsController.java     |   4 +-
 .../static/js/multitool/PdfContainer.js       |  60 +++------
 .../static/js/multitool/fileInput.js          | 121 ++++++++++--------
 src/main/resources/templates/multi-tool.html  |  13 +-
 5 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java b/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java
index 61b209de..47423eb6 100644
--- a/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java
+++ b/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java
@@ -115,4 +115,4 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java b/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java
index de3e5a4b..90418169 100644
--- a/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java
@@ -121,8 +121,8 @@ public class SplitPdfBySectionsController {
                                     subDoc, subPage, AppendMode.APPEND, true, true)) {
                         // Set clipping area and position
                         float translateX = -subPageWidth * i;
-                       
-                        //float translateY = height - subPageHeight * (verticalDivisions - j);
+
+                        // float translateY = height - subPageHeight * (verticalDivisions - j);
                         float translateY = -subPageHeight * (verticalDivisions - 1 - j);
 
                         contentStream.saveGraphicsState();
diff --git a/src/main/resources/static/js/multitool/PdfContainer.js b/src/main/resources/static/js/multitool/PdfContainer.js
index 4ae7f434..7ff2e945 100644
--- a/src/main/resources/static/js/multitool/PdfContainer.js
+++ b/src/main/resources/static/js/multitool/PdfContainer.js
@@ -26,6 +26,7 @@ class PdfContainer {
                 movePageTo: this.movePageTo,
                 addPdfs: this.addPdfs,
                 rotateElement: this.rotateElement,
+                updateFilename: this.updateFilename
             })
         })
 
@@ -38,7 +39,7 @@ class PdfContainer {
 
         filenameInput.onkeyup = this.updateFilename;
         filenameInput.onkeydown = this.preventIllegalChars;
-        filenameInput.disabled = true;
+        filenameInput.disabled = false;
         filenameInput.innerText = "";
         downloadBtn.disabled = true;
     }
@@ -59,7 +60,7 @@ class PdfContainer {
             const vector = (endIndex !== -1 && startIndex > endIndex)
                 ?  0-width
                 : width;
-            
+
             this.pagesContainerWrapper.scroll({
                 left: this.pagesContainerWrapper.scrollLeft + vector,
             })
@@ -73,38 +74,14 @@ class PdfContainer {
         input.setAttribute("accept", "application/pdf");
         input.onchange = async(e) => {
             const files = e.target.files;
-            if (files.length > 0) {
-                updateFilenameInput()
-            }
 
             this.addPdfsFromFiles(files, nextSiblingElement);
+            this.updateFilename(files ? files[0].name : "");
         }
 
         input.click();
     }
 
-    updateFilenameInput() {
-        const filenameInput = document.getElementById('filename-input');
-        const pagesContainer = document.getElementById('pages-container');
-        const downloadBtn = document.getElementById('export-button');
-
-        filenameInput.disabled = false;
-
-        if (pagesContainer.childElementCount === 0) {
-            filenameInput.value = "";
-            this.filename = null;
-            downloadBtn.disabled = true;
-        } else {
-            this.filename = filenameInput.value;
-        }
-
-        if (this.filename === null || this.filename === undefined) {
-            filenameInput.value = files[0].name;
-        } else {
-            filenameInput.value = this.filename;
-        }
-    }
-
     async addPdfsFromFiles(files, nextSiblingElement) {
         this.fileName = files[0].name;
         for (var i=0; i < files.length; i++) {
@@ -200,7 +177,7 @@ class PdfContainer {
         return pdfDoc;
     }
 
-    
+
 
     rotateAll(deg) {
         for (var i=0; i<this.pagesContainer.childNodes.length; i++) {
@@ -218,13 +195,13 @@ class PdfContainer {
 	        if (!img) continue;
 	        const pages = await pdfDoc.copyPages(img.doc, [img.pageIdx])
 	        const page = pages[0];
-	
+
 	        const rotation = img.style.rotate;
 	        if (rotation) {
 	            const rotationAngle = parseInt(rotation.replace(/[^\d-]/g, ''));
 	            page.setRotation(PDFLib.degrees(page.getRotation().angle + rotationAngle))
 	        }
-	        
+
 	        pdfDoc.addPage(page);
 	    }
         const pdfBytes = await pdfDoc.save();
@@ -245,12 +222,12 @@ class PdfContainer {
             }
 
             filenameInput.value = inputArr.join('');
-            this.filename = filenameInput.value;
+            this.fileName = filenameInput.value;
         }
 
         if (!filenameInput.value.includes('.pdf')) {
             filenameInput.value = filenameInput.value + '.pdf';
-            this.filename = filenameInput.value;
+            this.fileName = filenameInput.value;
         }
 
         if (downloadOption === 'sameWindow') {
@@ -266,7 +243,7 @@ class PdfContainer {
             this.downloadLink.href = url;
             // downloadLink.download = this.fileName ? this.fileName : 'managed.pdf';
             // downloadLink.download = this.fileName;
-            this.downloadLink.setAttribute('download', this.filename ? this.fileName : 'managed.pdf');
+            this.downloadLink.setAttribute('download', this.fileName ? this.fileName : 'managed.pdf');
             this.downloadLink.setAttribute('target', '_blank');
             this.downloadLink.onclick = this.setDownloadAttribute;
             this.downloadLink.click();
@@ -274,20 +251,23 @@ class PdfContainer {
     }
 
     setDownloadAttribute() {
-        this.downloadLink.setAttribute("download", this.filename ? this.filename : 'managed.pdf');
+        this.downloadLink.setAttribute("download", this.fileName ? this.fileName : 'managed.pdf');
     }
 
-    updateFilename() {
+    updateFilename(fileName = "") {
         const filenameInput = document.getElementById('filename-input');
+        const pagesContainer = document.getElementById('pages-container');
         const downloadBtn = document.getElementById('export-button');
 
-        if (filenameInput.value === "") {
-            downloadBtn.disabled = true;
-            return;
+        downloadBtn.disabled = pagesContainer.childElementCount === 0
+
+        if (!this.fileName) {
+            this.fileName = fileName;
         }
 
-        downloadBtn.disabled = false;
-        this.filename = filenameInput.value;
+        if (!filenameInput.value) {
+            filenameInput.value = this.fileName;
+        }
     }
 
     preventIllegalChars(e) {
diff --git a/src/main/resources/static/js/multitool/fileInput.js b/src/main/resources/static/js/multitool/fileInput.js
index fa64d47b..ecaf64ed 100644
--- a/src/main/resources/static/js/multitool/fileInput.js
+++ b/src/main/resources/static/js/multitool/fileInput.js
@@ -1,75 +1,94 @@
-import PdfContainer from "./PdfContainer";
+class FileDragManager {
+    overlay;
+    dragCounter;
+    updateFilename;
 
-const addFileDragListener = (callback) => {
-    let overlay;
-    let dragCounter = 0;
+    constructor(cb = null) {
+        this.dragCounter = 0;
+        this.setCallback(cb);
 
-    const dragenterListener = function() {
-        dragCounter++;
-        if (!overlay) {
+        // Prevent default behavior for drag events
+        ['dragenter', 'dragover', 'dragleave', 'drop'].forEach(eventName => {
+            document.body.addEventListener(eventName, preventDefaults, false);
+        });
+
+        function preventDefaults(e) {
+            e.preventDefault();
+            e.stopPropagation();
+        }
+
+        this.dragenterListener = this.dragenterListener.bind(this);
+        this.dragleaveListener = this.dragleaveListener.bind(this);
+        this.dropListener = this.dropListener.bind(this);
+
+        document.body.addEventListener('dragenter', this.dragenterListener);
+        document.body.addEventListener('dragleave', this.dragleaveListener);
+        // Add drop event listener
+        document.body.addEventListener('drop', this.dropListener);
+    }
+
+    setActions({ updateFilename }) {
+        this.updateFilename = updateFilename;
+    }
+
+    setCallback(cb) {
+        if (cb) {
+            this.callback = cb;
+        } else {
+            this.callback = (files) => console.warn("FileDragManager not set");
+        }
+    }
+
+    dragenterListener() {
+        this.dragCounter++;
+        if (!this.overlay) {
             // Create and show the overlay
-            overlay = document.createElement('div');
-            overlay.style.position = 'fixed';
-            overlay.style.top = 0;
-            overlay.style.left = 0;
-            overlay.style.width = '100%';
-            overlay.style.height = '100%';
-            overlay.style.background = 'rgba(0, 0, 0, 0.5)';
-            overlay.style.color = '#fff';
-            overlay.style.zIndex = '1000';
-            overlay.style.display = 'flex';
-            overlay.style.alignItems = 'center';
-            overlay.style.justifyContent = 'center';
-            overlay.style.pointerEvents = 'none';
-            overlay.innerHTML = '<p>Drop files anywhere to upload</p>';
-            document.getElementById('content-wrap').appendChild(overlay);
+            this.overlay = document.createElement('div');
+            this.overlay.style.position = 'fixed';
+            this.overlay.style.top = 0;
+            this.overlay.style.left = 0;
+            this.overlay.style.width = '100%';
+            this.overlay.style.height = '100%';
+            this.overlay.style.background = 'rgba(0, 0, 0, 0.5)';
+            this.overlay.style.color = '#fff';
+            this.overlay.style.zIndex = '1000';
+            this.overlay.style.display = 'flex';
+            this.overlay.style.alignItems = 'center';
+            this.overlay.style.justifyContent = 'center';
+            this.overlay.style.pointerEvents = 'none';
+            this.overlay.innerHTML = '<p>Drop files anywhere to upload</p>';
+            document.getElementById('content-wrap').appendChild(this.overlay);
         }
     };
 
-    const dragleaveListener = function() {
-        dragCounter--;
-        if (dragCounter === 0) {
+    dragleaveListener() {
+        this.dragCounter--;
+        if (this.dragCounter === 0) {
             // Hide and remove the overlay
-            if (overlay) {
-                overlay.remove();
-                overlay = null;
+            if (this.overlay) {
+                this.overlay.remove();
+                this.overlay = null;
             }
         }
     };
 
-    const dropListener = function(e) {
+    dropListener(e) {
 
         const dt = e.dataTransfer;
         const files = dt.files;
-        callback(files).catch((err) => {
+        this.callback(files).catch((err) => {
             console.error(err);
             //maybe
         }).finally(() => {
             // Hide and remove the overlay
-            if (overlay) {
-                overlay.remove();
-                overlay = null;
+            if (this.overlay) {
+                this.overlay.remove();
+                this.overlay = null;
             }
 
-            // Enable/disable filename input
-            PdfContainer.updateFilenameInput()
+            this.updateFilename(files ? files[0].name : "");
         });
     };
-
-    // Prevent default behavior for drag events
-    ['dragenter', 'dragover', 'dragleave', 'drop'].forEach(eventName => {
-        document.body.addEventListener(eventName, preventDefaults, false);
-    });
-
-    function preventDefaults(e) {
-        e.preventDefault();
-        e.stopPropagation();
-    }
-
-    document.body.addEventListener('dragenter', dragenterListener);
-    document.body.addEventListener('dragleave', dragleaveListener);
-    // Add drop event listener
-    document.body.addEventListener('drop', dropListener);
 }
 
-export default addFileDragListener;
\ No newline at end of file
+export default FileDragManager;
diff --git a/src/main/resources/templates/multi-tool.html b/src/main/resources/templates/multi-tool.html
index d602cbe9..d49b7f83 100644
--- a/src/main/resources/templates/multi-tool.html
+++ b/src/main/resources/templates/multi-tool.html
@@ -49,7 +49,7 @@
                                     <path d="M8 4.466V.534a.25.25 0 0 0-.41-.192L5.23 2.308a.25.25 0 0 0 0 .384l2.36 1.966A.25.25 0 0 0 8 4.466z" />
                                 </svg>
                             </button>
-                            
+
                             <button class="btn btn-secondary enable-on-file" onclick="rotateAll(90)" disabled>
                                 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-clockwise" viewBox="0 0 16 16">
                                     <path fill-rule="evenodd" d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z" />
@@ -79,13 +79,14 @@
         import scrollDivHorizontally from "./js/multitool/horizontalScroll.js";
         import ImageHighlighter from "./js/multitool/ImageHighlighter.js";
         import PdfActionsManager from './js/multitool/PdfActionsManager.js';
-        import addFileInputListener from './js/multitool/fileInput.js';
+        import FileDragManager from './js/multitool/fileInput.js';
         // enables drag and drop
         const dragDropManager = new DragDropManager('drag-container', 'pages-container');
         // enables image highlight on click
         const imageHighlighter = new ImageHighlighter('image-highlighter');
         // enables the default action buttons on each pdf
         const pdfActionsManager = new PdfActionsManager('pages-container');
+        const fileDragManager = new FileDragManager();
 
         // Scroll the wrapper horizontally
         scrollDivHorizontally('pages-container-wrapper');
@@ -98,11 +99,11 @@
                 dragDropManager,
                 imageHighlighter,
                 pdfActionsManager,
+                fileDragManager
             ]
         )
-        addFileInputListener(async (files) => {
-            pdfContainer.addPdfsFromFiles(files);
-        });
+
+        fileDragManager.setCallback(async (files) => pdfContainer.addPdfsFromFiles(files));
     </script>
 
     <style>
@@ -186,7 +187,7 @@
 
         .page-container {
             height:250px;
-            display: flex; 
+            display: flex;
             align-items: center;
             flex-direction: column-reverse;
             aspect-ratio: 1;

From d09b252a4a246d188c6c69f07c11be0956765b24 Mon Sep 17 00:00:00 2001
From: phfuh <136272363+phfuh@users.noreply.github.com>
Date: Thu, 18 Jan 2024 19:48:21 +0100
Subject: [PATCH 5/7] Update messages_de_DE.properties

Translated the new entries, some corrections
---
 src/main/resources/messages_de_DE.properties | 103 +++++++++----------
 1 file changed, 51 insertions(+), 52 deletions(-)

diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties
index 082918c3..fee5703b 100644
--- a/src/main/resources/messages_de_DE.properties
+++ b/src/main/resources/messages_de_DE.properties
@@ -1,4 +1,4 @@
-###########
+###########
 # Generic #
 ###########
 # the direction that the language is written (ltr=left to right, rtl = right to left)
@@ -340,22 +340,22 @@ HTMLToPDF.tags=markup,web-content,transformation,convert
 
 home.MarkdownToPDF.title=Markdown zu PDF
 home.MarkdownToPDF.desc=Konvertiert jede Markdown-Datei zu PDF
-MarkdownToPDF.tags=markup,web-content,transformation,convert
+MarkdownToPDF.tags=markup,web-content,transformation,konvertieren
 
 
 home.getPdfInfo.title=Alle Informationen anzeigen
 home.getPdfInfo.desc=Erfasst alle möglichen Informationen in einer PDF
-getPdfInfo.tags=infomation,data,stats,statistics
+getPdfInfo.tags=infomation,daten,statistik
 
 
 home.extractPage.title=Seite(n) extrahieren
 home.extractPage.desc=Extrahiert ausgewählte Seiten aus einer PDF
-extractPage.tags=extract
+extractPage.tags=extrahieren
 
 
 home.PdfToSinglePage.title=PDF zu einer Seite zusammenfassen
 home.PdfToSinglePage.desc=Fügt alle PDF-Seiten zu einer einzigen großen Seite zusammen
-PdfToSinglePage.tags=single page
+PdfToSinglePage.tags=einzelseite
 
 
 home.showJS.title=Javascript anzeigen
@@ -363,26 +363,26 @@ home.showJS.desc=Alle Javascript Funktionen in einer PDF anzeigen
 showJS.tags=JS
 
 home.autoRedact.title=Automatisch zensieren/schwärzen
-home.autoRedact.desc=Automatisches zensierten (Schwärzen) von Text in einer PDF-Datei basierend auf dem eingegebenen Text
-showJS.tags=JS
+home.autoRedact.desc=Automatisches Zensieren (Schwärzen) von Text in einer PDF-Datei basierend auf dem eingegebenen Text
+showJS.tags=zensieren,schwärzen
 
 home.tableExtraxt.title=Tabelle extrahieren
 home.tableExtraxt.desc=Tabelle aus PDF in CSV extrahieren
 tableExtraxt.tags=CSV
 
 
-home.autoSizeSplitPDF.title=Auto Split by Size/Count
-home.autoSizeSplitPDF.desc=Split a single PDF into multiple documents based on size, page count, or document count
-autoSizeSplitPDF.tags=pdf,split,document,organization
+home.autoSizeSplitPDF.title=Teilen nach Größe/Anzahl
+home.autoSizeSplitPDF.desc=Teilen Sie ein einzelnes PDF basierend auf Größe, Seitenanzahl oder Dokumentanzahl in mehrere Dokumente auf
+autoSizeSplitPDF.tags=pdf,teilen,dokument,organisation
 
 
-home.overlay-pdfs.title=Overlay PDFs
-home.overlay-pdfs.desc=Overlays PDFs on-top of another PDF
-overlay-pdfs.tags=Overlay
+home.overlay-pdfs.title=PDF mit Overlay versehen
+home.overlay-pdfs.desc=Überlagert eine PDF über eine andere PDF
+overlay-pdfs.tags=overlay,überlagern
 
-home.split-by-sections.title=Split PDF by Sections
-home.split-by-sections.desc=Divide each page of a PDF into smaller horizontal and vertical sections
-split-by-sections.tags=Section Split, Divide, Customize
+home.split-by-sections.title=PDF in Abschnitte teilen
+home.split-by-sections.desc=Teilen Sie jede Seite einer PDF-Datei in kleinere horizontale und vertikale Abschnitte auf
+split-by-sections.tags=abschnitte,teilen,bearbeiten
 
 ###########################
 #                         #
@@ -408,7 +408,7 @@ autoRedact.useRegexLabel=Regex verwenden
 autoRedact.wholeWordSearchLabel=Ganzes Wort suchen
 autoRedact.customPaddingLabel=Benutzerdefinierte Extra-Padding
 autoRedact.convertPDFToImageLabel=PDF in PDF-Bild konvertieren (zum Entfernen von Text hinter dem Kasten)
-autoRedact.submitButton=zensieren
+autoRedact.submitButton=Zensieren
 
 
 #showJS
@@ -572,9 +572,9 @@ removeBlanks.submit=Leere Seiten entfernen
 
 
 #removeAnnotations
-removeAnnotations.title=Remove Annotations
-removeAnnotations.header=Remove Annotations
-removeAnnotations.submit=Remove
+removeAnnotations.title=Kommentare entfernen
+removeAnnotations.header=Kommentare entfernen
+removeAnnotations.submit=Entfernen
 
 
 #compare
@@ -591,7 +591,7 @@ sign.header=PDFs signieren
 sign.upload=Bild hochladen
 sign.draw=Signatur zeichnen
 sign.text=Texteingabe
-sign.clear=Klar
+sign.clear=Leeren
 sign.add=Signieren
 
 
@@ -883,44 +883,44 @@ PDFToXML.submit=Konvertieren
 #PDFToCSV
 PDFToCSV.title=PDF zu CSV
 PDFToCSV.header=PDF zu CSV
-PDFToCSV.prompt=Choose page to extract table
-PDFToCSV.submit=Extrakt
+PDFToCSV.prompt=Seite mit der zu extrahierenden Tabelle wählen
+PDFToCSV.submit=Extrahieren
 
 #split-by-size-or-count
-split-by-size-or-count.header=Split PDF by Size or Count
-split-by-size-or-count.type.label=Select Split Type
-split-by-size-or-count.type.size=By Size
-split-by-size-or-count.type.pageCount=By Page Count
-split-by-size-or-count.type.docCount=By Document Count
-split-by-size-or-count.value.label=Enter Value
-split-by-size-or-count.value.placeholder=Enter size (e.g., 2MB or 3KB) or count (e.g., 5)
-split-by-size-or-count.submit=Submit
+split-by-size-or-count.header=PDF nach Größe oder Anzahl teilen
+split-by-size-or-count.type.label=Teil-Modus wählen
+split-by-size-or-count.type.size=Nach Größe
+split-by-size-or-count.type.pageCount=Nach Anzahl Seiten
+split-by-size-or-count.type.docCount=Nach Anzahl Dokumenten
+split-by-size-or-count.value.label=Wert eingeben
+split-by-size-or-count.value.placeholder=Größe eingeben (z. B.: 2MB oder 3KB) oder Anzahl (z. B.: 5)
+split-by-size-or-count.submit=Erstellen
 
 
 #overlay-pdfs
-overlay-pdfs.header=Overlay PDF Files
-overlay-pdfs.baseFile.label=Select Base PDF File
-overlay-pdfs.overlayFiles.label=Select Overlay PDF Files
-overlay-pdfs.mode.label=Select Overlay Mode
-overlay-pdfs.mode.sequential=Sequential Overlay
-overlay-pdfs.mode.interleaved=Interleaved Overlay
-overlay-pdfs.mode.fixedRepeat=Fixed Repeat Overlay
-overlay-pdfs.counts.label=Overlay Counts (for Fixed Repeat Mode)
-overlay-pdfs.counts.placeholder=Enter comma-separated counts (e.g., 2,3,1)
-overlay-pdfs.position.label=Select Overlay Position
-overlay-pdfs.position.foreground=Foreground
-overlay-pdfs.position.background=Background
-overlay-pdfs.submit=Submit
+overlay-pdfs.header=PDF mit Overlay versehen
+overlay-pdfs.baseFile.label=Basis-PDF-Datei auswählen
+overlay-pdfs.overlayFiles.label=Overlay-PDF-Datei auswählen
+overlay-pdfs.mode.label=Overlay-Modus auswählen
+overlay-pdfs.mode.sequential=Sequentielles Overlay
+overlay-pdfs.mode.interleaved=Verschachteltes Overlay
+overlay-pdfs.mode.fixedRepeat=Feste-Wiederholung Overlay
+overlay-pdfs.counts.label=Overlay Anzahl (für Feste-Wiederholung)
+overlay-pdfs.counts.placeholder=Komma-separierte Anzahl eingeben (z. B.: 2,3,1)
+overlay-pdfs.position.label=Overlay Position auswählen
+overlay-pdfs.position.foreground=Vordergrund
+overlay-pdfs.position.background=Hintergrund
+overlay-pdfs.submit=Erstellen
 
 
 #split-by-sections
-split-by-sections.title=Split PDF by Sections
-split-by-sections.header=Split PDF into Sections
-split-by-sections.horizontal.label=Horizontal Divisions
-split-by-sections.vertical.label=Vertical Divisions
-split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
-split-by-sections.vertical.placeholder=Enter number of vertical divisions
-split-by-sections.submit=Split PDF
+split-by-sections.title=PDF in Abschnitte teilen
+split-by-sections.header=PDF in Abschnitte teilen
+split-by-sections.horizontal.label=Horizontale Teiler
+split-by-sections.vertical.label=Vertikale Teiler
+split-by-sections.horizontal.placeholder=Anzahl horizontaler Teiler eingeben
+split-by-sections.vertical.placeholder=Anzahl vertikaler Teiler eingeben
+split-by-sections.submit=PDF teilen
 
 
 #licenses
@@ -931,4 +931,3 @@ licenses.module=Module
 licenses.version=Version
 licenses.license=License
 
-

From e4dded3faad35969c9cd34287348ad41ea2690fc Mon Sep 17 00:00:00 2001
From: andrewdolphin <31809425+andrewdolphin@users.noreply.github.com>
Date: Fri, 19 Jan 2024 10:31:05 +0000
Subject: [PATCH 6/7] Remove bootstrap css from view-pdf.html that is causing
 issues when adding images

---
 src/main/resources/templates/view-pdf.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/resources/templates/view-pdf.html b/src/main/resources/templates/view-pdf.html
index b230f799..8aca4542 100644
--- a/src/main/resources/templates/view-pdf.html
+++ b/src/main/resources/templates/view-pdf.html
@@ -30,7 +30,6 @@ See https://github.com/adobe-type-tools/cmap-resources
     <!-- Bootstrap -->
 <script src="js/thirdParty/popper.min.js"></script>
 <script src="js/thirdParty/bootstrap.min.js"></script>
-<link rel="stylesheet" href="css/bootstrap.min.css">
 
     <!-- This snippet is used in production (included from view-pdf.html) -->
     <link rel="resource" type="application/l10n" href="pdfjs/locale/locale.properties">

From 06ef09035da7805b5159599c0401b2646f2d85a2 Mon Sep 17 00:00:00 2001
From: sbplat <71648843+sbplat@users.noreply.github.com>
Date: Mon, 22 Jan 2024 10:39:29 -0500
Subject: [PATCH 7/7] fix: remove blank pages not handling EXIT_FAILURE code
 properly

---
 .../security/UserAuthenticationFilter.java    |  2 +-
 .../api/SplitPdfBySectionsController.java     |  4 ++--
 .../api/misc/BlankPageController.java         | 24 ++++++++++++-------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java b/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java
index 61b209de..47423eb6 100644
--- a/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java
+++ b/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java
@@ -115,4 +115,4 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java b/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java
index de3e5a4b..90418169 100644
--- a/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java
@@ -121,8 +121,8 @@ public class SplitPdfBySectionsController {
                                     subDoc, subPage, AppendMode.APPEND, true, true)) {
                         // Set clipping area and position
                         float translateX = -subPageWidth * i;
-                       
-                        //float translateY = height - subPageHeight * (verticalDivisions - j);
+
+                        // float translateY = height - subPageHeight * (verticalDivisions - j);
                         float translateY = -subPageHeight * (verticalDivisions - 1 - j);
 
                         contentStream.saveGraphicsState();
diff --git a/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java b/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java
index 8a17e3de..21e5987b 100644
--- a/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java
@@ -33,7 +33,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.model.api.misc.RemoveBlankPagesRequest;
 import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.ProcessExecutor;
-import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
 @RestController
@@ -85,7 +84,7 @@ public class BlankPageController {
                         List<String> command =
                                 new ArrayList<>(
                                         Arrays.asList(
-                                                "python3",
+                                                "python",
                                                 System.getProperty("user.dir")
                                                         + "/scripts/detect-blank-pages.py",
                                                 tempFile.toString(),
@@ -94,18 +93,25 @@ public class BlankPageController {
                                                 "--white_percent",
                                                 String.valueOf(whitePercent)));
 
+                        Boolean blank = false;
                         // Run CLI command
-                        ProcessExecutorResult returnCode =
-                                ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV)
-                                        .runCommandWithOutputHandling(command);
+                        try {
+                            ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV)
+                                    .runCommandWithOutputHandling(command);
+                        } catch (IOException e) {
+                            // From detect-blank-pages.py
+                            // Return code 1: The image is considered blank.
+                            // Return code 0: The image is not considered blank.
+                            // Since the process returned with a failure code, it should be blank.
+                            blank = true;
+                        }
 
-                        // does contain data
-                        if (returnCode.getRc() == 0) {
+                        if (blank) {
+                            System.out.println("Skipping, Image was blank for page #" + pageIndex);
+                        } else {
                             System.out.println(
                                     "page " + pageIndex + " has image which is not blank");
                             pagesToKeepIndex.add(pageIndex);
-                        } else {
-                            System.out.println("Skipping, Image was blank for page #" + pageIndex);
                         }
                     }
                 }