Include Sone ID in downloader thread name.
[Sone.git] / src / main / java / net / pterodactylus / sone / core / FreenetInterface.java
index 6d857c6..8766485 100644 (file)
@@ -17,6 +17,9 @@
 
 package net.pterodactylus.sone.core;
 
+import static java.lang.String.format;
+import static net.pterodactylus.sone.data.Sone.TO_FREENET_URI;
+
 import java.net.MalformedURLException;
 import java.util.Collections;
 import java.util.HashMap;
@@ -34,6 +37,10 @@ import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.TemporaryImage;
 import net.pterodactylus.util.logging.Logging;
 
+import com.db4o.ObjectContainer;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.eventbus.EventBus;
+import com.google.inject.Inject;
 import freenet.client.ClientMetadata;
 import freenet.client.FetchException;
 import freenet.client.FetchResult;
@@ -56,11 +63,6 @@ import freenet.node.RequestClient;
 import freenet.node.RequestStarter;
 import freenet.support.api.Bucket;
 import freenet.support.io.ArrayBucket;
-import com.db4o.ObjectContainer;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.eventbus.EventBus;
-import com.google.inject.Inject;
 
 /**
  * Contains all necessary functionality for interacting with the Freenet node.
@@ -216,40 +218,13 @@ public class FreenetInterface {
         */
        public void registerUsk(final Sone sone, final SoneDownloader soneDownloader) {
                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;
-                               }
-
-                               @Override
-                               public short getPollingPriorityNormal() {
-                                       return RequestStarter.INTERACTIVE_PRIORITY_CLASS;
-                               }
-                       };
+                       logger.log(Level.FINE, String.format("Registering Sone “%s” for USK updates at %s…", sone, TO_FREENET_URI.apply(sone).setMetaString(new String[]{"sone.xml"})));
+                       USKCallback uskCallback = new NewEditionFound(sone, soneDownloader);
                        soneUskCallbacks.put(sone.getId(), uskCallback);
                        boolean runBackgroundFetch = (System.currentTimeMillis() - sone.getTime()) < TimeUnit.DAYS.toMillis(7);
-                       uskManager.subscribe(USK.create(sone.getRequestUri()), uskCallback, runBackgroundFetch, requestClient);
+                       uskManager.subscribe(USK.create(TO_FREENET_URI.apply(sone)), uskCallback, runBackgroundFetch, requestClient);
                } catch (MalformedURLException mue1) {
-                       logger.log(Level.WARNING, String.format("Could not subscribe USK “%s”!", sone.getRequestUri()), mue1);
+                       logger.log(Level.WARNING, String.format("Could not subscribe USK “%s”!", TO_FREENET_URI.apply(sone)), mue1);
                }
        }
 
@@ -266,9 +241,9 @@ public class FreenetInterface {
                }
                try {
                        logger.log(Level.FINEST, String.format("Unsubscribing from USK for %s…", sone));
-                       uskManager.unsubscribe(USK.create(sone.getRequestUri()), uskCallback);
+                       uskManager.unsubscribe(USK.create(TO_FREENET_URI.apply(sone)), uskCallback);
                } catch (MalformedURLException mue1) {
-                       logger.log(Level.FINE, String.format("Could not unsubscribe USK “%s”!", sone.getRequestUri()), mue1);
+                       logger.log(Level.FINE, String.format("Could not unsubscribe USK “%s”!", TO_FREENET_URI.apply(sone)), mue1);
                }
        }
 
@@ -282,24 +257,7 @@ public class FreenetInterface {
         *            The callback to call
         */
        public void registerUsk(FreenetURI uri, final Callback callback) {
-               USKCallback uskCallback = new USKCallback() {
-
-                       @Override
-                       public void onFoundEdition(long edition, USK key, ObjectContainer objectContainer, ClientContext clientContext, boolean metadata, short codec, byte[] data, boolean newKnownGood, boolean newSlotToo) {
-                               callback.editionFound(key.getURI(), edition, newKnownGood, newSlotToo);
-                       }
-
-                       @Override
-                       public short getPollingPriorityNormal() {
-                               return RequestStarter.PREFETCH_PRIORITY_CLASS;
-                       }
-
-                       @Override
-                       public short getPollingPriorityProgress() {
-                               return RequestStarter.INTERACTIVE_PRIORITY_CLASS;
-                       }
-
-               };
+               USKCallback uskCallback = new CallbackWrapper(callback);
                try {
                        uskManager.subscribe(USK.create(uri), uskCallback, true, requestClient);
                        uriUskCallbacks.put(uri, uskCallback);
@@ -401,6 +359,68 @@ public class FreenetInterface {
 
        }
 
+       private static class NewEditionFound implements USKCallback {
+
+               private final Sone sone;
+               private final SoneDownloader soneDownloader;
+
+               public NewEditionFound(Sone sone, SoneDownloader soneDownloader) {
+                       this.sone = sone;
+                       this.soneDownloader = soneDownloader;
+               }
+
+               @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.modify().setLatestEdition(edition).update();
+                               new Thread(new Runnable() {
+
+                                       @Override
+                                       public void run() {
+                                               soneDownloader.fetchSone(sone);
+                                       }
+                               }, format("Sone Downloader for %s", sone.getId())).start();
+                       }
+               }
+
+               @Override
+               public short getPollingPriorityProgress() {
+                       return RequestStarter.INTERACTIVE_PRIORITY_CLASS;
+               }
+
+               @Override
+               public short getPollingPriorityNormal() {
+                       return RequestStarter.INTERACTIVE_PRIORITY_CLASS;
+               }
+       }
+
+       private static class CallbackWrapper implements USKCallback {
+
+               private final Callback callback;
+
+               public CallbackWrapper(Callback callback) {
+                       this.callback = callback;
+               }
+
+               @Override
+               public void onFoundEdition(long edition, USK key, ObjectContainer objectContainer, ClientContext clientContext, boolean metadata, short codec, byte[] data, boolean newKnownGood, boolean newSlotToo) {
+                       callback.editionFound(key.getURI(), edition, newKnownGood, newSlotToo);
+               }
+
+               @Override
+               public short getPollingPriorityNormal() {
+                       return RequestStarter.PREFETCH_PRIORITY_CLASS;
+               }
+
+               @Override
+               public short getPollingPriorityProgress() {
+                       return RequestStarter.INTERACTIVE_PRIORITY_CLASS;
+               }
+
+       }
+
        /**
         * Insert token that can cancel a running insert and sends events.
         *
@@ -465,17 +485,11 @@ public class FreenetInterface {
                // INTERFACE ClientPutCallback
                //
 
-               /**
-                * {@inheritDoc}
-                */
                @Override
                public void onMajorProgress(ObjectContainer objectContainer) {
                        /* ignore, we don’t care. */
                }
 
-               /**
-                * {@inheritDoc}
-                */
                @Override
                @SuppressWarnings("synthetic-access")
                public void onFailure(InsertException insertException, BaseClientPutter clientPutter, ObjectContainer objectContainer) {
@@ -486,33 +500,21 @@ public class FreenetInterface {
                        }
                }
 
-               /**
-                * {@inheritDoc}
-                */
                @Override
                public void onFetchable(BaseClientPutter clientPutter, ObjectContainer objectContainer) {
                        /* ignore, we don’t care. */
                }
 
-               /**
-                * {@inheritDoc}
-                */
                @Override
                public void onGeneratedMetadata(Bucket metadata, BaseClientPutter clientPutter, ObjectContainer objectContainer) {
                        /* ignore, we don’t care. */
                }
 
-               /**
-                * {@inheritDoc}
-                */
                @Override
                public void onGeneratedURI(FreenetURI generatedUri, BaseClientPutter clientPutter, ObjectContainer objectContainer) {
                        resultingUri = generatedUri;
                }
 
-               /**
-                * {@inheritDoc}
-                */
                @Override
                @SuppressWarnings("synthetic-access")
                public void onSuccess(BaseClientPutter clientPutter, ObjectContainer objectContainer) {