X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2Foutput%2FGopher.java;h=478522b53a5ac24d8fbec9ff0ebfdca0d4f3ecef;hb=dd8ad646a8461d33a5ced5da1162cacad88e34b3;hp=1ad9731ccf1308fbf9f4c650783dd10e6da5044e;hpb=2527107526aea628df09c3ad53432e9a5480fcd7;p=gofetch.git

diff --git a/src/be/nikiroo/gofetch/output/Gopher.java b/src/be/nikiroo/gofetch/output/Gopher.java
index 1ad9731..478522b 100644
--- a/src/be/nikiroo/gofetch/output/Gopher.java
+++ b/src/be/nikiroo/gofetch/output/Gopher.java
@@ -1,7 +1,5 @@
 package be.nikiroo.gofetch.output;
 
-import java.util.List;
-
 import be.nikiroo.gofetch.StringJustifier;
 import be.nikiroo.gofetch.data.Comment;
 import be.nikiroo.gofetch.data.Story;
@@ -37,20 +35,20 @@ public class Gopher extends Output {
 	}
 
 	@Override
-	public String export(Story story) {
-		return append(new StringBuilder(), story, false).append("i\r\ni\r\n")
+	public String exportHeader(Story story) {
+		return append(new StringBuilder(), story, true).append("i\r\ni\r\n")
 				.toString();
 	}
 
 	@Override
-	public String export(Story story, List<Comment> comments) {
+	public String export(Story story) {
 		StringBuilder builder = new StringBuilder();
-		append(builder, story, true);
+		append(builder, story, false);
 
 		builder.append("i\r\n");
 
-		if (comments != null) {
-			for (Comment comment : comments) {
+		if (story.getComments() != null) {
+			for (Comment comment : story.getComments()) {
 				append(builder, comment, "");
 			}
 		}
@@ -85,17 +83,22 @@ public class Gopher extends Output {
 	}
 
 	private StringBuilder append(StringBuilder builder, Story story,
-			boolean links) {
-		if (links) {
+			boolean resume) {
+		if (!resume) {
 			appendCenter(builder, story.getTitle(), true);
 			builder.append("i\r\n");
 			appendLeft(builder, story.getDetails(), "  ");
 			builder.append("i\r\n");
+
 			builder.append("i  o News link: ").append(story.getUrlInternal())
 					.append("\r\n");
 			builder.append("i  o Source link: ").append(story.getUrlExternal())
 					.append("\r\n");
 			builder.append("i\r\n");
+
+			builder.append("i\r\n");
+
+			appendLeft(builder, story.getFullContent(), "    ");
 		} else {
 			builder.append('1').append(story.getTitle()) //
 					.append('\t').append("0").append(story.getSelector()) //
@@ -103,11 +106,10 @@ public class Gopher extends Output {
 					.append('\t').append(port) //
 					.append("\r\n");
 			appendLeft(builder, story.getDetails(), "  ");
-		}
-
-		builder.append("i\r\n");
+			builder.append("i\r\n");
 
-		appendLeft(builder, story.getContent(), "    ");
+			appendLeft(builder, story.getContent(), "    ");
+		}
 
 		builder.append("i\r\n");