From 85094cc1f6a5d372f1ed9183d897412dfeadd4c1 Mon Sep 17 00:00:00 2001 From: eikek Date: Mon, 9 Jan 2023 18:17:23 +0100 Subject: [PATCH] Fix html conversion for text files It must honor the configuration when doing html->pdf. --- .../scala/docspell/convert/Conversion.scala | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/modules/convert/src/main/scala/docspell/convert/Conversion.scala b/modules/convert/src/main/scala/docspell/convert/Conversion.scala index bcacf3de..ab9cce88 100644 --- a/modules/convert/src/main/scala/docspell/convert/Conversion.scala +++ b/modules/convert/src/main/scala/docspell/convert/Conversion.scala @@ -82,13 +82,26 @@ object Conversion { Chunk.byteVector(ByteVector.view(html.getBytes(StandardCharsets.UTF_8))) ) .covary[F] - WkHtmlPdf.toPDF( - cfg.wkhtmlpdf, - cfg.chunkSize, - StandardCharsets.UTF_8, - sanitizeHtml, - logger - )(bytes, handler) + cfg.htmlConverter match { + case HtmlConverter.Wkhtmltopdf => + WkHtmlPdf.toPDF( + cfg.wkhtmlpdf, + cfg.chunkSize, + StandardCharsets.UTF_8, + sanitizeHtml, + logger + )(bytes, handler) + + case HtmlConverter.Weasyprint => + Weasyprint.toPDF( + cfg.weasyprint, + cfg.chunkSize, + StandardCharsets.UTF_8, + sanitizeHtml, + logger + )(bytes, handler) + } + } case MimeType.ImageMatch(mt) =>