X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2Foutput%2FGopher.java;h=6dcb4aa8b284777bff8338c530e83d225e8b0ba5;hb=27008a8782c0ed96e07c8dc39ff0ed1f5163a9d0;hp=8cce4a571d1c5c11f51b0e52bd75eac18588f770;hpb=737852686d8897331706ed4b902dbd9d5038cb53;p=gofetch.git

diff --git a/src/be/nikiroo/gofetch/output/Gopher.java b/src/be/nikiroo/gofetch/output/Gopher.java
index 8cce4a5..6dcb4aa 100644
--- a/src/be/nikiroo/gofetch/output/Gopher.java
+++ b/src/be/nikiroo/gofetch/output/Gopher.java
@@ -1,28 +1,32 @@
 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;
 import be.nikiroo.gofetch.support.BasicSupport.Type;
 
 public class Gopher extends Output {
-	static private final int LINE_SIZE = 70;
-
-	private String hostname;
-	private int port;
-
-	public Gopher(Type type, String hostname, int port) {
-		super(type);
+	static private final int LINE_SIZE = 67;
 
-		this.hostname = hostname;
-		this.port = port;
+	public Gopher(Type type, String hostname, String preselector, int port) {
+		super(type, hostname, preselector, port);
 	}
 
 	@Override
 	public String getIndexHeader() {
-		return "iHello world!\r\niThis is my news site.\r\ni\r\n";
+		StringBuilder builder = new StringBuilder();
+
+		appendCenter(builder, "NEWS", true);
+		appendLeft(builder, "", "");
+		appendLeft(builder, "You will find here a few pages full of news.", "");
+		appendLeft(builder, "", "");
+		appendLeft(
+				builder,
+				"They are simply scrapped from their associated webpage and converted into a gopher friendly format, updated a few times a day.",
+				"");
+		appendLeft(builder, "", "");
+
+		return builder.toString();
 	}
 
 	@Override
@@ -31,20 +35,22 @@ 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");
 
-		for (Comment comment : comments) {
-			append(builder, comment, "");
+		if (story.getComments() != null) {
+			for (Comment comment : story.getComments()) {
+				append(builder, comment, "");
+			}
 		}
 
 		builder.append("i\r\n");
@@ -59,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) {
@@ -77,28 +100,33 @@ 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(), "", "", "  ");
+			appendJustified(builder, story.getDetails(), "  ");
 			builder.append("i\r\n");
-			builder.append("i  o News link: ").append(story.getUrlInternal());
+
+			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  o Source link: ").append(story.getUrlExternal());
+
 			builder.append("i\r\n");
+
+			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(), "", "", "  ");
-		}
-
-		builder.append("i\r\n");
+			appendJustified(builder, story.getDetails(), "  ");
+			builder.append("i\r\n");
 
-		appendLeft(builder, story.getContent(), "", "", "    ");
+			appendJustified(builder, story.getContent(), "    ");
+		}
 
 		builder.append("i\r\n");
 
@@ -117,6 +145,21 @@ 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) {
+		appendLeft(builder, text, "", "", space);
+	}
+
 	// note: adds "i"
 	private static void appendLeft(StringBuilder builder, String text,
 			String prependFirst, String prependOthers, String space) {