Version 0.2.0: supports LWN, quotes, <br>s

[gofetch.git] / src / be / nikiroo / gofetch / output / Gopher.java

diff --git a/src/be/nikiroo/gofetch/output/Gopher.java b/src/be/nikiroo/gofetch/output/Gopher.java
index dc5ac80886bb60cbe5067ce4268d478c1ed5d5f2..6dcb4aa8b284777bff8338c530e83d225e8b0ba5 100644 (file)
--- a/src/be/nikiroo/gofetch/output/Gopher.java
+++ b/src/be/nikiroo/gofetch/output/Gopher.java
@@ -36,14 +36,14 @@ public class Gopher extends Output {
 
        @Override
        public String exportHeader(Story story) {
-               return append(new StringBuilder(), story, false).append("i\r\ni\r\n")
+               return append(new StringBuilder(), story, true).append("i\r\ni\r\n")
                                .toString();
        }
 
        @Override
        public String export(Story story) {
                StringBuilder builder = new StringBuilder();
-               append(builder, story, true);
+               append(builder, story, false);
 
                builder.append("i\r\n");
 
@@ -65,13 +65,30 @@ public class Gopher extends Output {
                        space = space.substring(0, LINE_SIZE - 20);
                }
 
-               appendLeft(builder, comment.getTitle(), ">> ", "   ", space);
+               appendLeft(builder, comment.getTitle(), "** ", "   ", space);
                appendLeft(builder, "(" + comment.getAuthor() + ")", "   ", "   ",
                                space);
 
                builder.append("i\r\n");
 
-               appendLeft(builder, comment.getContent(), "   ", "   ", space);
+               for (String line : comment.getContentLines()) {
+                       int depth = 0;
+                       while (line.length() > depth && line.charAt(depth) == '>') {
+                               depth++;
+                       }
+                       line = line.substring(depth).trim();
+
+                       String prep = "   ";
+                       for (int i = 0; i < depth; i++) {
+                               prep += ">";
+                       }
+
+                       if (depth > 0) {
+                               prep += " ";
+                       }
+
+                       appendLeft(builder, line, prep, prep, space);
+               }
 
                builder.append("i\r\n");
                for (Comment subComment : comment) {
@@ -87,7 +104,7 @@ public class Gopher extends Output {
                if (!resume) {
                        appendCenter(builder, story.getTitle(), true);
                        builder.append("i\r\n");
-                       appendLeft(builder, story.getDetails(), "  ");
+                       appendJustified(builder, story.getDetails(), "  ");
                        builder.append("i\r\n");
 
                        builder.append("i  o News link: ").append(story.getUrlInternal())
@@ -98,17 +115,17 @@ public class Gopher extends Output {
 
                        builder.append("i\r\n");
 
-                       appendLeft(builder, story.getFullContent(), "    ");
+                       appendJustified(builder, story.getFullContent(), "    ");
                } else {
                        builder.append('1').append(story.getTitle()) //
-                                       .append('\t').append("0").append(story.getSelector()) //
+                                       .append('\t').append(story.getSelector()) //
                                        .append('\t').append(hostname) //
                                        .append('\t').append(port) //
                                        .append("\r\n");
-                       appendLeft(builder, story.getDetails(), "  ");
+                       appendJustified(builder, story.getDetails(), "  ");
                        builder.append("i\r\n");
 
-                       appendLeft(builder, story.getContent(), "    ");
+                       appendJustified(builder, story.getContent(), "    ");
                }
 
                builder.append("i\r\n");
@@ -128,6 +145,15 @@ public class Gopher extends Output {
                }
        }
 
+       // note: adds "i"
+       private static void appendJustified(StringBuilder builder, String text,
+                       String space) {
+               for (String line : StringJustifier.full(text,
+                               LINE_SIZE - space.length())) {
+                       builder.append("i").append(line).append("\r\n");
+               }
+       }
+
        // note: adds "i"
        private static void appendLeft(StringBuilder builder, String text,
                        String space) {