From 1129487aaf0ba9d4b06cbb0436ecab43dd2f94d2 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.> Date: Sun, 6 Oct 2024 23:32:28 +0100 Subject: [PATCH] fixes --- .../software/SPDF/service/CustomPDDocumentFactory.java | 8 ++++---- .../stirling/software/SPDF/utils/CustomHtmlSanitizer.java | 3 ++- src/main/java/stirling/software/SPDF/utils/FileToPdf.java | 4 +++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/service/CustomPDDocumentFactory.java b/src/main/java/stirling/software/SPDF/service/CustomPDDocumentFactory.java index 99a2a212..bf4a1f8f 100644 --- a/src/main/java/stirling/software/SPDF/service/CustomPDDocumentFactory.java +++ b/src/main/java/stirling/software/SPDF/service/CustomPDDocumentFactory.java @@ -44,14 +44,14 @@ public class CustomPDDocumentFactory { return createNewBytesBasedOnOldDocument(document); } + public byte[] createNewBytesBasedOnOldDocument(PDDocument oldDocument) throws IOException { - PDDocument document = new PDDocument(); pdfMetadataService.setMetadataToPdf( - document, pdfMetadataService.extractMetadataFromPdf(oldDocument), true); + oldDocument, pdfMetadataService.extractMetadataFromPdf(oldDocument), true); ByteArrayOutputStream baos = new ByteArrayOutputStream(); - document.save(baos); - document.close(); + oldDocument.save(baos); + oldDocument.close(); return baos.toByteArray(); } diff --git a/src/main/java/stirling/software/SPDF/utils/CustomHtmlSanitizer.java b/src/main/java/stirling/software/SPDF/utils/CustomHtmlSanitizer.java index d8c247cc..587aae6f 100644 --- a/src/main/java/stirling/software/SPDF/utils/CustomHtmlSanitizer.java +++ b/src/main/java/stirling/software/SPDF/utils/CustomHtmlSanitizer.java @@ -15,6 +15,7 @@ public class CustomHtmlSanitizer { .and(new HtmlPolicyBuilder().disallowElements("noscript").toFactory()); public static String sanitize(String html) { - return POLICY.sanitize(html); + String htmlAfter = POLICY.sanitize(html); + return htmlAfter; } } diff --git a/src/main/java/stirling/software/SPDF/utils/FileToPdf.java b/src/main/java/stirling/software/SPDF/utils/FileToPdf.java index 55fbd38e..d18277df 100644 --- a/src/main/java/stirling/software/SPDF/utils/FileToPdf.java +++ b/src/main/java/stirling/software/SPDF/utils/FileToPdf.java @@ -54,7 +54,9 @@ public class FileToPdf { List command = new ArrayList<>(); if (!htmlFormatsInstalled) { command.add("weasyprint"); - command.add("-e utf-8"); + command.add("-e"); + command.add("utf-8"); + command.add("-v"); command.add(tempInputFile.toString()); command.add(tempOutputFile.toString()); } else {