X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2Foutput%2FHtml.java;h=5b022d1f8789224a1ea11514bc55ac42da01b47f;hb=301dfeb23bda89e70b3c51ac2e26b378e7448cab;hp=fea5f67997c0b36ad3f45734051a32ce6d16d911;hpb=e236e220a546081f4572447fc2d01764583680ac;p=gofetch.git diff --git a/src/be/nikiroo/gofetch/output/Html.java b/src/be/nikiroo/gofetch/output/Html.java index fea5f67..5b022d1 100644 --- 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 "

News

\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("
\n"); appendHtml(builder, story, true); builder.append("
\n"); builder.append("
\n"); + appendPost(builder); + return builder.toString(); } @Override - public String export(Story story, List comments) { + public String export(Story story) { StringBuilder builder = new StringBuilder(); + appendPre(builder); builder.append("
\n"); appendHtml(builder, story, false); builder.append("
\n"); - if (comments != null) { - for (Comment comment : comments) { + if (story.getComments() != null) { + for (Comment comment : story.getComments()) { appendHtml(builder, comment, " "); } } builder.append("
\n"); + appendPost(builder); + return builder.toString(); } + private void appendPre(StringBuilder builder) { + builder.append("\n"); + builder.append("\n"); + builder.append("\n"); + builder.append(" \n"); + builder.append(" \n"); + builder.append("\n"); + builder.append("\n"); + } + + private void appendPost(StringBuilder builder) { + builder.append("\n"); + } + private void appendHtml(StringBuilder builder, Comment comment, String space) { - builder.append(space).append( - "
"); + builder.append(space) + .append("
\n"); builder.append(space).append("

").append(comment.getTitle()) .append("

\n"); builder.append(space).append("
") @@ -78,7 +96,7 @@ public class Html extends Output { for (Comment subComment : comment) { appendHtml(builder, subComment, space + " "); } - builder.append(space).append("
"); + builder.append(space).append("
\n"); } private StringBuilder appendHtml(StringBuilder builder, Story story, @@ -106,7 +124,11 @@ public class Html extends Output { } builder.append("
\n"); - builder.append(" " + story.getContent() + "\n"); + if (resume) { + builder.append(" " + story.getContent() + "\n"); + } else { + builder.append(" " + story.getFullContent() + "\n"); + } builder.append("
\n"); return builder;