X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=56c1e4a28f0f5444dbd077951b585bd4be49d8fe;hb=2b470dc7f452897b2e71a14b04f7f8589a51206e;hp=177b4626e4fad03b8a9446f202973b7dfe249436;hpb=0521aa52048c343e9f2ea2920d5f9ac65d724272;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 177b462..56c1e4a 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -93,10 +93,10 @@ public class SoneDownloader extends AbstractService {
 	 *            The Sone to add
 	 */
 	public void addSone(Sone sone) {
-		if (sones.add(sone)) {
+		if (!sones.add(sone)) {
 			freenetInterface.unregisterUsk(sone);
-			freenetInterface.registerUsk(sone, this);
 		}
+		freenetInterface.registerUsk(sone, this);
 	}
 
 	/**
@@ -119,7 +119,7 @@ public class SoneDownloader extends AbstractService {
 	 *            The Sone to fetch
 	 */
 	public void fetchSone(Sone sone) {
-		fetchSone(sone, sone.getRequestUri());
+		fetchSone(sone, sone.getRequestUri().sskForUSK());
 	}
 
 	/**
@@ -133,9 +133,6 @@ public class SoneDownloader extends AbstractService {
 	 *            The URI to fetch the Sone from
 	 */
 	public void fetchSone(Sone sone, FreenetURI soneUri) {
-		if (core.getSoneStatus(sone) == SoneStatus.downloading) {
-			return;
-		}
 		logger.log(Level.FINE, "Starting fetch for Sone “%s” from %s…", new Object[] { sone, soneUri });
 		FreenetURI requestUri = soneUri.setMetaString(new String[] { "sone.xml" });
 		core.setSoneStatus(sone, SoneStatus.downloading);
@@ -148,6 +145,7 @@ public class SoneDownloader extends AbstractService {
 			logger.log(Level.FINEST, "Got %d bytes back.", fetchResults.getRight().size());
 			Sone parsedSone = parseSone(sone, fetchResults.getRight(), fetchResults.getLeft());
 			if (parsedSone != null) {
+				addSone(parsedSone);
 				core.updateSone(parsedSone);
 			}
 		} finally {