pipeline fixes

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

@@ -96,7 +96,7 @@ public class ConvertImgPDFController {
     @Operation(
             summary = "Convert images to a PDF file",
             description =
-                    "This endpoint converts one or more images to a PDF file. Users can specify whether to stretch the images to fit the PDF page, and whether to automatically rotate the images. Input:Image Output:PDF Type:SISO?")
+                    "This endpoint converts one or more images to a PDF file. Users can specify whether to stretch the images to fit the PDF page, and whether to automatically rotate the images. Input:Image Output:PDF Type:MISO")
     public ResponseEntity<byte[]> convertToPdf(@ModelAttribute ConvertToPdfRequest request)
             throws IOException {
         MultipartFile[] file = request.getFileInput();

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java

@@ -39,7 +39,7 @@ public class ConvertMarkdownToPdf {
     @Operation(
             summary = "Convert a Markdown file to PDF",
             description =
-                    "This endpoint takes a Markdown file input, converts it to HTML, and then to PDF format.")
+                    "This endpoint takes a Markdown file input, converts it to HTML, and then to PDF format. Input:MARKDOWN Output:PDF Type:SISO")
     public ResponseEntity<byte[]> markdownToPdf(@ModelAttribute GeneralFile request)
             throws Exception {
         MultipartFile fileInput = request.getFileInput();

src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java

@@ -30,7 +30,7 @@ public class OverlayImageController {
     @Operation(
             summary = "Overlay image onto a PDF file",
             description =
-                    "This endpoint overlays an image onto a PDF file at the specified coordinates. The image can be overlaid on every page of the PDF if specified.  Input:PDF/IMAGE Output:PDF Type:MF-SISO")
+                    "This endpoint overlays an image onto a PDF file at the specified coordinates. The image can be overlaid on every page of the PDF if specified.  Input:PDF/IMAGE Output:PDF Type:SISO")
     public ResponseEntity<byte[]> overlayImage(@ModelAttribute OverlayImageRequest request) {
         MultipartFile pdfFile = request.getFileInput();
         MultipartFile imageFile = request.getImageFile();

src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java

@@ -1,5 +1,6 @@
 package stirling.software.SPDF.controller.api.pipeline;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -22,7 +23,7 @@ import jakarta.servlet.ServletContext;
 import stirling.software.SPDF.SPdfApplication;
 import stirling.software.SPDF.model.ApiEndpoint;
 import stirling.software.SPDF.model.Role;
-
+import java.util.List;
 @Service
 public class ApiDocService {
 
@@ -38,6 +39,48 @@ public class ApiDocService {
 
         return "http://localhost:" + port + contextPath + "/v1/api-docs";
     }
+    Map<String, List<String>> outputToFileTypes = new HashMap<>();
+    
+    public  List getExtensionTypes(boolean output, String operationName) {
+    	if(outputToFileTypes.size() == 0) {
+	        outputToFileTypes.put("PDF", Arrays.asList("pdf"));
+	        outputToFileTypes.put("IMAGE", Arrays.asList("png", "jpg", "jpeg", "gif", "webp", "bmp", "tif", "tiff", "svg", "psd", "ai", "eps"));
+	        outputToFileTypes.put("ZIP", Arrays.asList("zip", "rar", "7z", "tar", "gz", "bz2", "xz", "lz", "lzma", "z"));
+	        outputToFileTypes.put("WORD", Arrays.asList("doc", "docx", "odt", "rtf"));
+	        outputToFileTypes.put("CSV", Arrays.asList("csv"));
+	        outputToFileTypes.put("JS", Arrays.asList("js", "jsx"));
+	        outputToFileTypes.put("HTML", Arrays.asList("html", "htm", "xhtml"));
+	        outputToFileTypes.put("JSON", Arrays.asList("json"));
+	        outputToFileTypes.put("TXT", Arrays.asList("txt", "text", "md", "markdown"));
+	        outputToFileTypes.put("PPT", Arrays.asList("ppt", "pptx", "odp"));
+	        outputToFileTypes.put("XML", Arrays.asList("xml", "xsd", "xsl"));
+	        outputToFileTypes.put("BOOK", Arrays.asList("epub", "mobi", "azw3", "fb2", "txt", "docx")); // As noted before, "Boolean" isn't a file type but a value type.
+    	}
+        
+    	if (apiDocsJsonRootNode == null || apiDocumentation.size() == 0) {
+            loadApiDocumentation();
+        }
+        if (!apiDocumentation.containsKey(operationName)) {
+            return null;
+        }
+
+        ApiEndpoint endpoint = apiDocumentation.get(operationName);
+        String description = endpoint.getDescription();
+        Pattern pattern = null;
+        if(output) {
+        	pattern = Pattern.compile("Output:(\\w+)");
+        } else {
+        	pattern = Pattern.compile("Input:(\\w+)");
+        }
+        Matcher matcher = pattern.matcher(description);
+        while (matcher.find()) {
+            String type = matcher.group(1).toUpperCase();
+            if(outputToFileTypes.containsKey(type)) {
+            	return outputToFileTypes.get(type);
+            }
+        }
+        return null;
+    }
 
     @Autowired(required = false)
     private UserServiceInterface userService;

src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java

@@ -11,6 +11,7 @@ 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.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -82,15 +83,13 @@ public class PipelineProcessor {
                     operation,
                     isMultiInputOperation);
             Map<String, Object> parameters = pipelineOperation.getParameters();
-            String inputFileExtension = "";
+            List<String> inputFileTypes = apiDocService.getExtensionTypes(false, operation);
+            if(inputFileTypes == null) {
+            	inputFileTypes = new ArrayList<String>(Arrays.asList("ALL"));
+            }
+            //List outputFileTypes = apiDocService.getExtensionTypes(true, operation);
+            
 
-            // TODO
-            // if (operationNode.has("inputFileType")) {
-            //	inputFileExtension = operationNode.get("inputFileType").asText();
-            // } else {
-            inputFileExtension = ".pdf";
-            // }
-            final String finalInputFileExtension = inputFileExtension;
 
             String url = getBaseUrl() + operation;
 
@@ -98,7 +97,8 @@ public class PipelineProcessor {
             if (!isMultiInputOperation) {
                 for (Resource file : outputFiles) {
                     boolean hasInputFileType = false;
-                    if (file.getFilename().endsWith(inputFileExtension)) {
+                    for (String extension : inputFileTypes) {
+	                    if (extension.equals("ALL") || file.getFilename().endsWith(extension)) {
 	                        hasInputFileType = true;
 	                        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
 	                        body.add("fileInput", file);
@@ -123,13 +123,14 @@ public class PipelineProcessor {
 	                            hasErrors = true;
 	                            continue;
 	                        }
-                        processOutputFiles(operation, file.getFilename(), response, newOutputFiles);
+	                        processOutputFiles(operation, response, newOutputFiles);
+	                    }
                     }
 
                     if (!hasInputFileType) {
                         logPrintStream.println(
                                 "No files with extension "
-                                        + inputFileExtension
+                                        + String.join(", ", inputFileTypes)
                                         + " found for operation "
                                         + operation);
                         hasErrors = true;
@@ -138,13 +139,16 @@ public class PipelineProcessor {
 
             } else {
                 // Filter and collect all files that match the inputFileExtension
-                List<Resource> matchingFiles =
+            	List<Resource> matchingFiles;
+            	if (inputFileTypes.contains("ALL")) {
+            	    matchingFiles = new ArrayList<>(outputFiles);
+            	} else {
+            		final List<String> finalinputFileTypes = inputFileTypes;
+            	    matchingFiles =
             	        outputFiles.stream()
-                                .filter(
+            	                   .filter(file -> finalinputFileTypes.stream().anyMatch(file.getFilename()::endsWith))
-                                        file ->
-                                                file.getFilename()
-                                                        .endsWith(finalInputFileExtension))
             	                   .collect(Collectors.toList());
+            	}
 
                 // Check if there are matching files
                 if (!matchingFiles.isEmpty()) {
@@ -166,7 +170,6 @@ public class PipelineProcessor {
                     if (response.getStatusCode().equals(HttpStatus.OK)) {
                         processOutputFiles(
                                 operation,
-                                matchingFiles.get(0).getFilename(),
                                 response,
                                 newOutputFiles);
                     } else {
@@ -178,7 +181,7 @@ public class PipelineProcessor {
                 } else {
                     logPrintStream.println(
                             "No files with extension "
-                                    + inputFileExtension
+                                    + String.join(", ", inputFileTypes)
                                     + " found for multi-input operation "
                                     + operation);
                     hasErrors = true;
@@ -211,9 +214,29 @@ public class PipelineProcessor {
         return restTemplate.exchange(url, HttpMethod.POST, entity, byte[].class);
     }
     
+    public static String removeTrailingNaming(String filename) {
+        // Splitting filename into name and extension
+        int dotIndex = filename.lastIndexOf(".");
+        if (dotIndex == -1) {
+            // No extension found
+            return filename;
+        }
+        String name = filename.substring(0, dotIndex);
+        String extension = filename.substring(dotIndex);
+
+        // Finding the last underscore
+        int underscoreIndex = name.lastIndexOf("_");
+        if (underscoreIndex == -1) {
+            // No underscore found
+            return filename;
+        }
+
+        // Removing the last part and reattaching the extension
+        return name.substring(0, underscoreIndex) + extension;
+    }
+
     private List<Resource> processOutputFiles(
             String operation,
-            String fileName,
             ResponseEntity<byte[]> response,
             List<Resource> newOutputFiles)
             throws IOException {
@@ -227,7 +250,7 @@ public class PipelineProcessor {
             newFilename = extractFilename(response);
         } else {
             // Otherwise, keep the original filename.
-            newFilename = fileName;
+            newFilename = removeTrailingNaming(extractFilename(response));  
         }
         
         // Check if the response body is a zip file

src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java

@@ -74,7 +74,7 @@ public class CertSignController {
     @Operation(
             summary = "Sign PDF with a Digital Certificate",
             description =
-                    "This endpoint accepts a PDF file, a digital certificate and related information to sign the PDF. It then returns the digitally signed PDF file. Input:PDF Output:PDF Type:MF-SISO")
+                    "This endpoint accepts a PDF file, a digital certificate and related information to sign the PDF. It then returns the digitally signed PDF file. Input:PDF Output:PDF Type:SISO")
     public ResponseEntity<byte[]> signPDFWithCert(@ModelAttribute SignPDFWithCertRequest request)
             throws Exception {
         MultipartFile pdf = request.getFileInput();

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

@@ -36,6 +36,10 @@ public class FileToPdf {
             } else {
                 command.add("wkhtmltopdf");
                 command.add("--enable-local-file-access");
+                command.add("--load-error-handling");
+                command.add("ignore");
+                command.add("--load-media-error-handling");
+                command.add("ignore");
             }
 
             command.add(tempInputFile.toString());
@@ -130,7 +134,6 @@ public class FileToPdf {
             command.add("ebook-convert");
             command.add(tempInputFile.toString());
             command.add(tempOutputFile.toString());
-
             ProcessExecutorResult returnCode =
                     ProcessExecutor.getInstance(ProcessExecutor.Processes.CALIBRE)
                             .runCommandWithOutputHandling(command);

src/main/resources/static/js/languageSelection.js

@@ -1,7 +1,20 @@
 document.addEventListener('DOMContentLoaded', function() {
 	setLanguageForDropdown('.lang_dropdown-item');
-	const defaultLocale = document.documentElement.lang || 'en_GB';
+
+	// Detect the browser's preferred language
+    let browserLang = navigator.language || navigator.userLanguage;
+    // Convert to a format consistent with your language codes (e.g., en-GB, fr-FR)
+    browserLang = browserLang.replace('-', '_');
+
+    // Check if the dropdown contains the browser's language
+    const dropdownLangExists = document.querySelector(`.lang_dropdown-item[data-language-code="${browserLang}"]`);
+    
+    // Set the default language to browser's language or 'en_GB' if not found in the dropdown
+    const defaultLocale = dropdownLangExists ? browserLang : 'en_GB';
     const storedLocale = localStorage.getItem('languageCode') || defaultLocale;
+    
+    
+    
 	const dropdownItems = document.querySelectorAll('.lang_dropdown-item');
 
 	for (let i = 0; i < dropdownItems.length; i++) {