X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FFreenetLinkParser.java;h=1ef77d2286fdc58d544c176716c46479b2672123;hb=1fe6e888c7276319080f8cfda12ae577ad19c2e8;hp=24eac3b3f18fe89c62acb178965d8dc3dd3688de;hpb=70546a3f04e9019495f8d62691f760b0d58fb046;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java b/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java
index 24eac3b..1ef77d2 100644
--- a/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java
+++ b/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java
@@ -21,21 +21,22 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
+import java.net.MalformedURLException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.template.TemplateFactory;
+import freenet.keys.FreenetURI;
 
 /**
  * {@link Parser} implementation that can recognize Freenet URIs.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class FreenetLinkParser implements Parser {
+public class FreenetLinkParser implements Parser<FreenetLinkParserContext> {
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(FreenetLinkParser.class);
@@ -73,9 +74,6 @@ public class FreenetLinkParser implements Parser {
 	/** The template factory. */
 	private final TemplateFactory templateFactory;
 
-	/** The Sone that posted the currently parsed text. */
-	private Sone postingSone;
-
 	/**
 	 * Creates a new freenet link parser.
 	 *
@@ -87,22 +85,6 @@ public class FreenetLinkParser implements Parser {
 	}
 
 	//
-	// ACCESSORS
-	//
-
-	/**
-	 * Sets the Sone that posted the text that will be parsed in the next call
-	 * to {@link #parse(Reader)}. You need to synchronize calling this method
-	 * and {@link #parse(Reader)}!
-	 *
-	 * @param sone
-	 *            The Sone that posted the text
-	 */
-	public void setPostingSone(Sone sone) {
-		postingSone = sone;
-	}
-
-	//
 	// PART METHODS
 	//
 
@@ -110,7 +92,7 @@ public class FreenetLinkParser implements Parser {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Part parse(Reader source) throws IOException {
+	public Part parse(FreenetLinkParserContext context, Reader source) throws IOException {
 		PartContainer parts = new PartContainer();
 		BufferedReader bufferedReader = (source instanceof BufferedReader) ? (BufferedReader) source : new BufferedReader(source);
 		String line;
@@ -165,29 +147,36 @@ public class FreenetLinkParser implements Parser {
 					String name = link;
 					logger.log(Level.FINER, "Found link: %s", link);
 					logger.log(Level.FINEST, "Next: %d, CHK: %d, SSK: %d, USK: %d", new Object[] { next, nextChk, nextSsk, nextUsk });
-					if (linkType == LinkType.KSK) {
-						name = link.substring(4);
-					} else if ((linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) {
-						if (name.indexOf('/') > -1) {
-							if (!name.endsWith("/")) {
-								name = name.substring(name.lastIndexOf('/') + 1);
-							} else {
-								if (name.indexOf('/') != name.lastIndexOf('/')) {
-									name = name.substring(name.lastIndexOf('/', name.lastIndexOf('/') - 1));
-								} else {
-									/* shorten to 5 chars. */
-									name = name.substring(4, 9);
-								}
-							}
-						}
+
+					if ((linkType == LinkType.KSK) || (linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) {
+						FreenetURI uri;
 						if (name.indexOf('?') > -1) {
 							name = name.substring(0, name.indexOf('?'));
 						}
-						boolean fromPostingSone = false;
-						if ((linkType == LinkType.SSK) || (linkType == LinkType.USK)) {
-							fromPostingSone = link.substring(4, 47).equals(postingSone.getId());
+						if (name.endsWith("/")) {
+							name = name.substring(0, name.length() - 1);
+						}
+						try {
+							uri = new FreenetURI(name);
+							name = uri.lastMetaString();
+							if (name == null) {
+								name = uri.getDocName();
+							}
+							if (name == null) {
+								name = link.substring(0, Math.min(9, link.length()));
+							}
+							boolean fromPostingSone = ((linkType == LinkType.SSK) || (linkType == LinkType.USK)) && link.substring(4, Math.min(link.length(), 47)).equals(context.getPostingSone().getId());
+							parts.add(fromPostingSone ? createTrustedFreenetLinkPart(link, name) : createFreenetLinkPart(link, name));
+						} catch (MalformedURLException mue1) {
+							/* not a valid link, insert as plain text. */
+							parts.add(createPlainTextPart(link));
+						} catch (NullPointerException npe1) {
+							/* FreenetURI sometimes throws these, too. */
+							parts.add(createPlainTextPart(link));
+						} catch (ArrayIndexOutOfBoundsException aioobe1) {
+							/* oh, and these, too. */
+							parts.add(createPlainTextPart(link));
 						}
-						parts.add(fromPostingSone ? createTrustedFreenetLinkPart(link, name) : createFreenetLinkPart(link, name));
 					} else if ((linkType == LinkType.HTTP) || (linkType == LinkType.HTTPS)) {
 						name = link.substring(linkType == LinkType.HTTP ? 7 : 8);
 						int firstSlash = name.indexOf('/');