move resources again

clagomess · Mar 12, 2024 · 0d62460 · 0d62460
1 parent 6c1020d
commit 0d62460
Show file tree

Hide file tree

Showing 27 changed files with 15 additions and 19 deletions.
diff --git a/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/Compiler.java b/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/Compiler.java
@@ -11,7 +11,6 @@
 import org.apache.commons.io.input.BOMInputStream;
 
 import java.io.*;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.*;
@@ -110,17 +109,17 @@ protected File getOutArtifact(ParametersDto parameters){
     }
 
     protected void writeResourceToOut(String resource, PrintWriter out) throws IOException {
-        URL url = getClass().getResource(resource);
-        if(url == null){
+        InputStream is = Compiler.class.getResourceAsStream(resource);
+        if(is == null){
             throw new FileNotFoundException(String.format(
                     "Resource %s not loaded",
                     resource
             ));
         }
 
         try(
-                FileReader fr = new FileReader(url.getFile());
-                BufferedReader br = new BufferedReader(fr)
+                InputStreamReader isr = new InputStreamReader(is);
+                BufferedReader br = new BufferedReader(isr)
         ){
             char[] buffer = new char[1024 * 4];
             int n;

diff --git a/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FeatureToHTMLCompiler.java b/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FeatureToHTMLCompiler.java
@@ -45,7 +45,7 @@ public void build() throws Exception {
             out.print("<meta name=\"viewport\" content=\"width=device-width, shrink-to-fit=no, initial-scale=1\">");
             out.print(String.format("<title>%s</title>", parameters.getProjectName()));
             out.print("<style>");
-            writeResourceToOut("../dist/feature.min.css", out);
+            writeResourceToOut("dist/feature.min.css", out);
             out.print("</style>");
             out.print("</head><body>");
             out.print("<div class=\"container\"><div class=\"row\"><div class=\"col-sm-12\">");

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
@@ -42,8 +42,8 @@ public void build() throws Exception {
 
         try (
                 FileOutputStream fosPDF = new FileOutputStream(outArtifact);
-                InputStream css = Objects.requireNonNull(getClass()
-                                .getResource("../dist/feature-pdf.min.css"))
+                InputStream css = Objects.requireNonNull(Compiler.class
+                                .getResource("dist/feature-pdf.min.css"))
                         .openStream();
         ){
             parameters.setEmbedImages(false);

diff --git a/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FolderToHTMLCompiler.java b/core/src/main/java/com/github/clagomess/pirilampo/core/compilers/FolderToHTMLCompiler.java
@@ -165,7 +165,7 @@ public void build() throws Exception {
             out.print("<meta name=\"viewport\" content=\"width=device-width, shrink-to-fit=no, initial-scale=1\">");
             out.print(String.format("<title>%s</title>", parameters.getProjectName()));
             out.print("<style>");
-            writeResourceToOut("../dist/feature-pasta.min.css", out);
+            writeResourceToOut("dist/feature-pasta.min.css", out);
             out.print("\n\n");
             out.print(String.format(
                     "#sidebar-wrapper {background: %s;}",
@@ -188,7 +188,7 @@ public void build() throws Exception {
             out.print("</head><body>\n");
             out.print("<div id=\"wrapper\">");
             buildSidebar(out);
-            writeResourceToOut("../html/template-feature-pasta-content-wrapper.html", out);
+            writeResourceToOut("html/template-feature-pasta-content-wrapper.html", out);
             out.print("</div>");
 
             for(File f : arquivos){
@@ -225,13 +225,13 @@ public void build() throws Exception {
             }
 
             buildTemplateIndex(out);
-            writeResourceToOut("../html/template-feature-pasta-footer.html", out);
+            writeResourceToOut("html/template-feature-pasta-footer.html", out);
 
             out.print("<script type=\"text/javascript\">\n");
             indexParser.buildIndex(out);
             buildMenu(out);
-            writeResourceToOut("../dist/feature-pasta.min.js", out);
-            writeResourceToOut("../dist/feature-pasta-angular.min.js", out);
+            writeResourceToOut("dist/feature-pasta.min.js", out);
+            writeResourceToOut("dist/feature-pasta-angular.min.js", out);
             out.print("</script>\n");
             out.print("</body></html>");
         } catch (Throwable e){

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
@@ -39,8 +39,8 @@ public void build() throws Exception {
 
         try (
                 FileOutputStream fosPDF = new FileOutputStream(outArtifact);
-                InputStream css = Objects.requireNonNull(getClass()
-                                .getResource("../dist/feature-pdf.min.css"))
+                InputStream css = Objects.requireNonNull(Compiler.class
+                                .getResource("dist/feature-pdf.min.css"))
                         .openStream();
         ){
             parameters.setEmbedImages(false);

diff --git a/...ithub/clagomess/pirilampo/core/.gitignore → ...omess/pirilampo/core/compilers/.gitignore b/...ithub/clagomess/pirilampo/core/.gitignore → ...omess/pirilampo/core/compilers/.gitignore
diff --git a/.../github/clagomess/pirilampo/core/build.sh → ...agomess/pirilampo/core/compilers/build.sh b/.../github/clagomess/pirilampo/core/build.sh → ...agomess/pirilampo/core/compilers/build.sh
diff --git a/...omess/pirilampo/core/css/feature-base.css → ...lampo/core/compilers/css/feature-base.css b/...omess/pirilampo/core/css/feature-base.css → ...lampo/core/compilers/css/feature-base.css
diff --git a/...ess/pirilampo/core/css/simple-sidebar.css → ...mpo/core/compilers/css/simple-sidebar.css b/...ess/pirilampo/core/css/simple-sidebar.css → ...mpo/core/compilers/css/simple-sidebar.css
diff --git a/...lampo/core/css/template-feature-pasta.css → .../compilers/css/template-feature-pasta.css b/...lampo/core/css/template-feature-pasta.css → .../compilers/css/template-feature-pasta.css
diff --git a/...rilampo/core/css/template-feature-pdf.css → ...re/compilers/css/template-feature-pdf.css b/...rilampo/core/css/template-feature-pdf.css → ...re/compilers/css/template-feature-pdf.css
diff --git a/...s/pirilampo/core/css/template-feature.css → ...o/core/compilers/css/template-feature.css b/...s/pirilampo/core/css/template-feature.css → ...o/core/compilers/css/template-feature.css
diff --git a/...po/core/dist/feature-pasta-angular.min.js → ...mpilers/dist/feature-pasta-angular.min.js b/...po/core/dist/feature-pasta-angular.min.js → ...mpilers/dist/feature-pasta-angular.min.js
diff --git a/...pirilampo/core/dist/feature-pasta.min.css → ...core/compilers/dist/feature-pasta.min.css b/...pirilampo/core/dist/feature-pasta.min.css → ...core/compilers/dist/feature-pasta.min.css
diff --git a/.../pirilampo/core/dist/feature-pasta.min.js → .../core/compilers/dist/feature-pasta.min.js b/.../pirilampo/core/dist/feature-pasta.min.js → .../core/compilers/dist/feature-pasta.min.js
diff --git a/...s/pirilampo/core/dist/feature-pdf.min.css → ...o/core/compilers/dist/feature-pdf.min.css b/...s/pirilampo/core/dist/feature-pdf.min.css → ...o/core/compilers/dist/feature-pdf.min.css
diff --git a/...omess/pirilampo/core/dist/feature.min.css → ...lampo/core/compilers/dist/feature.min.css b/...omess/pirilampo/core/dist/feature.min.css → ...lampo/core/compilers/dist/feature.min.css
diff --git a/...thub/clagomess/pirilampo/core/gulpfile.js → ...mess/pirilampo/core/compilers/gulpfile.js b/...thub/clagomess/pirilampo/core/gulpfile.js → ...mess/pirilampo/core/compilers/gulpfile.js
diff --git a/...mplate-feature-pasta-content-wrapper.html → ...mplate-feature-pasta-content-wrapper.html b/...mplate-feature-pasta-content-wrapper.html → ...mplate-feature-pasta-content-wrapper.html
diff --git a/...e/html/template-feature-pasta-footer.html → ...s/html/template-feature-pasta-footer.html b/...e/html/template-feature-pasta-footer.html → ...s/html/template-feature-pasta-footer.html
diff --git a/...github/clagomess/pirilampo/core/js/app.js → ...gomess/pirilampo/core/compilers/js/app.js b/...github/clagomess/pirilampo/core/js/app.js → ...gomess/pirilampo/core/compilers/js/app.js
diff --git a/...ss/pirilampo/core/js/featureController.js → ...po/core/compilers/js/featureController.js b/...ss/pirilampo/core/js/featureController.js → ...po/core/compilers/js/featureController.js
diff --git a/...rilampo/core/js/template-feature-pasta.js → ...re/compilers/js/template-feature-pasta.js b/...rilampo/core/js/template-feature-pasta.js → ...re/compilers/js/template-feature-pasta.js
diff --git a/...lagomess/pirilampo/core/package-lock.json → ...irilampo/core/compilers/package-lock.json b/...lagomess/pirilampo/core/package-lock.json → ...irilampo/core/compilers/package-lock.json
diff --git a/...hub/clagomess/pirilampo/core/package.json → ...ess/pirilampo/core/compilers/package.json b/...hub/clagomess/pirilampo/core/package.json → ...ess/pirilampo/core/compilers/package.json
diff --git a/core/src/test/java/com/github/clagomess/pirilampo/core/parsers/PdfParserTest.java b/core/src/test/java/com/github/clagomess/pirilampo/core/parsers/PdfParserTest.java
@@ -8,7 +8,6 @@
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.nio.file.Files;
-import java.util.Objects;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -25,9 +24,7 @@ public void build() throws Exception {
         try (
                 FileOutputStream fos = new FileOutputStream(targetFile);
                 InputStream html = Files.newInputStream(sourceFile.toPath());
-                InputStream css = Objects.requireNonNull(getClass()
-                                .getResource("../dist/feature-pdf.min.css"))
-                        .openStream();
+                InputStream css = getClass().getResourceAsStream("PdfParserTest/foo.css")
         ){
             PdfParser pdfParser = new PdfParser(new ParametersDto(), css);
             pdfParser.initDocument(fos);

diff --git a/core/src/test/resources/com/github/clagomess/pirilampo/core/parsers/PdfParserTest/foo.css b/core/src/test/resources/com/github/clagomess/pirilampo/core/parsers/PdfParserTest/foo.css