X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=b0805494b8aae26818ee8db0e8180f6dc67946ed;hb=ad0bc2de2393c76b47d849f6ae74e44faafefbb0;hp=56ae9171f3eee52d7c173fedfb685aef987fecc9;hpb=9d32a0f70e14a764946ae29edcf07304f9e5f75e;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index 56ae917..b080549 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -35,6 +35,7 @@ import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
+import net.pterodactylus.sone.data.SoneImpl;
 import net.pterodactylus.sone.database.PostBuilder;
 import net.pterodactylus.sone.database.PostReplyBuilder;
 import net.pterodactylus.util.io.Closer;
@@ -44,6 +45,7 @@ import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.xml.SimpleXML;
 import net.pterodactylus.util.xml.XML;
 
+import com.google.common.annotations.VisibleForTesting;
 import org.w3c.dom.Document;
 
 import freenet.client.FetchResult;
@@ -104,18 +106,6 @@ public class SoneDownloader extends AbstractService {
 	}
 
 	/**
-	 * Removes the given Sone from the downloader.
-	 *
-	 * @param sone
-	 *            The Sone to stop watching
-	 */
-	public void removeSone(Sone sone) {
-		if (sones.remove(sone)) {
-			freenetInterface.unregisterUsk(sone);
-		}
-	}
-
-	/**
 	 * Fetches the updated Sone. This method is a callback method for
 	 * {@link FreenetInterface#registerUsk(Sone, SoneDownloader)}.
 	 *
@@ -188,7 +178,7 @@ public class SoneDownloader extends AbstractService {
 	 *            The requested URI
 	 * @return The parsed Sone, or {@code null} if the Sone could not be parsed
 	 */
-	public Sone parseSone(Sone originalSone, FetchResult fetchResult, FreenetURI requestUri) {
+	private Sone parseSone(Sone originalSone, FetchResult fetchResult, FreenetURI requestUri) {
 		logger.log(Level.FINEST, String.format("Parsing FetchResult (%d bytes, %s) for %s…", fetchResult.size(), fetchResult.getMimeType(), originalSone));
 		Bucket soneBucket = fetchResult.asBucket();
 		InputStream soneInputStream = null;
@@ -225,7 +215,8 @@ public class SoneDownloader extends AbstractService {
 	 * @throws SoneException
 	 *             if a parse error occurs, or the protocol is invalid
 	 */
-	public Sone parseSone(Sone originalSone, InputStream soneInputStream) throws SoneException {
+	@VisibleForTesting
+	protected Sone parseSone(Sone originalSone, InputStream soneInputStream) throws SoneException {
 		/* TODO - impose a size limit? */
 
 		Document document;
@@ -239,7 +230,7 @@ public class SoneDownloader extends AbstractService {
 			return null;
 		}
 
-		Sone sone = new Sone(originalSone.getId(), originalSone.isLocal()).setIdentity(originalSone.getIdentity());
+		Sone sone = new SoneImpl(originalSone.getId(), originalSone.isLocal()).setIdentity(originalSone.getIdentity());
 
 		SimpleXML soneXml;
 		try {
@@ -307,16 +298,8 @@ public class SoneDownloader extends AbstractService {
 			}
 		}
 
-		String soneInsertUri = soneXml.getValue("insert-uri", null);
-		if ((soneInsertUri != null) && (sone.getInsertUri() == null)) {
-			try {
-				sone.setInsertUri(new FreenetURI(soneInsertUri));
-				sone.setLatestEdition(Math.max(sone.getRequestUri().getEdition(), sone.getInsertUri().getEdition()));
-			} catch (MalformedURLException mue1) {
-				/* TODO - mark Sone as bad. */
-				logger.log(Level.WARNING, String.format("Downloaded Sone %s has invalid insert URI: %s", sone, soneInsertUri), mue1);
-				return null;
-			}
+		if (originalSone.getInsertUri() != null) {
+			sone.setInsertUri(originalSone.getInsertUri());
 		}
 
 		SimpleXML profileXml = soneXml.getNode("profile");
@@ -349,7 +332,7 @@ public class SoneDownloader extends AbstractService {
 					return null;
 				}
 				try {
-					profile.addField(fieldName).setValue(fieldValue);
+					profile.addField(fieldName.trim()).setValue(fieldValue);
 				} catch (IllegalArgumentException iae1) {
 					logger.log(Level.WARNING, String.format("Duplicate field: %s", fieldName), iae1);
 					return null;
@@ -456,7 +439,7 @@ public class SoneDownloader extends AbstractService {
 				String title = albumXml.getValue("title", null);
 				String description = albumXml.getValue("description", "");
 				String albumImageId = albumXml.getValue("album-image", null);
-				if ((id == null) || (title == null) || (description == null)) {
+				if ((id == null) || (title == null)) {
 					logger.log(Level.WARNING, String.format("Downloaded Sone %s contains invalid album!", sone));
 					return null;
 				}
@@ -540,4 +523,34 @@ public class SoneDownloader extends AbstractService {
 		}
 	}
 
+	public class FetchSoneWithUri implements Runnable {
+
+		private final Sone sone;
+
+		public FetchSoneWithUri(Sone sone) {
+			this.sone = sone;
+		}
+
+		@Override
+		public void run() {
+			fetchSone(sone, sone.getRequestUri());
+		}
+
+	}
+
+	public class FetchSone implements Runnable {
+
+		private final Sone sone;
+
+		public FetchSone(Sone sone) {
+			this.sone = sone;
+		}
+
+		@Override
+		public void run() {
+			fetchSone(sone);
+		}
+
+	}
+
 }