/*
- * Sone - FreenetInterface.java - Copyright Ā© 2010ā2016 David Roden
+ * Sone - FreenetInterface.java - Copyright Ā© 2010ā2020 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
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.io.IOException;
import java.net.MalformedURLException;
import freenet.support.api.RandomAccessBucket;
import freenet.support.io.ArrayBucket;
import freenet.support.io.ResumeFailedException;
+import net.pterodactylus.sone.freenet.*;
/**
* Contains all necessary functionality for interacting with the Freenet node.
/** The node to interact with. */
private final Node node;
+ 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<String, USKCallback>();
+ private final Map<String, USKCallback> soneUskCallbacks = new HashMap<>();
/** The not-Sone-related USK callbacks. */
private final Map<FreenetURI, USKCallback> uriUskCallbacks = Collections.synchronizedMap(new HashMap<FreenetURI, USKCallback>());
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, SoneUriCreator soneUriCreator) {
this.eventBus = eventBus;
this.node = node;
+ this.soneUriCreator = soneUriCreator;
this.client = node.clientCore.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS, false, true);
}
public void registerActiveUsk(FreenetURI requestUri,
USKCallback uskCallback) {
try {
- soneUskCallbacks.put(routingKey(requestUri), uskCallback);
+ soneUskCallbacks.put(FreenetURIsKt.getRoutingKeyString(requestUri), uskCallback);
node.clientCore.uskManager.subscribe(create(requestUri),
uskCallback, true, requestClient);
} catch (MalformedURLException mue1) {
public void registerPassiveUsk(FreenetURI requestUri,
USKCallback uskCallback) {
try {
- soneUskCallbacks.put(routingKey(requestUri), uskCallback);
+ soneUskCallbacks.put(FreenetURIsKt.getRoutingKeyString(requestUri), uskCallback);
node.clientCore
.uskManager
.subscribe(create(requestUri), uskCallback, false, requestClient);
}
try {
logger.log(Level.FINEST, String.format("Unsubscribing from USK for %sā¦", sone));
- node.clientCore.uskManager.unsubscribe(USK.create(sone.getRequestUri()), uskCallback);
+ node.clientCore.uskManager.unsubscribe(USK.create(soneUriCreator.getRequestUri(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ā!", soneUriCreator.getRequestUri(sone)), mue1);
}
}
};
try {
node.clientCore.uskManager.subscribe(USK.create(uri), uskCallback, true, requestClient);
- uriUskCallbacks.put(uri, uskCallback);
+ 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);
}
* The URI to unregister the USK watcher for
*/
public void unregisterUsk(FreenetURI uri) {
- USKCallback uskCallback = uriUskCallbacks.remove(uri);
- if (uskCallback == null) {
- logger.log(Level.INFO, String.format("Could not unregister unknown USK: %s", uri));
- return;
- }
try {
+ USKCallback uskCallback = uriUskCallbacks.remove(USK.create(uri).clearCopy().getURI());
+ if (uskCallback == null) {
+ logger.log(Level.INFO, String.format("Could not unregister unknown USK: %s", uri));
+ return;
+ }
node.clientCore.uskManager.unsubscribe(USK.create(uri), uskCallback);
} catch (MalformedURLException mue1) {
logger.log(Level.INFO, String.format("Could not unregister invalid USK: %s", uri), mue1);