X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2Foutput%2FGopher.java;h=97b7b9b5b1f4f45476c71883655cfbf15025e51d;hb=136d034bf1f8ea08c8675866d3ab59900b82d3fe;hp=dc5ac80886bb60cbe5067ce4268d478c1ed5d5f2;hpb=5c056aade2e020276e039f81acba7bcb2b12e87f;p=gofetch.git

diff --git a/src/be/nikiroo/gofetch/output/Gopher.java b/src/be/nikiroo/gofetch/output/Gopher.java
index dc5ac80..97b7b9b 100644
--- a/src/be/nikiroo/gofetch/output/Gopher.java
+++ b/src/be/nikiroo/gofetch/output/Gopher.java
@@ -16,15 +16,17 @@ public class Gopher extends Output {
 	public String getIndexHeader() {
 		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();
 	}
@@ -36,47 +38,63 @@ public class Gopher extends Output {
 
 	@Override
 	public String exportHeader(Story story) {
-		return append(new StringBuilder(), story, false).append("i\r\ni\r\n")
-				.toString();
+		return append(new StringBuilder(), story, true).toString();
 	}
 
 	@Override
 	public String export(Story story) {
 		StringBuilder builder = new StringBuilder();
-		append(builder, story, true);
+		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);
+		appendLeft(builder, menu, "(" + comment.getAuthor() + ")", "   ",
+				"   ", space);
 
-		builder.append("i\r\n");
+		builder.append((menu ? "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 += " ";
+			}
 
-		builder.append("i\r\n");
+			appendLeft(builder, menu, line, prep, prep, space);
+		}
+
+		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;
@@ -85,64 +103,80 @@ 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");
-			appendLeft(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 News link: ").append(story.getUrlInternal())
 					.append("\r\n");
-			builder.append("i  o Source link: ").append(story.getUrlExternal())
+			builder.append("  o Source link: ").append(story.getUrlExternal())
 					.append("\r\n");
-			builder.append("i\r\n");
+			builder.append("\r\n");
 
-			builder.append("i\r\n");
+			builder.append("\r\n");
 
-			appendLeft(builder, story.getFullContent(), "    ");
+			appendJustified(builder, false, story.getFullContent(), "    ");
 		} else {
-			builder.append('1').append(story.getTitle()) //
-					.append('\t').append("0").append(story.getSelector()) //
+			builder.append('0').append(story.getTitle()) //
+					.append('\t').append(story.getSelector()) //
 					.append('\t').append(hostname) //
 					.append('\t').append(port) //
 					.append("\r\n");
-			appendLeft(builder, story.getDetails(), "  ");
+			appendJustified(builder, true, story.getDetails(), "  ");
 			builder.append("i\r\n");
 
-			appendLeft(builder, story.getContent(), "    ");
+			appendJustified(builder, true, story.getContent(), "    ");
 		}
 
-		builder.append("i\r\n");
+		builder.append(resume ? "i" : "").append("\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();
 		}
+		
+		int size = LINE_SIZE - space.length();
+		for (String line : StringJustifier.center(text, size)) {
+			builder.append(menu ? "i" : "")
+				.append(space)
+				.append(line).append("\r\n");
+		}
+	}
 
-		for (String line : StringJustifier.center(text, LINE_SIZE)) {
-			builder.append("i").append(line).append("\r\n");
+	private static void appendJustified(StringBuilder builder, boolean menu,
+			String text, String space) {
+		for (String line : text.split("\n")) {
+			int size = LINE_SIZE - space.length();
+			for (String subline : StringJustifier.full(line, size)) {
+				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 : StringJustifier.left(text,
-				LINE_SIZE - space.length())) {
-			builder.append("i").append(space).append(prepend).append(line)
-					.append("\r\n");
-			prepend = prependOthers;
+		for (String line : text.split("\n")) {
+			for (String subline : StringJustifier.left(line,
+					LINE_SIZE - space.length())) {
+				builder.append(menu ? "i" : "").append(space).append(prepend)
+						.append(subline).append("\r\n");
+				prepend = prependOthers;
+			}
 		}
 	}
 }