some refactor

clagomess · Mar 7, 2024 · 2d6d11d · 2d6d11d
1 parent 3d5193e
commit 2d6d11d
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 26 deletions.
diff --git a/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FeatureToPDFCompiler.java b/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FeatureToPDFCompiler.java
@@ -28,40 +28,54 @@ public FeatureToPDFCompiler(ParametersDto parameters) {
     public void build() throws Exception {
         File bufferHtml = File.createTempFile("pirilampo-buffer-", ".html");
         log.info("Created buffer file: {}", bufferHtml);
+        File outArtifact = getOutArtifact(parameters);
 
         try (
-                FileOutputStream fos = new FileOutputStream(bufferHtml);
-                BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(fos, StandardCharsets.UTF_8));
-                PrintWriter out = new PrintWriter(bw);
+                FileOutputStream fosPDF = new FileOutputStream(outArtifact);
+                InputStream css = Objects.requireNonNull(Thread.currentThread().getContextClassLoader()
+                                .getResource("htmlTemplate/dist/feature-pdf.min.css"))
+                        .openStream();
         ){
-            out.print("<!DOCTYPE html><html lang=\"en\"><body>");
-            out.print("<h1 class=\"page-header\">");
-            out.print(String.format(
-                    "%s <small>%s <em>%s</em></small>",
-                    parameters.getProjectName(),
-                    featureMetadataDto.getName(),
-                    parameters.getProjectVersion()
-            ));
-            out.print("</h1>");
+            parameters.setEmbedImages(false);
 
-            new GherkinDocumentParser(parameters, feature).build(out);
+            PdfParser pdfParser = new PdfParser(parameters, css);
+            pdfParser.initDocument(fosPDF);
 
-            out.print("</body></html>");
-        }
+            try (
+                    FileOutputStream fos = new FileOutputStream(bufferHtml);
+                    BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(fos, StandardCharsets.UTF_8));
+                    PrintWriter out = new PrintWriter(bw);
+            ){
+                out.print("<!DOCTYPE html><html lang=\"en\"><body>");
+                out.print("<h1 class=\"page-header\">");
+                out.print(String.format(
+                        "%s <small>%s <em>%s</em></small>",
+                        parameters.getProjectName(),
+                        featureMetadataDto.getName(),
+                        parameters.getProjectVersion()
+                ));
+                out.print("</h1>");
 
-        // @TODO: maibe a pipe with these streams?
+                new GherkinDocumentParser(parameters, feature).build(out);
 
-        try (
-                FileOutputStream fos = new FileOutputStream(getOutArtifact(parameters));
-                InputStream html = Files.newInputStream(bufferHtml.toPath());
-                InputStream css = Objects.requireNonNull(Thread.currentThread().getContextClassLoader()
-                                .getResource("htmlTemplate/dist/feature-pdf.min.css"))
-                                .openStream();
-        ){
-            // new PdfParser().build(fos, html, css, parameters.getLayoutPdf()); @TODO: fix
+                out.print("</body></html>");
+            } catch (Throwable e){
+                bufferHtml.delete();
+                throw e;
+            } finally {
+                if(bufferHtml.exists()){
+                    pdfParser.addFeatureHTML(feature, Files.newInputStream(bufferHtml.toPath()));
+                }
+
+                bufferHtml.delete();
+            }
+
+            pdfParser.closeDocument();
+        } catch (Throwable e){
+            outArtifact.delete();
+            throw e;
         }
 
-        // @TODO: remove buffer file
         // @TODO: add done and took
     }
 }
diff --git a/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FolderToPDFCompiler.java b/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FolderToPDFCompiler.java
@@ -54,9 +54,20 @@ public void build() throws Exception {
                     ));
                     out.print("</h1>");
 
-                    new GherkinDocumentParser(parameters, feature).build(out);
+                    GherkinDocumentParser parser = new GherkinDocumentParser(parameters, feature);
+                    parser.build(out);
 
                     out.print("<span style=\"page-break-after: always\"></span>");
+
+                    if(!parser.getPaginaHtmlAnexo().isEmpty()){
+                        for(File html : parser.getPaginaHtmlAnexo()){
+                            log.info("- appending: {}", html);
+                            out.print(String.format("<h1>%s</h1>", html.getName()));
+                            writeFileToOut(html, out);
+                            out.print("<span style=\"page-break-after: always\"></span>");
+                        }
+                    }
+
                     out.print("</body></html>");
                 } catch (Throwable e){
                     bufferHtml.delete();