🚧 Don’t cancel on archive manifests

[Sone.git] / src / main / java / net / pterodactylus / sone / core / FreenetInterface.java

diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
index a01a2bb..0f05fc7 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
+++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
@@ -24,6 +24,7 @@ import static java.util.logging.Logger.getLogger;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -42,6 +43,8 @@ import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.TemporaryImage;
 
 import com.google.common.base.Function;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
 import com.google.common.eventbus.EventBus;
 import com.google.inject.Singleton;
 
@@ -63,6 +66,7 @@ import freenet.client.async.ClientPutCallback;
 import freenet.client.async.ClientPutter;
 import freenet.client.async.SnoopMetadata;
 import freenet.client.async.USKCallback;
+import freenet.client.async.USKManager;
 import freenet.keys.FreenetURI;
 import freenet.keys.InsertableClientSSK;
 import freenet.keys.USK;
@@ -90,13 +94,17 @@ public class FreenetInterface {
 
        /** The node to interact with. */
        private final Node node;
+       private final USKManager uskManager;
+       private final ClientContext clientContext;
+
+       private final SoneUriCreator soneUriCreator;
 
        /** The high-level client to use for requests. */
        private final HighLevelSimpleClient client;
        private final RequestClient requestClient = new RequestClientBuilder().realTime().build();
 
        /** The USK callbacks. */
-       private final Map<String, USKCallback> soneUskCallbacks = new HashMap<>();
+       private final Multimap<String, USKCallback> soneUskCallbacks = ArrayListMultimap.create();
 
        /** The not-Sone-related USK callbacks. */
        private final Map<FreenetURI, USKCallback> uriUskCallbacks = Collections.synchronizedMap(new HashMap<FreenetURI, USKCallback>());
@@ -104,19 +112,14 @@ public class FreenetInterface {
        private final RequestClient imageInserts = new RequestClientBuilder().realTime().build();
        private final RequestClient imageLoader = new RequestClientBuilder().realTime().build();
 
-       /**
-        * Creates a new Freenet interface.
-        *
-        * @param eventBus
-        *            The event bus
-        * @param node
-        *            The node to interact with
-        */
        @Inject
-       public FreenetInterface(EventBus eventBus, Node node) {
+       public FreenetInterface(EventBus eventBus, Node node, USKManager uskManager, ClientContext clientContext, SoneUriCreator soneUriCreator, HighLevelSimpleClientCreator highLevelSimpleClientCreator) {
                this.eventBus = eventBus;
                this.node = node;
-               this.client = node.clientCore.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS, false, true);
+               this.uskManager = uskManager;
+               this.clientContext = clientContext;
+               this.soneUriCreator = soneUriCreator;
+               this.client = highLevelSimpleClientCreator.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS, false, true);
        }
 
        //
@@ -176,6 +179,9 @@ public class FreenetInterface {
                SnoopMetadata snoop = new SnoopMetadata() {
                        @Override
                        public boolean snoopMetadata(Metadata meta, ClientContext context) {
+                               if (meta.isArchiveManifest()) {
+                                       return false;
+                               }
                                String mimeType = meta.getMIMEType();
                                boolean cancel = (mimeType == null) || backgroundFetchCallback.shouldCancel(uri, mimeType, meta.dataLength());
                                if (cancel) {
@@ -185,10 +191,11 @@ public class FreenetInterface {
                        }
                };
                FetchContext fetchContext = client.getFetchContext();
+               fetchContext.dontEnterImplicitArchives = false;
                try {
                        ClientGetter clientGetter = client.fetch(uri, 2097152, callback, fetchContext, RequestStarter.INTERACTIVE_PRIORITY_CLASS);
                        clientGetter.setMetaSnoop(snoop);
-                       clientGetter.restart(uri, fetchContext.filterData, node.clientCore.clientContext);
+                       clientGetter.restart(uri, fetchContext.filterData, clientContext);
                } catch (FetchException fe) {
                        /* stupid exception that can not actually be thrown! */
                }
@@ -256,7 +263,7 @@ public class FreenetInterface {
                        USKCallback uskCallback) {
                try {
                        soneUskCallbacks.put(FreenetURIsKt.getRoutingKeyString(requestUri), uskCallback);
-                       node.clientCore.uskManager.subscribe(create(requestUri),
+                       uskManager.subscribe(create(requestUri),
                                        uskCallback, true, requestClient);
                } catch (MalformedURLException mue1) {
                        logger.log(WARNING, format("Could not subscribe USK “%s”!",
@@ -268,9 +275,7 @@ public class FreenetInterface {
                        USKCallback uskCallback) {
                try {
                        soneUskCallbacks.put(FreenetURIsKt.getRoutingKeyString(requestUri), uskCallback);
-                       node.clientCore
-                                       .uskManager
-                                       .subscribe(create(requestUri), uskCallback, false, requestClient);
+                       uskManager.subscribe(create(requestUri), uskCallback, false, requestClient);
                } catch (MalformedURLException mue1) {
                        logger.log(WARNING,
                                        format("Could not subscribe USK “%s”!", requestUri),
@@ -285,16 +290,19 @@ public class FreenetInterface {
         *            The Sone to unregister
         */
        public void unregisterUsk(Sone sone) {
-               USKCallback uskCallback = soneUskCallbacks.remove(sone.getId());
-               if (uskCallback == null) {
+               Collection<USKCallback> uskCallbacks = soneUskCallbacks.removeAll(sone.getId());
+               if (uskCallbacks.isEmpty()) {
                        return;
                }
-               try {
-                       logger.log(Level.FINEST, String.format("Unsubscribing from USK for %s…", sone));
-                       node.clientCore.uskManager.unsubscribe(USK.create(sone.getRequestUri()), uskCallback);
-               } catch (MalformedURLException mue1) {
-                       logger.log(Level.FINE, String.format("Could not unsubscribe USK “%s”!", sone.getRequestUri()), mue1);
-               }
+               logger.log(Level.FINE, String.format("Unsubscribing %d from USK for %s…", uskCallbacks.size(), sone));
+               logger.log(Level.FINEST, String.format("USKs left: %d", soneUskCallbacks.size()));
+               uskCallbacks.forEach(uskCallback -> {
+                       try {
+                               uskManager.unsubscribe(USK.create(soneUriCreator.getRequestUri(sone)), uskCallback);
+                       } catch (MalformedURLException mue1) {
+                               logger.log(Level.FINE, String.format("Could not unsubscribe USK “%s”!", soneUriCreator.getRequestUri(sone)), mue1);
+                       }
+               });
        }
 
        /**
@@ -326,7 +334,7 @@ public class FreenetInterface {
 
                };
                try {
-                       node.clientCore.uskManager.subscribe(USK.create(uri), uskCallback, true, requestClient);
+                       uskManager.subscribe(USK.create(uri), uskCallback, true, requestClient);
                        uriUskCallbacks.put(USK.create(uri).clearCopy().getURI(), uskCallback);
                } catch (MalformedURLException mue1) {
                        logger.log(Level.WARNING, String.format("Could not subscribe to USK: %s", uri), mue1);
@@ -346,7 +354,7 @@ public class FreenetInterface {
                                logger.log(Level.INFO, String.format("Could not unregister unknown USK: %s", uri));
                                return;
                        }
-                       node.clientCore.uskManager.unsubscribe(USK.create(uri), uskCallback);
+                       uskManager.unsubscribe(USK.create(uri), uskCallback);
                } catch (MalformedURLException mue1) {
                        logger.log(Level.INFO, String.format("Could not unregister invalid USK: %s", uri), mue1);
                }
@@ -434,7 +442,7 @@ public class FreenetInterface {
                 */
                @SuppressWarnings("synthetic-access")
                public void cancel() {
-                       clientPutter.cancel(node.clientCore.clientContext);
+                       clientPutter.cancel(clientContext);
                        eventBus.post(new ImageInsertAbortedEvent(image));
                        bucket.free();
                }