X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Fgofetch%2Foutput%2FHtml.java;h=a4452643ccf055d6584d74781771370b7c1c8e58;hb=e818d449fee8a5397ab2f05df63bbeffc4c67dc0;hp=5b022d1f8789224a1ea11514bc55ac42da01b47f;hpb=bb0d9eb242c303df073dc80d39e24b8b10c1dddb;p=gofetch.git diff --git a/src/be/nikiroo/gofetch/output/Html.java b/src/be/nikiroo/gofetch/output/Html.java index 5b022d1..a445264 100644 --- a/src/be/nikiroo/gofetch/output/Html.java +++ b/src/be/nikiroo/gofetch/output/Html.java @@ -2,7 +2,9 @@ package be.nikiroo.gofetch.output; import be.nikiroo.gofetch.data.Comment; import be.nikiroo.gofetch.data.Story; -import be.nikiroo.gofetch.support.BasicSupport.Type; +import be.nikiroo.gofetch.support.BasicSupport; +import be.nikiroo.gofetch.support.Type; +import be.nikiroo.utils.StringUtils; public class Html extends Output { public Html(Type type, String hostname, String preselector, int port) { @@ -10,7 +12,7 @@ public class Html extends Output { } @Override - public String getIndexHeader() { + public String getMainIndexHeader() { String sel = preselector; if (!sel.isEmpty()) { sel = "/1" + sel; @@ -18,17 +20,34 @@ public class Html extends Output { String gopherUrl = "gopher://" + hostname + sel + ":" + port; - return "
You will find here a few pages full of news, mirroring " + gopherUrl + ".
\n"// + "They are simply scrapped from their associated webpage and updated a few times a day.
\n"// - ; + ); + + appendPost(builder); + + return builder.toString(); } @Override - public String getIndexFooter() { + public String getMainIndexFooter() { + return ""; + } + + @Override + public String getIndexHeader(BasicSupport support) { + return "
").append(comment.getTitle()) - .append("
\n"); - builder.append(space).append("").append(comment.getTitle()) + .append("
\n"); + builder.append(space) + .append("" + line + "
"); + } + builder.append("" - + story.getTitle() + "
\n"); + builder.append("" + + story.getTitle() + "
\n"); } else { - builder.append("" + story.getTitle() + "
\n"); + builder.append("" + story.getTitle() + "
\n"); + } + + builder.append("\n"); if (!resume) { builder.append("
\n"); + builder.append("- Reference: " + story.getId()
+ + "
\n");
builder.append(" - News link: " + story.getUrlInternal()
+ "
\n");
@@ -123,11 +157,16 @@ public class Html extends Output {
builder.append(" \n");
+ builder.append(" \n");
if (resume) {
- builder.append(" " + story.getContent() + "\n");
+ builder.append(" "
+ + StringUtils.xmlEscape(story.getContent()).replace("\n",
+ " \n");
\n"); } - builder.append("
") + "\n"); } else { - builder.append(" " + story.getFullContent() + "\n"); + builder.append(" " + + StringUtils.xmlEscape(story.getFullContent()) + .replace("\n", "
").replace("[ ", "
") + .replace(" ]", "
") + "\n"); } builder.append("