From c81c1006b7b2eea631daab8c5ee418d2eac8608a Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sat, 24 Jun 2023 15:25:39 +0100 Subject: [PATCH] Merge branch 'pipeline' of git@github.com:Frooodle/Stirling-PDF.git into pipeline --- .../controller/api/pipeline/Controller.java | 2 +- src/main/resources/templates/pipeline.html | 201 ++++++++---------- 2 files changed, 94 insertions(+), 109 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/controller/api/pipeline/Controller.java b/src/main/java/stirling/software/SPDF/controller/api/pipeline/Controller.java index d312e4dc..a8424b67 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/Controller.java +++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/Controller.java @@ -119,7 +119,7 @@ public class Controller { outputFileName = outputFileName.replace("{date}", LocalDate.now().format(dateFormatter)); DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HHmmss"); outputFileName = outputFileName.replace("{time}", LocalTime.now().format(timeFormatter)); - // ... Replace other placeholders + // {filename} {folder} {date} {tmime} {pipeline} Files.move(resource.getFile().toPath(), Paths.get(config.getOutputDir(), outputFileName)); } diff --git a/src/main/resources/templates/pipeline.html b/src/main/resources/templates/pipeline.html index f118ba6b..66880d7c 100644 --- a/src/main/resources/templates/pipeline.html +++ b/src/main/resources/templates/pipeline.html @@ -5,123 +5,108 @@ - + +
+

Pipeline Configuration

+
-
-
-
- -
-
-
+ +
+
+ +
+
+ +
+

Pipeline:

+
    + +
+
+ + + + + - -
-
- - -
- - -
- -
+
- - +
+