git://git.nikiroo.be / gofetch.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix comments on LWN (should be ok now) + UTF8 html
[gofetch.git] / src / be / nikiroo / gofetch / output / Html.java
diff --git a/src/be/nikiroo/gofetch/output/Html.java b/src/be/nikiroo/gofetch/output/Html.java
index fea5f67997c0b36ad3f45734051a32ce6d16d911..5b022d1f8789224a1ea11514bc55ac42da01b47f 100644 (file)
--- a/src/be/nikiroo/gofetch/output/Html.java
+++ b/src/be/nikiroo/gofetch/output/Html.java
@@ -1,7 +1,5 @@
 package be.nikiroo.gofetch.output;
 
-import java.util.List;
-
 import be.nikiroo.gofetch.data.Comment;
 import be.nikiroo.gofetch.data.Story;
 import be.nikiroo.gofetch.support.BasicSupport.Type;
@@ -17,7 +15,7 @@ public class Html extends Output {
                if (!sel.isEmpty()) {
                        sel = "/1" + sel;
                }
-               
+
                String gopherUrl = "gopher://" + hostname + sel + ":" + port;
 
                return "<h1>News</h1>\n"//
@@ -35,40 +33,60 @@ public class Html extends Output {
        }
 
        @Override
-       public String export(Story story) {
+       public String exportHeader(Story story) {
                StringBuilder builder = new StringBuilder();
 
+               appendPre(builder);
+
                builder.append("<div class='story-header'>\n");
                appendHtml(builder, story, true);
                builder.append("<hr/>\n");
                builder.append("</div>\n");
 
+               appendPost(builder);
+
                return builder.toString();
        }
 
        @Override
-       public String export(Story story, List<Comment> comments) {
+       public String export(Story story) {
                StringBuilder builder = new StringBuilder();
+               appendPre(builder);
 
                builder.append("<div class='story'>\n");
                appendHtml(builder, story, false);
                builder.append("<hr/>\n");
 
-               if (comments != null) {
-                       for (Comment comment : comments) {
+               if (story.getComments() != null) {
+                       for (Comment comment : story.getComments()) {
                                appendHtml(builder, comment, "  ");
                        }
                }
 
                builder.append("</div>\n");
 
+               appendPost(builder);
+
                return builder.toString();
        }
 
+       private void appendPre(StringBuilder builder) {
+               builder.append("<!DOCTYPE html>\n");
+               builder.append("<html>\n");
+               builder.append("<head>\n");
+               builder.append("  <meta http-equiv='content-type' content='text/html; charset=utf-8'>\n");
+               builder.append("  <meta name='viewport' content='width=device-width, initial-scale=1.0'>\n");
+               builder.append("</head>\n");
+               builder.append("<body>\n");
+       }
+
+       private void appendPost(StringBuilder builder) {
+               builder.append("</body>\n");
+       }
+
        private void appendHtml(StringBuilder builder, Comment comment, String space) {
-               builder.append(space).append(
-                               "<div class='comment' style='display: block; margin-left: "
-                                               + (20 * space.length()) + "px'>");
+               builder.append(space)
+                               .append("<div class='comment' style='display: block; margin-left: 80px'>\n");
                builder.append(space).append("  <h2>").append(comment.getTitle())
                                .append("</h2>\n");
                builder.append(space).append("  <div class='by'>")
@@ -78,7 +96,7 @@ public class Html extends Output {
                for (Comment subComment : comment) {
                        appendHtml(builder, subComment, space + "  ");
                }
-               builder.append(space).append("</div>");
+               builder.append(space).append("</div>\n");
        }
 
        private StringBuilder appendHtml(StringBuilder builder, Story story,
@@ -106,7 +124,11 @@ public class Html extends Output {
                }
 
                builder.append("        <div class='content'>\n");
-               builder.append("                " + story.getContent() + "\n");
+               if (resume) {
+                       builder.append("                " + story.getContent() + "\n");
+               } else {
+                       builder.append("                " + story.getFullContent() + "\n");
+               }
                builder.append("        </div>\n");
 
                return builder;
Gopher news scrapper