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

diff --git a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
index 26afe2e..3494c21 100644
--- a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
@@ -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,7 @@ 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.template.Filter;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
@@ -85,6 +87,19 @@ public class ParserFilter implements Filter {
 	@Override
 	public Object format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
 		String text = String.valueOf(data);
+		int length = -1;
+		try {
+			length = Integer.parseInt(parameters.get("length"));
+		} catch (NumberFormatException nfe1) {
+			/* ignore. */
+		}
+		if ((length == -1) && (parameters.get("length") != null)) {
+			try {
+				length = Integer.parseInt(String.valueOf(templateContext.get(parameters.get("length"))));
+			} catch (NumberFormatException nfe1) {
+				/* ignore. */
+			}
+		}
 		String soneKey = parameters.get("sone");
 		if (soneKey == null) {
 			soneKey = "sone";
@@ -93,11 +108,35 @@ public class ParserFilter implements Filter {
 		if (sone == null) {
 			sone = core.getSone(soneKey, false);
 		}
-		Request request = (Request) templateContext.get("request");
+		FreenetRequest request = (FreenetRequest) templateContext.get("request");
 		SoneTextParserContext context = new SoneTextParserContext(request, 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) {
+				List<Part> shortenedParts = new ArrayList<Part>();
+				for (Part part : parts) {
+					if (part instanceof PlainTextPart) {
+						String longText = ((PlainTextPart) part).getText();
+						if (length >= longText.length()) {
+							shortenedParts.add(part);
+						} else {
+							shortenedParts.add(new PlainTextPart(longText.substring(0, length) + "…"));
+						}
+						length -= longText.length();
+					} else if (part instanceof LinkPart) {
+						shortenedParts.add(part);
+						length -= ((LinkPart) part).getText().length();
+					} else {
+						shortenedParts.add(part);
+					}
+					if (length <= 0) {
+						break;
+					}
+				}
+				parts = shortenedParts;
+			}
+			render(parsedTextWriter, parts);
 		} catch (IOException ioe1) {
 			/* no exceptions in a StringReader or StringWriter, ignore. */
 		}
@@ -247,10 +286,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;
 	}
 
 }