X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterface.java;h=7d1b007ea6ac4060dae2f0300f110832c5b85fb7;hp=48df732284e52c897375e34181014d6be3bb5268;hb=4b42574c9ec4490100ac3e87b9c2f3aac965a202;hpb=6e91e9356231217afcecb12275882c0ebf0f34a8

diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
index 48df732..7d1b007 100644
--- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
+++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
@@ -32,6 +32,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.annotation.Nonnull;
+import javax.inject.Inject;
 
 import net.pterodactylus.sone.core.event.ImageInsertAbortedEvent;
 import net.pterodactylus.sone.core.event.ImageInsertFailedEvent;
@@ -43,7 +44,6 @@ import net.pterodactylus.sone.data.TemporaryImage;
 
 import com.google.common.base.Function;
 import com.google.common.eventbus.EventBus;
-import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 import freenet.client.ClientMetadata;
@@ -178,12 +178,16 @@ public class FreenetInterface {
 			@Override
 			public boolean snoopMetadata(Metadata meta, ClientContext context) {
 				String mimeType = meta.getMIMEType();
-				return (mimeType == null) || backgroundFetchCallback.cancelForMimeType(uri, mimeType);
+				boolean cancel = (mimeType == null) || backgroundFetchCallback.shouldCancel(uri, mimeType, meta.dataLength());
+				if (cancel) {
+					backgroundFetchCallback.failed(uri);
+				}
+				return cancel;
 			}
 		};
 		FetchContext fetchContext = client.getFetchContext();
 		try {
-			ClientGetter clientGetter = client.fetch(uri, 1048576, callback, fetchContext, RequestStarter.INTERACTIVE_PRIORITY_CLASS);
+			ClientGetter clientGetter = client.fetch(uri, 2097152, callback, fetchContext, RequestStarter.INTERACTIVE_PRIORITY_CLASS);
 			clientGetter.setMetaSnoop(snoop);
 			clientGetter.restart(uri, fetchContext.filterData, node.clientCore.clientContext);
 		} catch (FetchException fe) {
@@ -192,7 +196,7 @@ public class FreenetInterface {
 	}
 
 	public interface BackgroundFetchCallback {
-		boolean cancelForMimeType(@Nonnull FreenetURI uri, @Nonnull String mimeType);
+		boolean shouldCancel(@Nonnull FreenetURI uri, @Nonnull String mimeType, long size);
 		void loaded(@Nonnull FreenetURI uri, @Nonnull String mimeType, @Nonnull byte[] data);
 		void failed(@Nonnull FreenetURI uri);
 	}
@@ -554,11 +558,18 @@ public class FreenetInterface {
 
 	}
 
-	public class InsertTokenSupplier implements Function<Image, InsertToken> {
+	public static class InsertTokenSupplier implements Function<Image, InsertToken> {
+
+		private final FreenetInterface freenetInterface;
+
+		@Inject
+		public InsertTokenSupplier(FreenetInterface freenetInterface) {
+			this.freenetInterface = freenetInterface;
+		}
 
 		@Override
 		public InsertToken apply(Image image) {
-			return new InsertToken(image);
+			return freenetInterface.new InsertToken(image);
 		}
 
 	}