X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterface.java;h=f5d7b665c53c852559bc783af8f9b22b08bef2e8;hb=8b25ea98d342ed2e3e80914448156145a3e6757d;hp=840adab741b61d9fe4b4fefd28270eedd458fc28;hpb=bcfa4921b05ece66eea470ceae5b774466d1ccd5;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 840adab..f5d7b66 100644
--- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
+++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
@@ -24,8 +24,8 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.util.collection.Pair;
import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.service.AbstractService;
import com.db4o.ObjectContainer;
@@ -46,7 +46,7 @@ import freenet.node.RequestStarter;
*
* @author David âBombeâ Roden
*/
-public class FreenetInterface extends AbstractService {
+public class FreenetInterface {
/** The logger. */
private static final Logger logger = Logging.getLogger(FreenetInterface.class);
@@ -69,7 +69,6 @@ public class FreenetInterface extends AbstractService {
* The high-level client
*/
public FreenetInterface(Node node, HighLevelSimpleClient client) {
- super("Sone Freenet Interface");
this.node = node;
this.client = client;
}
@@ -85,17 +84,22 @@ public class FreenetInterface extends AbstractService {
* The URI to fetch
* @return The result of the fetch, or {@code null} if an error occured
*/
- public FetchResult fetchUri(FreenetURI uri) {
- logger.entering(FreenetInterface.class.getName(), "fetchUri(FreenetURI)", uri);
+ public Pair fetchUri(FreenetURI uri) {
FetchResult fetchResult = null;
- try {
- fetchResult = client.fetch(uri);
- } catch (FetchException fe1) {
- logger.log(Level.WARNING, "Could not fetch â" + uri + "â!", fe1);
- } finally {
- logger.exiting(FreenetInterface.class.getName(), "fetchUri(FreenetURI)", fetchResult);
+ FreenetURI currentUri = new FreenetURI(uri);
+ while (true) {
+ try {
+ fetchResult = client.fetch(currentUri);
+ return new Pair(currentUri, fetchResult);
+ } catch (FetchException fe1) {
+ if (fe1.getMode() == FetchException.PERMANENT_REDIRECT) {
+ currentUri = fe1.newURI;
+ continue;
+ }
+ logger.log(Level.WARNING, "Could not fetch â" + uri + "â!", fe1);
+ return null;
+ }
}
- return fetchResult;
}
/**
@@ -146,10 +150,16 @@ public class FreenetInterface extends AbstractService {
@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, "Found USK update for Sone â%sâ at %s.", new Object[] { sone, key });
+ logger.log(Level.FINE, "Found USK update for Sone â%sâ at %s, new known good: %s, new slot too: %s.", new Object[] { sone, key, newKnownGood, newSlotToo });
if (newKnownGood) {
- sone.updateUris(key.getURI());
- soneDownloader.fetchSone(sone);
+ sone.setLatestEdition(key.suggestedEdition);
+ new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ soneDownloader.fetchSone(sone);
+ }
+ }, "Sone Downloader").start();
}
}
@@ -182,6 +192,7 @@ public class FreenetInterface extends AbstractService {
return;
}
try {
+ logger.log(Level.FINEST, "Unsubscribing from USK for %sâ¦", new Object[] { sone });
node.clientCore.uskManager.unsubscribe(USK.create(sone.getRequestUri()), uskCallback);
} catch (MalformedURLException mue1) {
logger.log(Level.FINE, "Could not unsubscribe USK â" + sone.getRequestUri() + "â!", mue1);