Image stuff (#77)

Features
---------
Image to PDF supports multiple images, stretching and auto rotation
File inputs now only search for wanted file type
Settings now has a zip range so it can zip if you have more than x downloads (default 4)

extras
---------
DevTools support for easier development
Fix for temporary files for thread safety

build.gradle

@@ -21,8 +21,9 @@ dependencies {
 	
 	//general PDF
     implementation 'org.apache.pdfbox:pdfbox:2.0.27'
-    implementation 'com.itextpdf:itextpdf:5.5.13.3'
         
+    implementation 'com.itextpdf:itextpdf:5.5.13.3'
+    developmentOnly("org.springframework.boot:spring-boot-devtools")
 
 }
 

src/main/java/stirling/software/SPDF/controller/CompressController.java

@@ -1,23 +1,15 @@
 package stirling.software.SPDF.controller;
 
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.imageio.ImageIO;
-
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDResources;
-import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -26,30 +18,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.itextpdf.text.DocumentException;
-import com.itextpdf.text.pdf.PdfReader;
-import com.itextpdf.text.pdf.PdfStamper;
-
-import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.ProcessExecutor;
 
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 
 @Controller
 public class CompressController {

src/main/java/stirling/software/SPDF/controller/OCRController.java

@@ -1,10 +1,8 @@
 package stirling.software.SPDF.controller;
 
-import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -13,11 +11,12 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -28,13 +27,6 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
 import stirling.software.SPDF.utils.ProcessExecutor;
-
-import java.io.FileOutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 //import com.spire.pdf.*;
 @Controller
 public class OCRController {

src/main/java/stirling/software/SPDF/controller/SplitPDFController.java

@@ -1,7 +1,6 @@
 package stirling.software.SPDF.controller;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -10,7 +9,6 @@ import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -108,7 +106,7 @@ public class SplitPDFController {
         document.close();
 
         // create the zip file
-        Path zipFile = Paths.get("split_documents.zip");
+        Path zipFile = Files.createTempFile("split_documents", ".zip");
         URI uri = URI.create("jar:file:" + zipFile.toUri().getPath());
         Map<String, String> env = new HashMap<>();
         env.put("create", "true");
@@ -132,7 +130,7 @@ public class SplitPDFController {
         logger.info("Successfully created zip file with split documents: {}", zipFile.toString());
         byte[] data = Files.readAllBytes(zipFile);
         ByteArrayResource resource = new ByteArrayResource(data);
-        new File("split_documents.zip").delete();
+        Files.delete(zipFile);
         // return the Resource in the response
         return ResponseEntity.ok().header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_split.zip").contentType(MediaType.APPLICATION_OCTET_STREAM)
                 .contentLength(resource.contentLength()).body(resource);

src/main/java/stirling/software/SPDF/controller/converters/ConvertImgPDFController.java

@@ -38,12 +38,13 @@ public class ConvertImgPDFController {
     }
 
     @PostMapping("/img-to-pdf")
-    public ResponseEntity<byte[]> convertToPdf(@RequestParam("fileInput") MultipartFile file) throws IOException {
+    public ResponseEntity<byte[]> convertToPdf(@RequestParam("fileInput") MultipartFile[] file,
+            @RequestParam(defaultValue = "false", name = "stretchToFit") boolean stretchToFit,
+            @RequestParam(defaultValue = "true", name = "autoRotate") boolean autoRotate) throws IOException {
         // Convert the file to PDF and get the resulting bytes
-        byte[] bytes = PdfUtils.convertToPdf(file.getInputStream());
+        System.out.println(stretchToFit);
-        logger.info("File {} successfully converted to pdf", file.getOriginalFilename());
+        byte[] bytes = PdfUtils.imageToPdf(file, stretchToFit, autoRotate);
-
+        return PdfUtils.bytesToWebResponse(bytes, file[0].getOriginalFilename().replaceFirst("[.][^.]+$", "")+ "_coverted.pdf");
-        return PdfUtils.bytesToWebResponse(bytes, file.getOriginalFilename().replaceFirst("[.][^.]+$", "")+ "_coverted.pdf");
     }
 
     @PostMapping("/pdf-to-img")

src/main/java/stirling/software/SPDF/controller/converters/ConvertOfficeController.java

@@ -1,9 +1,6 @@
 package stirling.software.SPDF.controller.converters;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -17,9 +14,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.ModelAndView;
 
-import stirling.software.SPDF.LibreOfficeListener;
 import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.ProcessExecutor;
 @Controller

src/main/java/stirling/software/SPDF/utils/PdfUtils.java

@@ -8,6 +8,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -28,6 +29,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.multipart.MultipartFile;
 
 import com.itextpdf.text.Document;
 import com.itextpdf.text.DocumentException;
@@ -37,12 +39,13 @@ public class PdfUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(PdfUtils.class);
 
-    public static byte[] convertToPdf(InputStream imageStream) throws IOException {
+    public static byte[] imageToPdf(MultipartFile[] files, boolean stretchToFit, boolean autoRotate) throws IOException {
+        try (PDDocument doc = new PDDocument()) {
+            for (MultipartFile file : files) {
+                // Create a temporary file for the image
+                File imageFile = Files.createTempFile("image", ".jpg").toFile();
 
-        // Create a File object for the image
+                try (FileOutputStream fos = new FileOutputStream(imageFile); InputStream input = file.getInputStream()) {
-        File imageFile = new File("image.jpg");
-
-        try (FileOutputStream fos = new FileOutputStream(imageFile); InputStream input = imageStream) {
                     byte[] buffer = new byte[1024];
                     int len;
                     // Read from the input stream and write to the file
@@ -55,7 +58,6 @@ public class PdfUtils {
                     throw e;
                 }
 
-        try (PDDocument doc = new PDDocument()) {
                 // Create a new PDF page
                 PDPage page = new PDPage();
                 doc.addPage(page);
@@ -63,23 +65,74 @@ public class PdfUtils {
                 // Create an image object from the image file
                 PDImageXObject image = PDImageXObject.createFromFileByContent(imageFile, doc);
 
+                float pageWidth = page.getMediaBox().getWidth();
+                float pageHeight = page.getMediaBox().getHeight();
+
+                if (autoRotate && ((image.getWidth() > image.getHeight() && pageHeight > pageWidth) || (image.getWidth() < image.getHeight() && pageWidth > pageHeight))) {
+                    // Rotate the page 90 degrees if the image better fits the page in landscape orientation
+                    page.setRotation(90);
+                    pageWidth = page.getMediaBox().getHeight();
+                    pageHeight = page.getMediaBox().getWidth();
+                }
+
                 try (PDPageContentStream contentStream = new PDPageContentStream(doc, page)) {
+                    if (stretchToFit) {
+                        if (page.getRotation() == 0 || page.getRotation() == 180) {
+                            // Stretch the image to fit the whole page
+                            contentStream.drawImage(image, 0, 0, pageWidth, pageHeight);
+                        } else {
+                            // Adjust the width and height of the page when rotated
+                            contentStream.drawImage(image, 0, 0, pageHeight, pageWidth);
+                        }
+                        logger.info("Image successfully added to PDF, stretched to fit page");
+                    } else {
+                        // Ensure the image fits the page but maintain the image's aspect ratio
+                        float imageAspectRatio = (float) image.getWidth() / (float) image.getHeight();
+                        float pageAspectRatio = pageWidth / pageHeight;
+
+                        // Determine the scale factor to fit the image onto the page
+                        float scaleFactor = 1.0f;
+                        if (imageAspectRatio > pageAspectRatio) {
+                            // Image is wider than the page, scale to fit the width
+                            scaleFactor = pageWidth / image.getWidth();
+                        } else {
+                            // Image is taller than the page, scale to fit the height
+                            scaleFactor = pageHeight / image.getHeight();
+                        }
+
+                        // Calculate the position of the image on the page
+                        float xPos = (pageWidth - (image.getWidth() * scaleFactor)) / 2;
+                        float yPos = (pageHeight - (image.getHeight() * scaleFactor)) / 2;
+
                         // Draw the image onto the page
-                contentStream.drawImage(image, 0, 0);
+                        if (page.getRotation() == 0 || page.getRotation() == 180) {
-                logger.info("Image successfully added to PDF");
+                            contentStream.drawImage(image, xPos, yPos, image.getWidth() * scaleFactor, image.getHeight() * scaleFactor);
+                        } else {
+                            // Adjust the width and height of the page when rotated
+                            contentStream.drawImage(image, yPos, xPos, image.getHeight() * scaleFactor, image.getWidth() * scaleFactor);
+                        }
+                        logger.info("Image successfully added to PDF, maintaining aspect ratio");
+                    }
                 } catch (IOException e) {
                     logger.error("Error adding image to PDF", e);
                     throw e;
                 }
 
+                // Delete the temporary file
+                imageFile.delete();
+            }
+
             // Create a ByteArrayOutputStream to save the PDF to
             ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
             doc.save(byteArrayOutputStream);
             logger.info("PDF successfully saved to byte array");
+
             return byteArrayOutputStream.toByteArray();
         }
+
     }
 
+
     public static byte[] convertFromPdf(byte[] inputStream, String imageType, ImageType colorType, boolean singleImage, int DPI)
             throws IOException, Exception {
         try (PDDocument document = PDDocument.load(new ByteArrayInputStream(inputStream))) {

src/main/java/stirling/software/SPDF/utils/ProcessExecutor.java

@@ -1,13 +1,11 @@
 package stirling.software.SPDF.utils;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.List;
-import java.io.BufferedReader;
 import java.util.ArrayList;
+import java.util.List;
 public class ProcessExecutor {
 	public static int runCommandWithOutputHandling(List<String> command) throws IOException, InterruptedException {
 	    ProcessBuilder processBuilder = new ProcessBuilder(command);

src/main/resources/application.properties

@@ -17,3 +17,8 @@ server.error.include-exception=true
 server.error.include-message=always
 
 server.servlet.session.tracking-modes=cookie
+
+spring.devtools.restart.enabled=true
+spring.devtools.livereload.enabled=true
+
+spring.thymeleaf.encoding=UTF-8

src/main/resources/messages_ar_AR.properties

@@ -95,7 +95,7 @@ settings.downloadOption.title=\u062A\u062D\u062F\u064A\u062F \u062E\u064A\u0627\
 settings.downloadOption.1=\u0641\u062A\u062D \u0641\u064A \u0646\u0641\u0633 \u0627\u0644\u0646\u0627\u0641\u0630\u0629
 settings.downloadOption.2=\u0641\u062A\u062D \u0641\u064A \u0646\u0627\u0641\u0630\u0629 \u062C\u062F\u064A\u062F\u0629
 settings.downloadOption.3=\u062A\u0646\u0632\u064A\u0644 \u0627\u0644\u0645\u0644\u0641
-settings.zip=\u0645\u0644\u0641\u0627\u062A \u0627\u0644\u062A\u0646\u0632\u064A\u0644 \u0627\u0644\u0645\u062A\u0639\u062F\u062F \u0627\u0644\u0645\u0636\u063A\u0648\u0637\u0629
+settings.zipThreshold=\u0645\u0644\u0641\u0627\u062A \u0645\u0636\u063A\u0648\u0637\u0629 \u0639\u0646\u062F \u062A\u062C\u0627\u0648\u0632 \u0639\u062F\u062F \u0627\u0644\u0645\u0644\u0641\u0627\u062A \u0627\u0644\u062A\u064A \u062A\u0645 \u062A\u0646\u0632\u064A\u0644\u0647\u0627
 
 #OCR
 OCR.title = OCR
@@ -184,6 +184,11 @@ split.submit=Split
 imageToPDF.title=صورة إلى PDF
 imageToPDF.header=صورة إلى PDF
 imageToPDF.submit=تحول
+imageToPDF.selectText.1=\u062A\u0645\u062F\u062F \u0644\u0644\u0645\u0644\u0627\u0621\u0645\u0629
+imageToPDF.selectText.2=\u062F\u0648\u0631\u0627\u0646 PDF \u062A\u0644\u0642\u0627\u0626\u064A\u064B\u0627
+imageToPDF.selectText.3=\u0627\u0644\u0645\u0646\u0637\u0642 \u0627\u0644\u0645\u062A\u0639\u062F\u062F \u0644\u0644\u0645\u0644\u0641\u0627\u062A (\u0645\u0641\u0639\u0651\u0644 \u0641\u0642\u0637 \u0625\u0630\u0627 \u0643\u0646\u062A \u062A\u0639\u0645\u0644 \u0645\u0639 \u0635\u0648\u0631 \u0645\u062A\u0639\u062F\u062F\u0629)
+imageToPDF.selectText.4=\u062F\u0645\u062C \u0641\u064A \u0645\u0644\u0641 PDF \u0648\u0627\u062D\u062F
+imageToPDF.selectText.5=\u062A\u062D\u0648\u064A\u0644 \u0625\u0644\u0649 \u0645\u0644\u0641\u0627\u062A PDF \u0645\u0646\u0641\u0635\u0644\u0629
 
 #pdfToImage
 pdfToImage.title=تحويل PDF إلى صورة

src/main/resources/messages_de_DE.properties

@@ -90,7 +90,7 @@ settings.downloadOption.title=Download-Option w
 settings.downloadOption.1=Im selben Fenster öffnen
 settings.downloadOption.2=In neuem Fenster öffnen
 settings.downloadOption.3=Datei herunterladen
-settings.zip=Dateien mit mehrfachem Download zippen
+settings.zipThreshold=Dateien komprimieren, wenn die Anzahl der heruntergeladenen Dateien überschritten wird
 
 #OCR
 ocr.title=OCR
@@ -183,6 +183,11 @@ split.submit=Aufteilen
 imageToPDF.title=Bild zu PDF
 imageToPDF.header=Bild zu PDF
 imageToPDF.submit=Umwandeln
+imageToPDF.selectText.1=Auf Seite strecken
+imageToPDF.selectText.2=PDF automatisch drehen
+imageToPDF.selectText.3=Mehrere Dateien verarbeiten (nur aktiv, wenn Sie mit mehreren Bildern arbeiten)
+imageToPDF.selectText.4=In ein einziges PDF zusammenführen
+imageToPDF.selectText.5=In separate PDFs konvertieren
 
 #pdfToImage
 pdfToImage.title=PDF zu Bild

src/main/resources/messages_en_GB.properties

@@ -4,10 +4,10 @@
 # the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
 
-pdfPrompt=Choose PDF
+pdfPrompt=Select PDF(s)
-multiPdfPrompt=Choose PDFs (2+)
+multiPdfPrompt=Select PDFs (2+)
 multiPdfDropPrompt=Select (or drag & drop) all PDFs you require
-imgPrompt=Choose Image
+imgPrompt=Select Image(s)
 genericSubmit=Submit
 processTimeWarning=Warning: This process can take up to a minute depending on file-size
 pageOrderPrompt=Page Order (Enter a comma-separated list of page numbers) :
@@ -91,7 +91,7 @@ settings.downloadOption.title=Choose download option (For single file non zip do
 settings.downloadOption.1=Open in same window
 settings.downloadOption.2=Open in new window
 settings.downloadOption.3=Download file
-settings.zip=Zip multi-download files
+settings.zipThreshold=Zip files when the number of downloaded files exceeds
 
 #OCR
 ocr.title=OCR
@@ -181,6 +181,11 @@ split.submit=Split
 imageToPDF.title=Image to PDF
 imageToPDF.header=Image to PDF
 imageToPDF.submit=Convert
+imageToPDF.selectText.1=Stretch to fit
+imageToPDF.selectText.2=Auto rotate PDF
+imageToPDF.selectText.3=Multi file logic (Only enabled if working with multiple images)
+imageToPDF.selectText.4=Merge into single PDF
+imageToPDF.selectText.5=Convert to separate PDFs
                                    
 #pdfToImage
 pdfToImage.title=PDF to Image

src/main/resources/messages_en_US.properties

@@ -4,10 +4,10 @@
 # the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
 
-pdfPrompt=Choose PDF
+pdfPrompt=Select PDF(s)
-multiPdfPrompt=Choose PDFs (2+)
+multiPdfPrompt=Select PDFs (2+)
 multiPdfDropPrompt=Select (or drag & drop) all PDFs you require
-imgPrompt=Choose Image
+imgPrompt=Select Image(s)
 genericSubmit=Submit
 processTimeWarning=Warning: This process can take up to a minute depending on file-size
 pageOrderPrompt=Page Order (Enter a comma-separated list of page numbers) :
@@ -91,7 +91,7 @@ settings.downloadOption.title=Choose download option (For single file non zip do
 settings.downloadOption.1=Open in same window
 settings.downloadOption.2=Open in new window
 settings.downloadOption.3=Download file
-settings.zip=Zip multi-download files
+settings.zipThreshold=Zip files when the number of downloaded files exceeds
 
 #OCR
 ocr.title=OCR
@@ -180,6 +180,11 @@ split.submit=Split
 imageToPDF.title=Image to PDF
 imageToPDF.header=Image to PDF
 imageToPDF.submit=Convert
+imageToPDF.selectText.1=Stretch to fit
+imageToPDF.selectText.2=Auto rotate PDF
+imageToPDF.selectText.3=Multi file logic (Only enabled if working with multiple images)
+imageToPDF.selectText.4=Merge into single PDF
+imageToPDF.selectText.5=Convert to separate PDFs
 
 #pdfToImage
 pdfToImage.title=PDF to Image

src/main/resources/messages_fr_FR.properties

@@ -96,7 +96,7 @@ settings.downloadOption.title=Choisissez l\u2019option de t
 settings.downloadOption.1=Ouvrir dans la même fenêtre
 settings.downloadOption.2=Ouvrir dans une nouvelle fenêtre
 settings.downloadOption.3=Fichier téléchargé
-settings.zip=Fichiers multi-téléchargements Zip
+settings.zipThreshold=Zip les fichiers lorsque le nombre de fichiers téléchargés dépasse
 
 
 #OCR
@@ -189,6 +189,11 @@ split.submit=Diviser
 imageToPDF.title=Image au format PDF
 imageToPDF.header=Image au format PDF
 imageToPDF.submit=Convertir
+imageToPDF.selectText.1=Étirer pour s'adapter
+imageToPDF.selectText.2=Rotation automatique du PDF
+imageToPDF.selectText.3=Logique de fichiers multiples (activé uniquement si vous travaillez avec plusieurs images)
+imageToPDF.selectText.4= Fusionner en un seul PDF
+imageToPDF.selectText.5= Convertir en PDFs distincts
 
 #pdfToImage
 pdfToImage.title=PDF vers image

src/main/resources/templates/add-image.html

@@ -15,9 +15,9 @@
                     <div class="col-md-6">
                         <h2 th:text="#{addImage.header}"></h2>
                         <form method="post" th:action="@{add-image}" enctype="multipart/form-data">
-                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
                             <div class="custom-file">
-                                <input type="file" class="custom-file-input" id="fileInput2" name="fileInput2" required> 
+                                <input type="file" class="custom-file-input" id="fileInput2" name="fileInput2" accept="image/*" required> 
                                 <label class="custom-file-label" for="fileInput2" th:text="#{imgPrompt}"></label>
                             </div>
                             <div class="form-group">

src/main/resources/templates/compress-pdf.html

@@ -15,7 +15,7 @@
                     <div class="col-md-6">
                         <h2 th:text="#{compress.header}"></h2>
                         <form action="#" th:action="@{/compress-pdf}" method="post" enctype="multipart/form-data">
-					        <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+					        <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
 					        <div>
 					            <label for="optimizeLevel" th:text="#{compress.selectText.1}"></label>
 					            <select name="optimizeLevel" id="optimizeLevel">

src/main/resources/templates/convert/img-to-pdf.html

@@ -15,12 +15,55 @@
                         <h2 th:text="#{imageToPDF.header}"></h2>
 
                         <form method="post" enctype="multipart/form-data" th:action="@{img-to-pdf}">
-                            <div class="custom-file">
+                        
-                                <input type="file" class="custom-file-input" id="fileInput" name="fileInput" required> 
+                           
-                                <label class="custom-file-label" for="fileInput" th:text="#{imgPrompt}"></label>
+                            
+                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='image/*')}"></div>
+
+                            <div class="form-check">
+                                <input type="checkbox" class="form-check-input" name="stretchToFit" id="stretchToFit"> 
+                                <label class="ml-3" for="stretchToFit" th:text=#{imageToPDF.selectText.1}></label>
                             </div>
+                            <div class="form-check">
+                                <input type="checkbox" class="form-check-input" name="autoRotate" id="autoRotate"> 
+                                <label class="ml-3" for="autoRotate" th:text=#{imageToPDF.selectText.2}></label>
+                            </div>
+                            <br>
+                            <input type="hidden" id="override" name="override" value="multi">
+                            <div class="form-group">
+                                <label th:text=#{imageToPDF.selectText.3}></label> 
+                                <select class="form-control" id="conversionType" name="conversionType" disabled>
+                                    <option value="merge" th:text=#{imageToPDF.selectText.4}></option>
+                                    <option value="convert" th:text=#{imageToPDF.selectText.5} selected></option>
+                                </select>
+                            </div>
+                            
                             <br> <br>
                             <button type="submit" class="btn btn-primary" th:text="#{imageToPDF.submit}"></button>
+  <script>
+                                 $('#fileInput-input').on('change', function() {
+                                    var files = document.getElementById("fileInput-input").files;
+                                    var conversionType = document.getElementById("conversionType");
+                                    console.log("files.length=" + files.length)
+                                    if (files.length > 1) {
+                                        conversionType.disabled = false;
+                                    } else {
+                                        conversionType.disabled = true;
+                                    }
+                                 });
+                                
+                                $('#conversionType').change(function() {
+                                    var selectedValue = $(this).val();
+                                    var override = document.getElementById("override");    
+                                    console.log("selectedValue=" + selectedValue)
+                                    if (selectedValue === 'merge') {
+                                        override.value = "single";                          
+                                    } else if (selectedValue === 'convert') {
+                                        override.value = "multi";
+                                    }
+                                });
+                                
+                            </script>
                                 
                         </form>
                     </div>

src/main/resources/templates/convert/pdf-to-img.html

@@ -16,7 +16,7 @@
                         <h2 th:text="#{pdfToImage.header}"></h2>
                         <p th:text="#{processTimeWarning}"></p>
                         <form method="post" enctype="multipart/form-data" th:action="@{pdf-to-img}">
-                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
                             <div class="form-group">
                                 <label th:text="#{pdfToImage.selectText}"></label> 
                                 <select class="form-control" name="imageFormat">

src/main/resources/templates/extract-images.html

@@ -15,7 +15,7 @@
             <h2 th:text="#{extractImages.header}"></h2>
 
             <form id="multiPdfForm" th:action="@{extract-images}" method="post" enctype="multipart/form-data">
-              <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+              <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
               <div class="form-group">
                 <label th:text="#{extractImages.selectText}"></label> 
                 <select class="form-control" name="format">

src/main/resources/templates/fragments/common.html

@@ -2,6 +2,7 @@
 
 <!-- Metadata -->
 <meta charset="UTF-8">
+
 <title th:text="'S-PDF ' + ${title}"></title>
 <link rel="shortcut icon" href="favicon.svg">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -63,10 +64,10 @@ function toggleDarkMode() {
 
 	</script>
 </head>
-<th:block th:fragment="fileSelector(name, multiple)">
+<th:block th:fragment="fileSelector(name, multiple)"  th:with="accept=${accept} ?: '*/*'">
     <div class="custom-file-chooser">
   <div class="custom-file">
-    <input type="file" class="custom-file-input" th:name="${name}" th:id="${name}+'-input'" multiple>
+    <input type="file" class="custom-file-input" th:name="${name}" th:id="${name}+'-input'" th:accept="${accept}" multiple>
     <label class="custom-file-label" th:for="${name}+'-input'" th:text="#{pdfPrompt}"></label>
   </div>
   <div class="selected-files"></div>
@@ -90,7 +91,9 @@ function toggleDarkMode() {
             	event.preventDefault(); // Prevent the default form handling behavior
                  /* Check if ${multiple} is false */
                  var multiple = [[${multiple}]] || false;
-                 if (!multiple && files.length > 1) {
+                 var override = $('#override').val() || '';
+                 console.log("override=" + override)
+                 if (override === 'multi' || (!multiple && files.length > 1) && override !== 'single' ) {
                 	 console.log("multi parallel download")
                      submitMultiPdfForm(event,url);
                  } else {
@@ -208,8 +211,9 @@ function toggleDarkMode() {
                 progressBar.attr('aria-valuenow', 0);
                 progressBar.attr('aria-valuemax', files.length);
 				
-             	// Check the flag in localStorage
+             	// Check the flag in localStorage, default to 4
-                const zipFiles = localStorage.getItem('zipParallelFiles') === 'true';
+                const zipThreshold = parseInt(localStorage.getItem('zipThreshold'), 10) || 4;
+                const zipFiles = files.length > zipThreshold;
 
                 // Initialize JSZip instance if needed
                 let jszip = null;
@@ -355,6 +359,7 @@ function toggleDarkMode() {
   	  fileNames.forEach(fileName => {
   	    selectedFilesContainer.append("<div>" + fileName + "</div>");
   	  });
+  	  console.log("fileNames.length=" + fileNames.length)
   	  if (fileNames.length === 1) {
   		$(inputElement).siblings(".custom-file-label").addClass("selected").html(fileNames[0]);
 		  } else if (fileNames.length > 1) {

src/main/resources/templates/fragments/navbar.html

@@ -206,25 +206,24 @@ function compareVersions(version1, version2) {
             </div>
             <div class="modal-body">
                 <div class="d-flex justify-content-between align-items-center mb-3">
-                    <p class="mb-0" th:text="#{settings.appVersion} + ' ' + ${@appVersion}"></p>
+                    <p class="mb-0" th:utext="#{settings.appVersion} + ' ' + ${@appVersion}"></p>
                     <a href="https://github.com/Frooodle/Stirling-PDF/releases" target="_blank">
-					    <button type="button" class="btn btn-sm btn-outline-primary" id="update-btn" th:text="#{settings.update}"></button>
+					    <button type="button" class="btn btn-sm btn-outline-primary" id="update-btn" th:utext="#{settings.update}"></button>
 					</a>
 
                 </div>
                 <div class="form-group">
-                    <label for="downloadOption" th:text="#{settings.downloadOption.title}"></label>
+                    <label for="downloadOption" th:utext="#{settings.downloadOption.title}"></label>
                     <select class="form-control" id="downloadOption">
-                        <option value="sameWindow" th:text="#{settings.downloadOption.1}"></option>
+                        <option value="sameWindow" th:utext="#{settings.downloadOption.1}"></option>
-                        <option value="newWindow" th:text="#{settings.downloadOption.2}"></option>
+                        <option value="newWindow" th:utext="#{settings.downloadOption.2}"></option>
-                        <option value="downloadFile" th:text="#{settings.downloadOption.3}"></option>
+                        <option value="downloadFile" th:utext="#{settings.downloadOption.3}"></option>
                     </select>
                 </div>
                 <div class="form-group">
-                    <div class="custom-control custom-checkbox">
+                    <label for="zipThreshold" th:utext="#{settings.zipThreshold}"></label>
-                        <input type="checkbox" class="custom-control-input" id="zipParallelFiles">
+                    <input type="range" class="custom-range" min="0" max="9" step="1" id="zipThreshold" value="4">
-                        <label class="custom-control-label" for="zipParallelFiles" th:text="#{settings.zip}"></label>
+                    <span id="zipThresholdValue" class="ml-2"></span>
-                    </div>
                 </div>
             </div>
             <div class="modal-footer">
@@ -253,17 +252,20 @@ function compareVersions(version1, version2) {
 							});
 					
 					
-					// Get the zipParallelFiles flag from local storage, or set it to false if it doesn't exist
+					// Get the zipThreshold value from local storage, or set it to 0 if it doesn't exist
-					var zipParallelFiles = localStorage.getItem('zipParallelFiles') === 'true';
+					var zipThreshold = parseInt(localStorage.getItem('zipThreshold'), 10) || 4;
 
-					// Set the checked state of the checkbox
+					// Set the value of the slider and the display span
-					document.getElementById('zipParallelFiles').checked = zipParallelFiles;
+					document.getElementById('zipThreshold').value = zipThreshold;
+					document.getElementById('zipThresholdValue').textContent = zipThreshold;
 
-					// Save the checked state of the checkbox to local storage when it changes
+					// Save the selected value to local storage when the slider value changes
-					document.getElementById('zipParallelFiles').addEventListener('change', function () {
+					document.getElementById('zipThreshold').addEventListener('input', function () {
-					  zipParallelFiles = this.checked;
+					    zipThreshold = this.value;
-					  localStorage.setItem('zipParallelFiles', zipParallelFiles);
+					    document.getElementById('zipThresholdValue').textContent = zipThreshold;
+					    localStorage.setItem('zipThreshold', zipThreshold);
 					});
+
 				</script>
 
 

src/main/resources/templates/home.html

@@ -40,7 +40,9 @@
 
             <!-- Features -->
             <div class="features-container container">
+                
                 <div th:replace="~{fragments/card :: card(cardTitle=#{home.merge.title}, cardText=#{home.merge.desc}, cardLink='merge-pdfs')}"></div>
+                
                 <div th:replace="~{fragments/card :: card(cardTitle=#{home.split.title}, cardText=#{home.split.desc}, cardLink='split-pdfs')}"></div>
                 <div th:replace="~{fragments/card :: card(cardTitle=#{home.rotate.title}, cardText=#{home.rotate.desc}, cardLink='rotate-pdf')}"></div>
 

src/main/resources/templates/merge-pdfs.html

@@ -17,7 +17,7 @@
                             <div class="form-group">
                                 <label th:text="#{multiPdfDropPrompt}"></label>
                                 <div class="custom-file">
-                                    <input type="file" class="custom-file-input" id="fileInput" name="fileInput" multiple required> 
+                                    <input type="file" class="custom-file-input" id="fileInput" name="fileInput" accept="application/pdf" multiple required> 
                                     <label class="custom-file-label" th:text="#{pdfPrompt}"></label>
                                 </div>
                             </div>

src/main/resources/templates/ocr-pdf.html

@@ -16,7 +16,7 @@
                         <h2 th:text="#{ocr.header}"></h2>
 
 						 <form action="#" th:action="@{/ocr-pdf}" method="post" enctype="multipart/form-data" class="mb-3">
-				            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+				            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
 				            <div class="form-group">
 							    <label for="languages" class="form-label" th:text="#{ocr.selectText.1}"></label>
 							    <div id="languages">

src/main/resources/templates/pdf-organizer.html

@@ -15,7 +15,7 @@
                         <h2 th:text="#{pdfOrganiser.header}"></h2>
 
                         <form th:action="@{rearrange-pages}" method="post" enctype="multipart/form-data">
-                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
                             <div class="form-group">
                                 <label for="pageOrder" th:text="#{pageOrderPrompt}"></label> 
                                 <input type="text" class="form-control" id="fileInput" name="pageOrder" placeholder="(e.g. 1,3,2 or 4-8,2,10-12)" required>

src/main/resources/templates/remove-pages.html

@@ -15,7 +15,7 @@
             <h2 th:text="#{pageRemover.header}"></h2>
 
             <form th:action="@{remove-pages}" method="post" enctype="multipart/form-data">
-              <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+              <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
               <div class="form-group">
                 <label for="pagesToDelete" th:text="#{pageRemover.pagesToDelete}"></label> 
                 <input type="text" class="form-control" id="fileInput" name="pagesToDelete" placeholder="(e.g. 1,2,6 or 1-10,15-30)" required>

src/main/resources/templates/rotate-pdf.html

@@ -16,7 +16,7 @@
                         <h2 th:text="#{rotate.header}"></h2>
 
                         <form action="#" th:action="@{rotate-pdf}" th:object="${rotateForm}" method="post" enctype="multipart/form-data">
-                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
                             <input type="hidden" id="angleInput" name="angle" value="0">
 
                             <div id="editSection" style="display: none">

src/main/resources/templates/security/add-password.html

@@ -16,7 +16,7 @@
                         <form action="add-password" method="post" enctype="multipart/form-data">
                             <div class="form-group">
                                 <label th:text="#{addPassword.selectText.1}"></label>
-                                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+                                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
                             </div>
                             <div class="form-group">
                                 <label th:text="#{addPassword.selectText.2}"></label> <input type="password" class="form-control" id="password" name="password" required>

src/main/resources/templates/security/add-watermark.html

@@ -16,7 +16,7 @@
                         <form method="post" enctype="multipart/form-data" action="add-watermark">
                             <div class="form-group">
                                 <label th:text="#{watermark.selectText.1}"></label>
-                                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+                                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
                             </div>
                             <div class="form-group">
                                 <label for="watermarkText" th:text="#{watermark.selectText.2}"></label> 

src/main/resources/templates/security/change-metadata.html

@@ -14,7 +14,7 @@
                         <h2 th:text="#{changeMetadata.header}"></h2>
 
                         <form method="post" id="form1" enctype="multipart/form-data" th:action="@{/update-metadata}">
-                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
                             <p class="text-muted" th:text="#{changeMetadata.selectText.1}"></p>
 
                             <div class="form-group-inline form-check">

src/main/resources/templates/security/change-permissions.html

@@ -17,7 +17,7 @@
                         <form action="add-password" method="post" enctype="multipart/form-data">
                             <div class="form-group">
                                 <label th:text="#{permissions.selectText.1}"></label>
-                                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+                                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
                             </div>
                             <div class="form-group">
                                 <label th:text="#{permissions.selectText.2}"></label>

src/main/resources/templates/security/remove-password.html

@@ -16,7 +16,7 @@
                         <form action="remove-password" method="post" enctype="multipart/form-data">
                             <div class="form-group">
                                 <label th:text="#{removePassword.selectText.1}"></label>
-                                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+                                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
                             </div>
                             <div class="form-group">
                                 <label th:text="#{removePassword.selectText.2}"></label> 

src/main/resources/templates/security/remove-watermark.html

@@ -16,7 +16,7 @@
                         <form method="post" enctype="multipart/form-data" action="remove-watermark">
                             <div class="form-group">
                                 <label th:text="#{remove-watermark.selectText.1}"></label>
-                                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+                                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
                             </div>
                             <div class="form-group">
                                 <label for="watermarkText" th:text="#{remove-watermark.selectText.2}"></label> 

src/main/resources/templates/split-pdfs.html

@@ -24,7 +24,7 @@
                         <p th:text="#{split.desc.8}"></p>
 
                         <form th:action="@{split-pages}" method="post" enctype="multipart/form-data">
-                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false)}"></div>
+                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
 
                             <div class="form-group">
                                 <label for="pages" th:text="#{split.splitPages}"></label>