filter

src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java

@@ -22,68 +22,79 @@ import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.ProcessExecutor;
 import stirling.software.SPDF.utils.WebResponseUtils;
 import io.swagger.v3.oas.annotations.media.Schema;
+
 @RestController
 @Tag(name = "Filter", description = "Filter APIs")
 public class FilterController {
 
-	@PostMapping(consumes = "multipart/form-data", value = "/contains-text")
+	@PostMapping(consumes = "multipart/form-data", value = "/filter-contains-text")
 	@Operation(summary = "Checks if a PDF contains set text, returns true if does", description = "Input:PDF Output:Boolean Type:SISO")
-	public Boolean containsText(
+	public ResponseEntity<byte[]> containsText(
 			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to be converted to a PDF/A file", required = true) MultipartFile inputFile,
 			@Parameter(description = "The text to check for", required = true) String text,
 			@Parameter(description = "The page number to check for text on accepts 'All', ranges like '1-4'", required = false) String pageNumber)
 			throws IOException, InterruptedException {
 		PDDocument pdfDocument = PDDocument.load(inputFile.getInputStream());
-		return PdfUtils.hasText(pdfDocument, pageNumber);
+		if (PdfUtils.hasText(pdfDocument, pageNumber, text))
+			return WebResponseUtils.pdfDocToWebResponse(pdfDocument, inputFile.getOriginalFilename());
+		return null;
 	}
 
-	//TODO
-	@PostMapping(consumes = "multipart/form-data", value = "/contains-image")
+	// TODO
+	@PostMapping(consumes = "multipart/form-data", value = "/filter-contains-image")
 	@Operation(summary = "Checks if a PDF contains an image", description = "Input:PDF Output:Boolean Type:SISO")
-	public Boolean containsImage(
+	public ResponseEntity<byte[]> containsImage(
 			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to be converted to a PDF/A file", required = true) MultipartFile inputFile,
 			@Parameter(description = "The page number to check for image on accepts 'All', ranges like '1-4'", required = false) String pageNumber)
 			throws IOException, InterruptedException {
 		PDDocument pdfDocument = PDDocument.load(inputFile.getInputStream());
-		return PdfUtils.hasImagesOnPage(null);
+		if (PdfUtils.hasImages(pdfDocument, pageNumber))
+			return WebResponseUtils.pdfDocToWebResponse(pdfDocument, inputFile.getOriginalFilename());
+		return null;
 	}
 
-	@PostMapping(consumes = "multipart/form-data", value = "/page-count")
+	@PostMapping(consumes = "multipart/form-data", value = "/filter-page-count")
 	@Operation(summary = "Checks if a PDF is greater, less or equal to a setPageCount", description = "Input:PDF Output:Boolean Type:SISO")
-	public Boolean pageCount(
+	public ResponseEntity<byte[]> pageCount(
 			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
 			@Parameter(description = "Page Count", required = true) String pageCount,
-			@Parameter(description = "Comparison type", 
-            schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", 
-                            allowableValues = {"Greater", "Equal", "Less"})) String comparator)
+			@Parameter(description = "Comparison type", schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", allowableValues = {
+					"Greater", "Equal", "Less" })) String comparator)
 			throws IOException, InterruptedException {
 		// Load the PDF
 		PDDocument document = PDDocument.load(inputFile.getInputStream());
 		int actualPageCount = document.getNumberOfPages();
 
+		boolean valid = false;
 		// Perform the comparison
 		switch (comparator) {
 		case "Greater":
-			return actualPageCount > Integer.parseInt(pageCount);
+			valid = actualPageCount > Integer.parseInt(pageCount);
+			break;
 		case "Equal":
-			return actualPageCount == Integer.parseInt(pageCount);
+			valid = actualPageCount == Integer.parseInt(pageCount);
+			break;
 		case "Less":
-			return actualPageCount < Integer.parseInt(pageCount);
+			valid = actualPageCount < Integer.parseInt(pageCount);
+			break;
 		default:
 			throw new IllegalArgumentException("Invalid comparator: " + comparator);
 		}
+
+		if (valid)
+			return WebResponseUtils.multiPartFileToWebResponse(inputFile);
+		return null;
 	}
 
-	@PostMapping(consumes = "multipart/form-data", value = "/page-size")
+	@PostMapping(consumes = "multipart/form-data", value = "/filter-page-size")
 	@Operation(summary = "Checks if a PDF is of a certain size", description = "Input:PDF Output:Boolean Type:SISO")
-	public Boolean pageSize(
-		@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
-		@Parameter(description = "Standard Page Size", required = true) String standardPageSize,
-		@Parameter(description = "Comparison type", 
-        schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", 
-                        allowableValues = {"Greater", "Equal", "Less"})) String comparator)
-		throws IOException, InterruptedException {
-		
+	public ResponseEntity<byte[]> pageSize(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
+			@Parameter(description = "Standard Page Size", required = true) String standardPageSize,
+			@Parameter(description = "Comparison type", schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", allowableValues = {
+					"Greater", "Equal", "Less" })) String comparator)
+			throws IOException, InterruptedException {
+
 		// Load the PDF
 		PDDocument document = PDDocument.load(inputFile.getInputStream());
 
@@ -97,75 +108,95 @@ public class FilterController {
 		PDRectangle standardSize = PdfUtils.textToPageSize(standardPageSize);
 		float standardArea = standardSize.getWidth() * standardSize.getHeight();
 
+		boolean valid = false;
 		// Perform the comparison
 		switch (comparator) {
 		case "Greater":
-			return actualArea > standardArea;
+			valid = actualArea > standardArea;
+			break;
 		case "Equal":
-			return actualArea == standardArea;
+			valid = actualArea == standardArea;
+			break;
 		case "Less":
-			return actualArea < standardArea;
+			valid = actualArea < standardArea;
+			break;
 		default:
 			throw new IllegalArgumentException("Invalid comparator: " + comparator);
 		}
-	}
-	
 
-	@PostMapping(consumes = "multipart/form-data", value = "/file-size")
+		if (valid)
+			return WebResponseUtils.multiPartFileToWebResponse(inputFile);
+		return null;
+	}
+
+	@PostMapping(consumes = "multipart/form-data", value = "/filter-file-size")
 	@Operation(summary = "Checks if a PDF is a set file size", description = "Input:PDF Output:Boolean Type:SISO")
-	public Boolean fileSize(
-		@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
-		@Parameter(description = "File Size", required = true) String fileSize,
-		@Parameter(description = "Comparison type", 
-        schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", 
-                        allowableValues = {"Greater", "Equal", "Less"})) String comparator)
-		throws IOException, InterruptedException {
-		
+	public ResponseEntity<byte[]> fileSize(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
+			@Parameter(description = "File Size", required = true) String fileSize,
+			@Parameter(description = "Comparison type", schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", allowableValues = {
+					"Greater", "Equal", "Less" })) String comparator)
+			throws IOException, InterruptedException {
+
 		// Get the file size
 		long actualFileSize = inputFile.getSize();
 
+		boolean valid = false;
 		// Perform the comparison
 		switch (comparator) {
 		case "Greater":
-			return actualFileSize > Long.parseLong(fileSize);
+			valid = actualFileSize > Long.parseLong(fileSize);
+			break;
 		case "Equal":
-			return actualFileSize == Long.parseLong(fileSize);
+			valid = actualFileSize == Long.parseLong(fileSize);
+			break;
 		case "Less":
-			return actualFileSize < Long.parseLong(fileSize);
+			valid = actualFileSize < Long.parseLong(fileSize);
+			break;
 		default:
 			throw new IllegalArgumentException("Invalid comparator: " + comparator);
 		}
+
+		if (valid)
+			return WebResponseUtils.multiPartFileToWebResponse(inputFile);
+		return null;
 	}
 
-	
-	@PostMapping(consumes = "multipart/form-data", value = "/page-rotation")
+	@PostMapping(consumes = "multipart/form-data", value = "/filter-page-rotation")
 	@Operation(summary = "Checks if a PDF is of a certain rotation", description = "Input:PDF Output:Boolean Type:SISO")
-	public Boolean pageRotation(
-		@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
-		@Parameter(description = "Rotation in degrees", required = true) int rotation,
-		@Parameter(description = "Comparison type", 
-        schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", 
-                        allowableValues = {"Greater", "Equal", "Less"})) String comparator)
-		throws IOException, InterruptedException {
-		
+	public ResponseEntity<byte[]> pageRotation(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
+			@Parameter(description = "Rotation in degrees", required = true) int rotation,
+			@Parameter(description = "Comparison type", schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", allowableValues = {
+					"Greater", "Equal", "Less" })) String comparator)
+			throws IOException, InterruptedException {
+
 		// Load the PDF
 		PDDocument document = PDDocument.load(inputFile.getInputStream());
 
 		// Get the rotation of the first page
 		PDPage firstPage = document.getPage(0);
 		int actualRotation = firstPage.getRotation();
-
+		boolean valid = false;
 		// Perform the comparison
 		switch (comparator) {
 		case "Greater":
-			return actualRotation > rotation;
+			valid = actualRotation > rotation;
+			break;
 		case "Equal":
-			return actualRotation == rotation;
+			valid = actualRotation == rotation;
+			break;
 		case "Less":
-			return actualRotation < rotation;
+			valid = actualRotation < rotation;
+			break;
 		default:
 			throw new IllegalArgumentException("Invalid comparator: " + comparator);
 		}
+
+		if (valid)
+			return WebResponseUtils.multiPartFileToWebResponse(inputFile);
+		return null;
+
 	}
 
 }

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

@@ -292,12 +292,18 @@ public class PipelineController {
 
 					ResponseEntity<byte[]> response = restTemplate.exchange(url, HttpMethod.POST, entity, byte[].class);
 
+					// If the operation is filter and the response body is null or empty, skip this file
+	                if (operation.startsWith("filter-") && (response.getBody() == null || response.getBody().length == 0)) {
+	                	logger.info("Skipping file due to failing {}", operation);
+	                    continue;
+	                }
+	                
 					if (!response.getStatusCode().equals(HttpStatus.OK)) {
 						logPrintStream.println("Error: " + response.getBody());
 						hasErrors = true;
 						continue;
 					}
-
+					
 					
 					// Define filename
 	                String filename;