X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FParserFilter.java;h=90744e722b21a7d555bfe9ba6e2d0d8cd1b389c8;hp=26afe2ec656e513e47ca913851b643e4db33efe4;hb=689913e068c06d6cd4bdff17f5da30be2000df6c;hpb=9d50dcb65cec8d10306fbdb0d73826f33af2afb9

diff --git a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
index 26afe2e..90744e7 100644
--- a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ParserFilter.java - Copyright © 2011 David Roden
+ * Sone - ParserFilter.java - Copyright © 2011–2012 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@ import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import net.pterodactylus.sone.core.Core;
@@ -33,7 +35,8 @@ import net.pterodactylus.sone.text.PostPart;
 import net.pterodactylus.sone.text.SonePart;
 import net.pterodactylus.sone.text.SoneTextParser;
 import net.pterodactylus.sone.text.SoneTextParserContext;
-import net.pterodactylus.sone.web.page.Page.Request;
+import net.pterodactylus.sone.web.page.FreenetRequest;
+import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Filter;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
@@ -57,10 +60,10 @@ public class ParserFilter implements Filter {
 	private final TemplateContextFactory templateContextFactory;
 
 	/** The template for {@link PlainTextPart}s. */
-	private final Template plainTextTemplate = TemplateParser.parse(new StringReader("<%text|html>"));
+	private static final Template plainTextTemplate = TemplateParser.parse(new StringReader("<%text|html>"));
 
 	/** The template for {@link FreenetLinkPart}s. */
-	private final Template linkTemplate = TemplateParser.parse(new StringReader("<a class=\"<%cssClass|html>\" href=\"<%link|html>\" title=\"<%title|html>\"><%text|html></a>"));
+	private static final Template linkTemplate = TemplateParser.parse(new StringReader("<a class=\"<%cssClass|html>\" href=\"<%link|html>\" title=\"<%title|html>\"><%text|html></a>"));
 
 	/**
 	 * Creates a new filter that runs its input through a {@link SoneTextParser}
@@ -83,21 +86,49 @@ public class ParserFilter implements Filter {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Object format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
+	public Object format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
 		String text = String.valueOf(data);
-		String soneKey = parameters.get("sone");
-		if (soneKey == null) {
-			soneKey = "sone";
+		int length = Numbers.safeParseInteger(parameters.get("length"), Numbers.safeParseInteger(templateContext.get(String.valueOf(parameters.get("length"))), -1));
+		int cutOffLength = Numbers.safeParseInteger(parameters.get("cut-off-length"), Numbers.safeParseInteger(templateContext.get(String.valueOf(parameters.get("cut-off-length"))), length));
+		Object sone = parameters.get("sone");
+		if (sone instanceof String) {
+			sone = core.getSone((String) sone, false);
 		}
-		Sone sone = (Sone) templateContext.get(soneKey);
-		if (sone == null) {
-			sone = core.getSone(soneKey, false);
-		}
-		Request request = (Request) templateContext.get("request");
-		SoneTextParserContext context = new SoneTextParserContext(request, sone);
+		FreenetRequest request = (FreenetRequest) templateContext.get("request");
+		SoneTextParserContext context = new SoneTextParserContext(request, (Sone) sone);
 		StringWriter parsedTextWriter = new StringWriter();
 		try {
-			render(parsedTextWriter, soneTextParser.parse(context, new StringReader(text)));
+			Iterable<Part> parts = soneTextParser.parse(context, new StringReader(text));
+			if (length > -1) {
+				int allPartsLength = 0;
+				List<Part> shortenedParts = new ArrayList<Part>();
+				for (Part part : parts) {
+					if (part instanceof PlainTextPart) {
+						String longText = ((PlainTextPart) part).getText();
+						if (allPartsLength < cutOffLength) {
+							if ((allPartsLength + longText.length()) > cutOffLength) {
+								shortenedParts.add(new PlainTextPart(longText.substring(0, cutOffLength - allPartsLength) + "…"));
+							} else {
+								shortenedParts.add(part);
+							}
+						}
+						allPartsLength += longText.length();
+					} else if (part instanceof LinkPart) {
+						if (allPartsLength < cutOffLength) {
+							shortenedParts.add(part);
+						}
+						allPartsLength += ((LinkPart) part).getText().length();
+					} else {
+						if (allPartsLength < cutOffLength) {
+							shortenedParts.add(part);
+						}
+					}
+				}
+				if (allPartsLength >= length) {
+					parts = shortenedParts;
+				}
+			}
+			render(parsedTextWriter, parts);
 		} catch (IOException ioe1) {
 			/* no exceptions in a StringReader or StringWriter, ignore. */
 		}
@@ -194,7 +225,11 @@ public class ParserFilter implements Filter {
 	 *            The part to render
 	 */
 	private void render(Writer writer, SonePart sonePart) {
-		renderLink(writer, "viewSone.html?sone=" + sonePart.getSone().getId(), SoneAccessor.getNiceName(sonePart.getSone()), SoneAccessor.getNiceName(sonePart.getSone()), "in-sone");
+		if ((sonePart.getSone() != null) && (sonePart.getSone().getName() != null)) {
+			renderLink(writer, "viewSone.html?sone=" + sonePart.getSone().getId(), SoneAccessor.getNiceName(sonePart.getSone()), SoneAccessor.getNiceName(sonePart.getSone()), "in-sone");
+		} else {
+			renderLink(writer, "/WebOfTrust/ShowIdentity?id=" + sonePart.getSone().getId(), sonePart.getSone().getId(), sonePart.getSone().getId(), "in-sone");
+		}
 	}
 
 	/**
@@ -247,10 +282,11 @@ public class ParserFilter implements Filter {
 	 * @return The excerpt of the text
 	 */
 	private static String getExcerpt(String text, int length) {
-		if (text.length() > length) {
-			return text.substring(0, length) + "…";
+		String filteredText = text.replaceAll("(\r\n)+", "\r\n").replaceAll("\n+", "\n").replace("\r\n", " ").replace('\n', ' ');
+		if (filteredText.length() > length) {
+			return filteredText.substring(0, length) + "…";
 		}
-		return text;
+		return filteredText;
 	}
 
 }