X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FParserFilter.java;h=5f156f167420694414b24cdd7f4c3a9083ce80d1;hb=efb1006429e52a74f41fb6e1d7736736156bb13a;hp=c5f7f6b28145d4432c3ef7aa5bb20aff52a3e6a4;hpb=233d1dac0b3fd8835abf4fcddde8f126762c5188;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 c5f7f6b..5f156f1 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
@@ -36,6 +36,7 @@ import net.pterodactylus.sone.text.SonePart;
 import net.pterodactylus.sone.text.SoneTextParser;
 import net.pterodactylus.sone.text.SoneTextParserContext;
 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;
@@ -59,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}
@@ -85,44 +86,47 @@ 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);
-		int length = Numbers.safeParseInteger(parameters.get("length"), Numbers.safeParseInteger(templateContext.get(parameters.get("length")), -1));
-		String soneKey = parameters.get("sone");
-		if (soneKey == null) {
-			soneKey = "sone";
-		}
-		Sone sone = (Sone) templateContext.get(soneKey);
-		if (sone == null) {
-			sone = core.getSone(soneKey, false);
+		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);
 		}
 		FreenetRequest request = (FreenetRequest) templateContext.get("request");
-		SoneTextParserContext context = new SoneTextParserContext(request, sone);
+		SoneTextParserContext context = new SoneTextParserContext(request, (Sone) sone);
 		StringWriter parsedTextWriter = new StringWriter();
 		try {
 			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 (length >= longText.length()) {
-							shortenedParts.add(part);
-						} else {
-							shortenedParts.add(new PlainTextPart(longText.substring(0, length) + "…"));
+						if (allPartsLength < cutOffLength) {
+							if ((allPartsLength + longText.length()) > cutOffLength) {
+								shortenedParts.add(new PlainTextPart(longText.substring(0, cutOffLength - allPartsLength) + "…"));
+							} else {
+								shortenedParts.add(part);
+							}
 						}
-						length -= longText.length();
+						allPartsLength += longText.length();
 					} else if (part instanceof LinkPart) {
-						shortenedParts.add(part);
-						length -= ((LinkPart) part).getText().length();
+						if (allPartsLength < cutOffLength) {
+							shortenedParts.add(part);
+						}
+						allPartsLength += ((LinkPart) part).getText().length();
 					} else {
-						shortenedParts.add(part);
-					}
-					if (length <= 0) {
-						break;
+						if (allPartsLength < cutOffLength) {
+							shortenedParts.add(part);
+						}
 					}
 				}
-				parts = shortenedParts;
+				if (allPartsLength >= length) {
+					parts = shortenedParts;
+				}
 			}
 			render(parsedTextWriter, parts);
 		} catch (IOException ioe1) {
@@ -237,7 +241,22 @@ public class ParserFilter implements Filter {
 	 *            The part to render
 	 */
 	private void render(Writer writer, PostPart postPart) {
-		renderLink(writer, "viewPost.html?post=" + postPart.getPost().getId(), getExcerpt(postPart.getPost().getText(), 20), SoneAccessor.getNiceName(postPart.getPost().getSone()), "in-sone");
+		SoneTextParser parser = new SoneTextParser(core, core);
+		SoneTextParserContext parserContext = new SoneTextParserContext(null, postPart.getPost().getSone());
+		try {
+			Iterable<Part> parts = parser.parse(parserContext, new StringReader(postPart.getPost().getText()));
+			StringBuilder excerpt = new StringBuilder();
+			for (Part part : parts) {
+				excerpt.append(part.getText());
+				if (excerpt.length() > 20) {
+					excerpt.setLength(20);
+					break;
+				}
+			}
+			renderLink(writer, "viewPost.html?post=" + postPart.getPost().getId(), excerpt.toString(), SoneAccessor.getNiceName(postPart.getPost().getSone()), "in-sone");
+		} catch (IOException ioe1) {
+			/* StringReader shouldn’t throw. */
+		}
 	}
 
 	/**