X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterface.java;h=dc0e3ea0552658b4abb60ce6f28934858b5669be;hb=2524f4d47c56874a263f9e53ec5c4035f2baa7e0;hp=d4640f87ddcecf71c4303677aa084169628c1f73;hpb=5bcdc1b924c598b1e59551d44e2302ef29258dad;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
index d4640f8..dc0e3ea 100644
--- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
+++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
@@ -17,11 +17,16 @@
 
 package net.pterodactylus.sone.core;
 
+import static freenet.keys.USK.create;
+import static java.lang.String.format;
+import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
+import static net.pterodactylus.sone.freenet.Key.routingKey;
+
 import java.net.MalformedURLException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -32,7 +37,6 @@ import net.pterodactylus.sone.core.event.ImageInsertStartedEvent;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.TemporaryImage;
-import net.pterodactylus.util.logging.Logging;
 
 import com.db4o.ObjectContainer;
 
@@ -71,7 +75,7 @@ import freenet.support.io.ArrayBucket;
 public class FreenetInterface {
 
 	/** The logger. */
-	private static final Logger logger = Logging.getLogger(FreenetInterface.class);
+	private static final Logger logger = getLogger("Sone.FreenetInterface");
 
 	/** The event bus. */
 	private final EventBus eventBus;
@@ -182,51 +186,30 @@ public class FreenetInterface {
 		}
 	}
 
-	/**
-	 * Registers the USK for the given Sone and notifies the given
-	 * {@link SoneDownloader} if an update was found.
-	 *
-	 * @param sone
-	 *            The Sone to watch
-	 * @param soneDownloader
-	 *            The Sone download to notify on updates
-	 */
-	public void registerUsk(final Sone sone, final SoneDownloader soneDownloader) {
+	public void registerActiveUsk(FreenetURI requestUri,
+			USKCallback uskCallback) {
 		try {
-			logger.log(Level.FINE, String.format("Registering Sone “%s” for USK updates at %s…", sone, sone.getRequestUri().setMetaString(new String[] { "sone.xml" })));
-			USKCallback uskCallback = new USKCallback() {
-
-				@Override
-				@SuppressWarnings("synthetic-access")
-				public void onFoundEdition(long edition, USK key, ObjectContainer objectContainer, ClientContext clientContext, boolean metadata, short codec, byte[] data, boolean newKnownGood, boolean newSlotToo) {
-					logger.log(Level.FINE, String.format("Found USK update for Sone “%s” at %s, new known good: %s, new slot too: %s.", sone, key, newKnownGood, newSlotToo));
-					if (edition > sone.getLatestEdition()) {
-						sone.setLatestEdition(edition);
-						new Thread(new Runnable() {
-
-							@Override
-							public void run() {
-								soneDownloader.fetchSone(sone);
-							}
-						}, "Sone Downloader").start();
-					}
-				}
-
-				@Override
-				public short getPollingPriorityProgress() {
-					return RequestStarter.INTERACTIVE_PRIORITY_CLASS;
-				}
+			soneUskCallbacks.put(routingKey(requestUri), uskCallback);
+			node.clientCore.uskManager.subscribe(create(requestUri),
+					uskCallback, true, (RequestClient) client);
+		} catch (MalformedURLException mue1) {
+			logger.log(WARNING, format("Could not subscribe USK “%s”!",
+					requestUri), mue1);
+		}
+	}
 
-				@Override
-				public short getPollingPriorityNormal() {
-					return RequestStarter.INTERACTIVE_PRIORITY_CLASS;
-				}
-			};
-			soneUskCallbacks.put(sone.getId(), uskCallback);
-			boolean runBackgroundFetch = (System.currentTimeMillis() - sone.getTime()) < TimeUnit.DAYS.toMillis(7);
-			node.clientCore.uskManager.subscribe(USK.create(sone.getRequestUri()), uskCallback, runBackgroundFetch, (RequestClient) client);
+	public void registerPassiveUsk(FreenetURI requestUri,
+			USKCallback uskCallback) {
+		try {
+			soneUskCallbacks.put(routingKey(requestUri), uskCallback);
+			node.clientCore
+					.uskManager
+					.subscribe(create(requestUri), uskCallback, false,
+							(RequestClient) client);
 		} catch (MalformedURLException mue1) {
-			logger.log(Level.WARNING, String.format("Could not subscribe USK “%s”!", sone.getRequestUri()), mue1);
+			logger.log(WARNING,
+					format("Could not subscribe USK “%s”!", requestUri),
+					mue1);
 		}
 	}