X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParser.java;h=b85f100bc8ebd67cb138707197ac075e03ba33af;hp=baa3dc963aafbb6f3dbd565ef68614b9c6e87007;hb=3a7092e48f27cba6286946442783f539ad73a911;hpb=61fea0173ef87542cae35247e6356ef36f2664d3

diff --git a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
index baa3dc9..b85f100 100644
--- a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
+++ b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
@@ -1,5 +1,5 @@
 /*
- * Sone - FreenetLinkParser.java - Copyright © 2010–2012 David Roden
+ * Sone - SoneTextParser.java - Copyright © 2010–2013 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
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.text;
 
+import static java.util.logging.Logger.getLogger;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
@@ -26,12 +28,15 @@ import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import net.pterodactylus.sone.core.PostProvider;
-import net.pterodactylus.sone.core.SoneProvider;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.impl.IdOnlySone;
+import net.pterodactylus.sone.database.PostProvider;
+import net.pterodactylus.sone.database.SoneProvider;
 import net.pterodactylus.util.io.Closer;
-import net.pterodactylus.util.logging.Logging;
+
+import com.google.common.base.Optional;
+
 import freenet.keys.FreenetURI;
 
 /**
@@ -42,7 +47,7 @@ import freenet.keys.FreenetURI;
 public class SoneTextParser implements Parser<SoneTextParserContext> {
 
 	/** The logger. */
-	private static final Logger logger = Logging.getLogger(SoneTextParser.class);
+	private static final Logger logger = getLogger(SoneTextParser.class.getName());
 
 	/** Pattern to detect whitespace. */
 	private static final Pattern whitespacePattern = Pattern.compile("[\\u000a\u0020\u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u200c\u200d\u202f\u205f\u2060\u2800\u3000]");
@@ -55,28 +60,50 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 	private enum LinkType {
 
 		/** Link is a KSK. */
-		KSK,
+		KSK("KSK@"),
 
 		/** Link is a CHK. */
-		CHK,
+		CHK("CHK@"),
 
 		/** Link is an SSK. */
-		SSK,
+		SSK("SSK@"),
 
 		/** Link is a USK. */
-		USK,
+		USK("USK@"),
 
 		/** Link is HTTP. */
-		HTTP,
+		HTTP("http://"),
 
 		/** Link is HTTPS. */
-		HTTPS,
+		HTTPS("https://"),
 
 		/** Link is a Sone. */
-		SONE,
+		SONE("sone://"),
 
 		/** Link is a post. */
-		POST,
+		POST("post://");
+
+		/** The scheme identifying this link type. */
+		private final String scheme;
+
+		/**
+		 * Creates a new link type identified by the given scheme.
+		 *
+		 * @param scheme
+		 *            The scheme of the link type
+		 */
+		private LinkType(String scheme) {
+			this.scheme = scheme;
+		}
+
+		/**
+		 * Returns the scheme of this link type.
+		 *
+		 * @return The scheme of this link type
+		 */
+		public String getScheme() {
+			return scheme;
+		}
 
 	}
 
@@ -200,18 +227,32 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 					}
 					lineComplete = false;
 
+					Matcher matcher = whitespacePattern.matcher(line);
+					int nextSpace = matcher.find(0) ? matcher.start() : line.length();
+					String link = line.substring(0, nextSpace);
+					String name = link;
+					logger.log(Level.FINER, String.format("Found link: %s", link));
+					logger.log(Level.FINEST, String.format("CHK: %d, SSK: %d, USK: %d", nextChk, nextSsk, nextUsk));
+
+					/* if there is no text after the scheme, it’s not a link! */
+					if (link.equals(linkType.getScheme())) {
+						parts.add(new PlainTextPart(linkType.getScheme()));
+						line = line.substring(linkType.getScheme().length());
+						continue;
+					}
+
 					if (linkType == LinkType.SONE) {
 						if (line.length() >= (7 + 43)) {
 							String soneId = line.substring(7, 50);
-							Sone sone = soneProvider.getSone(soneId, false);
-							if (sone == null) {
+							Optional<Sone> sone = soneProvider.getSone(soneId);
+							if (!sone.isPresent()) {
 								/*
 								 * don’t use create=true above, we don’t want
 								 * the empty shell.
 								 */
-								sone = new Sone(soneId);
+								sone = Optional.<Sone>of(new IdOnlySone(soneId));
 							}
-							parts.add(new SonePart(sone));
+							parts.add(new SonePart(sone.get()));
 							line = line.substring(50);
 						} else {
 							parts.add(new PlainTextPart(line));
@@ -222,9 +263,9 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 					if (linkType == LinkType.POST) {
 						if (line.length() >= (7 + 36)) {
 							String postId = line.substring(7, 43);
-							Post post = postProvider.getPost(postId, false);
-							if ((post != null) && (post.getSone() != null)) {
-								parts.add(new PostPart(post));
+							Optional<Post> post = postProvider.getPost(postId);
+							if (post.isPresent()) {
+								parts.add(new PostPart(post.get()));
 							} else {
 								parts.add(new PlainTextPart(line.substring(0, 43)));
 							}
@@ -235,12 +276,6 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 						}
 						continue;
 					}
-					Matcher matcher = whitespacePattern.matcher(line);
-					int nextSpace = matcher.find(0) ? matcher.start() : line.length();
-					String link = line.substring(0, nextSpace);
-					String name = link;
-					logger.log(Level.FINER, String.format("Found link: %s", link));
-					logger.log(Level.FINEST, String.format("CHK: %d, SSK: %d, USK: %d", nextChk, nextSsk, nextUsk));
 
 					if ((linkType == LinkType.KSK) || (linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) {
 						FreenetURI uri;