X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2Foutput%2FGopher.java;h=aab03f67d19127145735189abd41adc79fbc41a4;hb=c715ea028a2b9865b1b5a619b7cf7553a89aa90d;hp=2fa0c913b31d9951a1007b0269acd50324b2416a;hpb=100a839503d23e324d2db3f6d3e47892def3bf81;p=gofetch.git diff --git a/src/be/nikiroo/gofetch/output/Gopher.java b/src/be/nikiroo/gofetch/output/Gopher.java index 2fa0c91..aab03f6 100644 --- a/src/be/nikiroo/gofetch/output/Gopher.java +++ b/src/be/nikiroo/gofetch/output/Gopher.java @@ -1,9 +1,11 @@ package be.nikiroo.gofetch.output; -import be.nikiroo.gofetch.StringJustifier; 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; +import be.nikiroo.utils.StringUtils.Alignment; public class Gopher extends Output { static private final int LINE_SIZE = 67; @@ -13,31 +15,47 @@ public class Gopher extends Output { } @Override - public String getIndexHeader() { + public String getMainIndexHeader() { StringBuilder builder = new StringBuilder(); - appendCenter(builder, "NEWS", true); - appendLeft(builder, "", ""); - appendLeft(builder, "You will find here a few pages full of news.", ""); - appendLeft(builder, "", ""); + appendCenter(builder, true, "NEWS", "", true); + appendLeft(builder, true, "", ""); + appendLeft(builder, true, + "You will find here a few pages full of news.", ""); + appendLeft(builder, true, "", ""); appendLeft( builder, + true, "They are simply scrapped from their associated webpage and converted into a gopher friendly format, updated a few times a day.", ""); - appendLeft(builder, "", ""); + appendLeft(builder, true, "", ""); return builder.toString(); } @Override - public String getIndexFooter() { + public String getMainIndexFooter() { + return ""; + } + + @Override + public String getIndexHeader(BasicSupport support) { + StringBuilder builder = new StringBuilder(); + appendCenter(builder, true, support.getDescription(), "", true); + builder.append("\r\n"); + builder.append("\r\n"); + builder.append("\r\n"); + return builder.toString(); + } + + @Override + public String getIndexFooter(BasicSupport support) { return ""; } @Override public String exportHeader(Story story) { - return append(new StringBuilder(), story, true).append("i\r\ni\r\n") - .toString(); + return append(new StringBuilder(), story, true).toString(); } @Override @@ -45,31 +63,34 @@ public class Gopher extends Output { StringBuilder builder = new StringBuilder(); append(builder, story, false); - builder.append("i\r\n"); + builder.append("\r\n"); if (story.getComments() != null) { for (Comment comment : story.getComments()) { - append(builder, comment, ""); + append(builder, false, comment, " "); } } - builder.append("i\r\n"); + builder.append("\r\n"); return builder.toString(); } - private StringBuilder append(StringBuilder builder, Comment comment, - String space) { + private StringBuilder append(StringBuilder builder, boolean menu, + Comment comment, String space) { if (space.length() > LINE_SIZE - 20) { space = space.substring(0, LINE_SIZE - 20); } - appendLeft(builder, comment.getTitle(), "** ", " ", space); - appendLeft(builder, "(" + comment.getAuthor() + ")", " ", " ", - space); + appendLeft(builder, menu, comment.getTitle(), "** ", " ", space); - builder.append("i\r\n"); + if (comment.getAuthor() != null + && !comment.getAuthor().trim().isEmpty()) { + appendLeft(builder, menu, "(" + comment.getAuthor() + ")", " ", + " ", space); + builder.append((menu ? "i" : "") + "\r\n"); + } for (String line : comment.getContentLines()) { int depth = 0; @@ -87,13 +108,13 @@ public class Gopher extends Output { prep += " "; } - appendLeft(builder, line, prep, prep, space); + appendLeft(builder, menu, line, prep, prep, space); } - builder.append("i\r\n"); + builder.append((menu ? "i" : "") + "\r\n"); for (Comment subComment : comment) { - append(builder, subComment, space + " "); - builder.append("i\r\n"); + append(builder, menu, subComment, space + " "); + builder.append((menu ? "i" : "") + "\r\n"); } return builder; @@ -102,75 +123,89 @@ public class Gopher extends Output { private StringBuilder append(StringBuilder builder, Story story, boolean resume) { if (!resume) { - appendCenter(builder, story.getTitle(), true); - builder.append("i\r\n"); - appendJustified(builder, story.getDetails(), " "); - builder.append("i\r\n"); + appendCenter(builder, false, story.getTitle(), " ", true); + builder.append("\r\n"); + appendJustified(builder, false, story.getDetails(), " "); + builder.append("\r\n"); - builder.append("i o News link: ").append(story.getUrlInternal()) + builder.append(" o Reference: ").append(story.getId()) .append("\r\n"); - builder.append("i o Source link: ").append(story.getUrlExternal()) + builder.append(" o News link: ").append(story.getUrlInternal()) .append("\r\n"); - builder.append("i\r\n"); + builder.append(" o Source link: ").append(story.getUrlExternal()) + .append("\r\n"); + builder.append("\r\n"); - builder.append("i\r\n"); + builder.append("\r\n"); - appendJustified(builder, story.getFullContent(), " "); + appendJustified(builder, false, story.getFullContent(), " "); + builder.append("\r\n"); } else { - builder.append('1').append(story.getTitle()) // + builder.append('0').append(story.getTitle()) // .append('\t').append(story.getSelector()) // .append('\t').append(hostname) // .append('\t').append(port) // .append("\r\n"); - appendJustified(builder, story.getDetails(), " "); + appendJustified(builder, true, story.getDetails(), " "); builder.append("i\r\n"); - appendJustified(builder, story.getContent(), " "); + String content = story.getContent(); + if (!content.isEmpty()) { + appendJustified(builder, true, content, " "); + builder.append("i\r\n"); + } } - builder.append("i\r\n"); - return builder; } // note: adds "i" - private static void appendCenter(StringBuilder builder, String text, - boolean allCaps) { + private static void appendCenter(StringBuilder builder, boolean menu, + String text, String space, boolean allCaps) { if (allCaps) { text = text.toUpperCase(); } - for (String line : StringJustifier.center(text, LINE_SIZE)) { - builder.append("i").append(line).append("\r\n"); + int size = LINE_SIZE - space.length(); + for (String line : StringUtils + .justifyText(text, size, Alignment.CENTER)) { + builder.append(menu ? "i" : "") // + .append(space) // + .append(line) // + .append("\r\n"); } } - // note: adds "i" - private static void appendJustified(StringBuilder builder, String text, - String space) { + private static void appendJustified(StringBuilder builder, boolean menu, + String text, String space) { for (String line : text.split("\n")) { - for (String subline : StringJustifier.full(line, - LINE_SIZE - space.length())) { - builder.append("i").append(subline).append("\r\n"); + int size = LINE_SIZE - space.length(); + for (String subline : StringUtils.justifyText(line, size, + Alignment.JUSTIFY)) { + builder.append(menu ? "i" : "") // + .append(space) // + .append(subline) // + .append("\r\n"); } } } - // note: adds "i" - private static void appendLeft(StringBuilder builder, String text, - String space) { - appendLeft(builder, text, "", "", space); + private static void appendLeft(StringBuilder builder, boolean menu, + String text, String space) { + appendLeft(builder, menu, text, "", "", space); } - // note: adds "i" - private static void appendLeft(StringBuilder builder, String text, - String prependFirst, String prependOthers, String space) { + private static void appendLeft(StringBuilder builder, boolean menu, + String text, String prependFirst, String prependOthers, String space) { String prepend = prependFirst; for (String line : text.split("\n")) { - for (String subline : StringJustifier.left(line, - LINE_SIZE - space.length())) { - builder.append("i").append(space).append(prepend) - .append(subline).append("\r\n"); + for (String subline : StringUtils.justifyText(line, LINE_SIZE + - space.length(), Alignment.LEFT)) { + builder.append(menu ? "i" : "") // + .append(space) // + .append(prepend) // + .append(subline) // + .append("\r\n"); prepend = prependOthers; } }