X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2Foutput%2FHtml.java;h=a4452643ccf055d6584d74781771370b7c1c8e58;hb=aacd7f07ac5e2b4bb4ef0dfef48ec272b16900fa;hp=33c99c81f8874d4a8b249dddee43e0f56ff69a0c;hpb=27008a8782c0ed96e07c8dc39ff0ed1f5163a9d0;p=gofetch.git diff --git a/src/be/nikiroo/gofetch/output/Html.java b/src/be/nikiroo/gofetch/output/Html.java index 33c99c8..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; @@ -21,7 +23,7 @@ public class Html extends Output { StringBuilder builder = new StringBuilder(); appendPre(builder); - builder.append("
").append(comment.getTitle()) - .append("
\n"); - builder.append(space).append("").append(comment.getTitle()) + .append("
\n"); + builder.append(space) + .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");
@@ -138,9 +159,14 @@ public class Html extends Output {
builder.append(" \n");
if (resume) {
- builder.append(" " + story.getContent() + "\n");
+ builder.append(" "
+ + StringUtils.xmlEscape(story.getContent()).replace("\n",
+ " \n");
") + "\n"); } else { - builder.append(" " + story.getFullContent() + "\n"); + builder.append(" " + + StringUtils.xmlEscape(story.getFullContent()) + .replace("\n", "
").replace("[ ", "
") + .replace(" ]", "
") + "\n"); } builder.append("