diff --git a/build.gradle b/build.gradle index 997c5b0c..ce1461c9 100644 --- a/build.gradle +++ b/build.gradle @@ -142,24 +142,25 @@ dependencies { testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion" // Batik - + implementation "org.apache.xmlgraphics:batik-all:1.17" + // TwelveMonkeys - implementation "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion" + runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion" runtimeOnly "com.twelvemonkeys.imageio:imageio-bmp:$imageioVersion" - // implementation "com.twelvemonkeys.imageio:imageio-hdr:$imageioVersion" - // implementation "com.twelvemonkeys.imageio:imageio-icns:$imageioVersion" - // implementation "com.twelvemonkeys.imageio:imageio-iff:$imageioVersion" + // runtimeOnly "com.twelvemonkeys.imageio:imageio-hdr:$imageioVersion" + // runtimeOnly "com.twelvemonkeys.imageio:imageio-icns:$imageioVersion" + // runtimeOnly "com.twelvemonkeys.imageio:imageio-iff:$imageioVersion" runtimeOnly "com.twelvemonkeys.imageio:imageio-jpeg:$imageioVersion" - // implementation "com.twelvemonkeys.imageio:imageio-pcx:$imageioVersion@ - // implementation "com.twelvemonkeys.imageio:imageio-pict:$imageioVersion" - // implementation "com.twelvemonkeys.imageio:imageio-pnm:$imageioVersion" - // implementation "com.twelvemonkeys.imageio:imageio-psd:$imageioVersion" - // implementation "com.twelvemonkeys.imageio:imageio-sgi:$imageioVersion" - // implementation "com.twelvemonkeys.imageio:imageio-tga:$imageioVersion" - // implementation "com.twelvemonkeys.imageio:imageio-thumbsdb:$imageioVersion" + // runtimeOnly "com.twelvemonkeys.imageio:imageio-pcx:$imageioVersion@ + // runtimeOnly "com.twelvemonkeys.imageio:imageio-pict:$imageioVersion" + // runtimeOnly "com.twelvemonkeys.imageio:imageio-pnm:$imageioVersion" + // runtimeOnly "com.twelvemonkeys.imageio:imageio-psd:$imageioVersion" + // runtimeOnly "com.twelvemonkeys.imageio:imageio-sgi:$imageioVersion" + // runtimeOnly "com.twelvemonkeys.imageio:imageio-tga:$imageioVersion" + // runtimeOnly "com.twelvemonkeys.imageio:imageio-thumbsdb:$imageioVersion" runtimeOnly "com.twelvemonkeys.imageio:imageio-tiff:$imageioVersion" runtimeOnly "com.twelvemonkeys.imageio:imageio-webp:$imageioVersion" - // implementation "com.twelvemonkeys.imageio:imageio-xwd:$imageioVersion" + // runtimeOnly "com.twelvemonkeys.imageio:imageio-xwd:$imageioVersion" implementation "commons-io:commons-io:2.16.1" implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0" diff --git a/src/main/java/stirling/software/SPDF/config/AppConfig.java b/src/main/java/stirling/software/SPDF/config/AppConfig.java index bad35880..ffa56c19 100644 --- a/src/main/java/stirling/software/SPDF/config/AppConfig.java +++ b/src/main/java/stirling/software/SPDF/config/AppConfig.java @@ -126,13 +126,12 @@ public class AppConfig { } @Bean(name = "directoryFilter") - public Predicate processPDFOnlyFilter() { + public Predicate processOnlyFiles() { return path -> { if (Files.isDirectory(path)) { return !path.toString().contains("processing"); } else { - String fileName = path.getFileName().toString(); - return fileName.endsWith(".pdf"); + return true; } }; } diff --git a/src/main/resources/static/fonts/NotoSans-Regular.ttf b/src/main/resources/static/fonts/NotoSans-Regular.ttf index 7552fbe8..fa4cff50 100644 Binary files a/src/main/resources/static/fonts/NotoSans-Regular.ttf and b/src/main/resources/static/fonts/NotoSans-Regular.ttf differ