X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloaderImpl.java;h=91bf13b8e2a502f34a2fc4600cf949309814a83d;hp=8470e49dffe0dea36aefbd977de7e0758a5005a6;hb=e82bcd0c57096e722421a263fd2e95f88974b65b;hpb=c8b9bb56bd7a73e39565fd577e14f8d5e1215c5d

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java
index 8470e49..91bf13b 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java
@@ -31,7 +31,6 @@ import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
-import net.pterodactylus.sone.core.FreenetInterface.Fetched;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
 import net.pterodactylus.util.service.AbstractService;
@@ -44,12 +43,8 @@ import freenet.keys.USK;
 import freenet.node.RequestStarter;
 import freenet.support.api.Bucket;
 
-import com.google.common.annotations.VisibleForTesting;
-
 /**
  * The Sone downloader is responsible for download Sones as they are updated.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class SoneDownloaderImpl extends AbstractService implements SoneDownloader {
 
@@ -60,7 +55,7 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 	private static final int MAX_PROTOCOL_VERSION = 0;
 
 	/** The core. */
-	private final Core core;
+	private final UpdatedSoneProcessor updatedSoneProcessor;
 	private final SoneParser soneParser;
 
 	/** The Freenet interface. */
@@ -69,32 +64,10 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 	/** The sones to update. */
 	private final Set<Sone> sones = new HashSet<Sone>();
 
-	/**
-	 * Creates a new Sone downloader.
-	 *
-	 * @param core
-	 * 		The core
-	 * @param freenetInterface
-	 * 		The Freenet interface
-	 */
 	@Inject
-	public SoneDownloaderImpl(Core core, FreenetInterface freenetInterface) {
-		this(core, freenetInterface, new SoneParser(core));
-	}
-
-	/**
-	 * Creates a new Sone downloader.
-	 *
-	 * @param core
-	 * 		The core
-	 * @param freenetInterface
-	 * 		The Freenet interface
-	 * @param soneParser
-	 */
-	@VisibleForTesting
-	SoneDownloaderImpl(Core core, FreenetInterface freenetInterface, SoneParser soneParser) {
+	SoneDownloaderImpl(UpdatedSoneProcessor updatedSoneProcessor, FreenetInterface freenetInterface, SoneParser soneParser) {
 		super("Sone Downloader", false);
-		this.core = core;
+		this.updatedSoneProcessor = updatedSoneProcessor;
 		this.freenetInterface = freenetInterface;
 		this.soneParser = soneParser;
 	}
@@ -127,7 +100,7 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 						sone, key, newKnownGood, newSlotToo));
 				if (edition > sone.getLatestEdition()) {
 					sone.setLatestEdition(edition);
-					new Thread(fetchSoneAction(sone),
+					new Thread(fetchSoneAsSskAction(sone),
 							"Sone Downloader").start();
 				}
 			}
@@ -155,7 +128,7 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 		return (currentTimeMillis() - sone.getTime()) < DAYS.toMillis(7);
 	}
 
-	private void fetchSone(Sone sone) {
+	private void fetchSoneAsSsk(Sone sone) {
 		fetchSone(sone, sone.getRequestUri().sskForUSK(), false);
 	}
 
@@ -188,7 +161,7 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 			if (parsedSone != null) {
 				if (!fetchOnly) {
 					parsedSone.setStatus((parsedSone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
-					core.updateSone(parsedSone);
+					updatedSoneProcessor.updateSone(parsedSone);
 					addSone(parsedSone);
 				}
 			}
@@ -231,7 +204,7 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 	}
 
 	@Override
-	public Runnable fetchSoneWithUriAction(final Sone sone) {
+	public Runnable fetchSoneAsUskAction(final Sone sone) {
 		return new Runnable() {
 			@Override
 			public void run() {
@@ -241,11 +214,11 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 	}
 
 	@Override
-	public Runnable fetchSoneAction(final Sone sone) {
+	public Runnable fetchSoneAsSskAction(final Sone sone) {
 		return new Runnable() {
 			@Override
 			public void run() {
-				fetchSone(sone);
+				fetchSoneAsSsk(sone);
 			}
 		};
 	}