From a12643194a0899a5d924589fbe4c734b37888948 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
Date: Wed, 21 Jun 2023 21:19:52 +0100
Subject: [PATCH] changes

---
 .../api/RearrangePagesPDFController.java      |  2 +-
 .../api/security/PasswordController.java      |  2 +-
 .../software/SPDF/utils/PdfUtils.java         |  2 +-
 src/main/resources/messages_en_GB.properties  |  3 +
 src/main/resources/static/images/pipeline.svg |  3 +
 .../resources/templates/fragments/navbar.html |  7 ++
 src/main/resources/templates/home.html        |  1 +
 src/main/resources/templates/pipeline.html    | 76 ++++++++++++-------
 8 files changed, 67 insertions(+), 29 deletions(-)
 create mode 100644 src/main/resources/static/images/pipeline.svg

diff --git a/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java b/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java
index 1620f071..d3544007 100644
--- a/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java
@@ -151,7 +151,7 @@ public class RearrangePagesPDFController {
 	}
 
 	@PostMapping(consumes = "multipart/form-data", value = "/rearrange-pages")
-	@Operation(summary = "Rearrange pages in a PDF file", description = "This endpoint rearranges pages in a given PDF file based on the specified page order or custom mode. Users can provide a page order as a comma-separated list of page numbers or page ranges, or a custom mode.")
+	@Operation(summary = "Rearrange pages in a PDF file", description = "This endpoint rearranges pages in a given PDF file based on the specified page order or custom mode. Users can provide a page order as a comma-separated list of page numbers or page ranges, or a custom mode. Input:PDF Output:PDF")
 	public ResponseEntity<byte[]> rearrangePages(
 			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to rearrange pages") MultipartFile pdfFile,
 			@RequestParam(required = false, value = "pageOrder") @Parameter(description = "The new page order as a comma-separated list of page numbers, page ranges (e.g., '1,3,5-7'), or functions in the format 'an+b' where 'a' is the multiplier of the page number 'n', and 'b' is a constant (e.g., '2n+1', '3n', '6n-5')") String pageOrder,
diff --git a/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java b/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java
index 0051b411..ecc27def 100644
--- a/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java
@@ -44,7 +44,7 @@ public class PasswordController {
     @PostMapping(consumes = "multipart/form-data", value = "/add-password")
     @Operation(
         summary = "Add password to a PDF file",
-        description = "This endpoint adds password protection to a PDF file. Users can specify a set of permissions that should be applied to the file."
+        description = "This endpoint adds password protection to a PDF file. Users can specify a set of permissions that should be applied to the file. Input:PDF Output:PDF"
     )
     public ResponseEntity<byte[]> addPassword(
         @RequestPart(required = true, value = "fileInput")
diff --git a/src/main/java/stirling/software/SPDF/utils/PdfUtils.java b/src/main/java/stirling/software/SPDF/utils/PdfUtils.java
index e5d35c08..67e6f807 100644
--- a/src/main/java/stirling/software/SPDF/utils/PdfUtils.java
+++ b/src/main/java/stirling/software/SPDF/utils/PdfUtils.java
@@ -43,7 +43,7 @@ public class PdfUtils {
 
             // Create images of all pages
             for (int i = 0; i < pageCount; i++) {
-                images.add(pdfRenderer.renderImageWithDPI(i, 300, colorType));
+                images.add(pdfRenderer.renderImageWithDPI(i, DPI, colorType));
             }
 
             if (singleImage) {
diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties
index c8f1ae13..083bc8b6 100644
--- a/src/main/resources/messages_en_GB.properties
+++ b/src/main/resources/messages_en_GB.properties
@@ -131,6 +131,9 @@ home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
 home.scalePages.title=Adjust page size/scale
 home.scalePages.desc=Change the size/scale of a page and/or its contents.
 
+home.pipeline.title=Pipeline
+home.pipeline.desc=Pipeline desc.
+
 error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
 
 downloadPdf=Download PDF
diff --git a/src/main/resources/static/images/pipeline.svg b/src/main/resources/static/images/pipeline.svg
new file mode 100644
index 00000000..48722d0c
--- /dev/null
+++ b/src/main/resources/static/images/pipeline.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-bezier2" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M1 2.5A1.5 1.5 0 0 1 2.5 1h1A1.5 1.5 0 0 1 5 2.5h4.134a1 1 0 1 1 0 1h-2.01c.18.18.34.381.484.605.638.992.892 2.354.892 3.895 0 1.993.257 3.092.713 3.7.356.476.895.721 1.787.784A1.5 1.5 0 0 1 12.5 11h1a1.5 1.5 0 0 1 1.5 1.5v1a1.5 1.5 0 0 1-1.5 1.5h-1a1.5 1.5 0 0 1-1.5-1.5H6.866a1 1 0 1 1 0-1h1.711a2.839 2.839 0 0 1-.165-.2C7.743 11.407 7.5 10.007 7.5 8c0-1.46-.246-2.597-.733-3.355-.39-.605-.952-1-1.767-1.112A1.5 1.5 0 0 1 3.5 5h-1A1.5 1.5 0 0 1 1 3.5v-1zM2.5 2a.5.5 0 0 0-.5.5v1a.5.5 0 0 0 .5.5h1a.5.5 0 0 0 .5-.5v-1a.5.5 0 0 0-.5-.5h-1zm10 10a.5.5 0 0 0-.5.5v1a.5.5 0 0 0 .5.5h1a.5.5 0 0 0 .5-.5v-1a.5.5 0 0 0-.5-.5h-1z"/>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html
index 987b6d0e..793de25b 100644
--- a/src/main/resources/templates/fragments/navbar.html
+++ b/src/main/resources/templates/fragments/navbar.html
@@ -32,6 +32,13 @@
                             <span class="icon-text"  th:text="#{home.multiTool.title}"></span>
                         </a>
                     </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="#" th:href="@{pipeline}" th:classappend="${currentPage}=='pipeline' ? 'active' : ''" th:title="#{home.pipeline.desc}">
+                            <img class="icon" src="images/pipeline.svg" alt="icon">
+                            <span class="icon-text"  th:text="#{home.pipeline.title}"></span>
+                        </a>
+                    </li>
+                    
 <li class="nav-item nav-item-separator"></li>
                     <li class="nav-item dropdown" th:classappend="${currentPage}=='remove-pages' OR ${currentPage}=='merge-pdfs' OR ${currentPage}=='split-pdfs' OR ${currentPage}=='pdf-organizer' OR ${currentPage}=='rotate-pdf' ? 'active' : ''">
     <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html
index 1226d771..badfbc9d 100644
--- a/src/main/resources/templates/home.html
+++ b/src/main/resources/templates/home.html
@@ -22,6 +22,7 @@
             <!-- Features -->
             <div class="features-container container">
             
+                <div th:replace="~{fragments/card :: card(id='pipeline', cardTitle=#{home.pipeline.title}, cardText=#{home.pipeline.desc}, cardLink='pipeline', svgPath='images/pipeline.svg')}"></div>
                 
                 <div th:replace="~{fragments/card :: card(id='multi-tool', cardTitle=#{home.multiTool.title}, cardText=#{home.multiTool.desc}, cardLink='multi-tool', svgPath='images/tools.svg')}"></div>
                 <div th:replace="~{fragments/card :: card(id='merge-pdfs', cardTitle=#{home.merge.title}, cardText=#{home.merge.desc}, cardLink='merge-pdfs', svgPath='images/union.svg')}"></div>
diff --git a/src/main/resources/templates/pipeline.html b/src/main/resources/templates/pipeline.html
index b440e700..5beb7205 100644
--- a/src/main/resources/templates/pipeline.html
+++ b/src/main/resources/templates/pipeline.html
@@ -114,29 +114,47 @@
 						function validatePipeline() {
 						    let pipelineListItems = document.getElementById('pipelineList').children;
 						    let isValid = true;
-
+							let containsAddPassword = false;
 						    for (let i = 0; i < pipelineListItems.length - 1; i++) {
 						        let currentOperation = pipelineListItems[i].querySelector('.operationName').textContent;
 						        let nextOperation = pipelineListItems[i + 1].querySelector('.operationName').textContent;
-
-						        let currentOperationOutputDescription = apiDocs[`/${currentOperation}`]?.post?.responses["200"]?.description || "";
-						        let nextOperationInputDescription = apiDocs[`/${nextOperation}`]?.post?.requestBody?.content["multipart/form-data"]?.schema?.properties?.fileInput?.description || "";
-
-						        let currentOperationOutputsPDF = currentOperationOutputDescription.toLowerCase().includes("pdf");
-						        let nextOperationExpectsPDF = nextOperationInputDescription.toLowerCase().includes("the pdf file");
-
-						        if (currentOperationOutputsPDF && !nextOperationExpectsPDF) {
-						            isValid = false;
-						            alert(`Incompatible operations: The output of operation '${currentOperation}' is a PDF file but the following operation '${nextOperation}' does not expect a PDF file as input.`);
-						            break;
+						        if(currentOperation === '/add-password'){
+						        	containsAddPassword = true;
 						        }
-						        else if (!currentOperationOutputsPDF && nextOperationExpectsPDF) {
-						            isValid = false;
-						            alert(`Incompatible operations: The operation '${currentOperation}' does not output a PDF file but the following operation '${nextOperation}' expects a PDF file as input.`);
-						            break;
+						        console.log(currentOperation);
+						        console.log(apiDocs[currentOperation]);
+						        let currentOperationDescription = apiDocs[currentOperation]?.post?.description || "";
+						        let nextOperationDescription = apiDocs[nextOperation]?.post?.description || "";
+
+						        console.log("currentOperationDescription",currentOperationDescription);
+						        console.log("nextOperationDescription", nextOperationDescription);
+						        
+						        let currentOperationOutput = currentOperationDescription.match(/Output:([A-Z\/]*)/)?.[1] || "";
+						        let nextOperationInput = nextOperationDescription.match(/Input:([A-Z\/]*)/)?.[1] || "";
+
+						        console.log("Operation " + currentOperation + " Output: " + currentOperationOutput);
+						        console.log("Operation " + nextOperation + " Input: " + nextOperationInput);
+
+						        // Splitting in case of multiple possible output/input
+						        let currentOperationOutputArr = currentOperationOutput.split('/');
+						        let nextOperationInputArr = nextOperationInput.split('/');
+
+						        if (currentOperationOutput !== 'ANY' && nextOperationInput !== 'ANY') {
+						            let intersection = currentOperationOutputArr.filter(value => nextOperationInputArr.includes(value));
+						            console.log(`Intersection: ${intersection}`);
+
+						            if (intersection.length === 0) {
+						                isValid = false;
+						                console.log(`Incompatible operations: The output of operation '${currentOperation}' (${currentOperationOutput}) is not compatible with the input of the following operation '${nextOperation}' (${nextOperationInput}).`);
+						                alert(`Incompatible operations: The output of operation '${currentOperation}' (${currentOperationOutput}) is not compatible with the input of the following operation '${nextOperation}' (${nextOperationInput}).`);
+						                break;
+						            }
 						        }
 						    }
-
+						    if (containsAddPassword && pipelineListItems[pipelineListItems.length - 1].querySelector('.operationName').textContent !== '/add-password') {
+			                    alert('The "add-password" operation should be at the end of the operations sequence. Please adjust the operations order.');
+			                    return false;  
+			                }
 						    if (isValid) {
 						        console.log('Pipeline is valid');
 						        // Continue with the pipeline operation
@@ -144,13 +162,19 @@
 						        console.error('Pipeline is not valid');
 						        // Stop operation, maybe display an error to the user
 						    }
+						    
+						    return isValid;
 						}
 
 
+
 						
 						
 						document.getElementById('submitConfigBtn').addEventListener('click', function() {
-
+							
+							if(validatePipeline() === false){
+								return;
+							}
 						    let selectedOperation = document.getElementById('operationsDropdown').value;
 						    let parameters = operationSettings[selectedOperation] || {};
 
@@ -211,9 +235,11 @@
 		                operationsDropdown.innerHTML = '';
 
 		                Object.keys(apiDocs).forEach(operation => {
-		                    let option = document.createElement('option');
-		                    option.textContent = operation;
-		                    operationsDropdown.appendChild(option);
+		                	if(apiDocs[operation].hasOwnProperty('post')) {
+			                    let option = document.createElement('option');
+			                    option.textContent = operation;
+			                    operationsDropdown.appendChild(option);
+		                	}
 		                });
 		            });
 
@@ -386,17 +412,15 @@
 		            }
 
 		            document.getElementById('savePipelineBtn').addEventListener('click', function() {
+		            	if(validatePipeline() === false){
+							return;
+						}
 		                let pipelineList = document.getElementById('pipelineList').children;
 		                let pipelineConfig = {
 		                    "name": "uniquePipelineName",
 		                    "pipeline": []
 		                };
 
-		                if (pipelineList[pipelineList.length - 1].querySelector('.operationName').textContent !== '/add-password') {
-		                    alert('The "add-password" operation should be at the end of the operations sequence. Please adjust the operations order.');
-		                    return;  
-		                }
-
 		                for(let i=0; i<pipelineList.length; i++) {
 		                	let operationName = pipelineList[i].querySelector('.operationName').textContent;
 		                	let parameters = operationSettings[operationName] || {};