Merge branch 'master' into next

[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 840adab..30ba69a 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
+++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
@@ -25,7 +25,6 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.service.AbstractService;
 
 import com.db4o.ObjectContainer;
 
@@ -46,7 +45,7 @@ import freenet.node.RequestStarter;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class FreenetInterface extends AbstractService {
+public class FreenetInterface {
 
        /** The logger. */
        private static final Logger logger = Logging.getLogger(FreenetInterface.class);
@@ -69,7 +68,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;
        }
@@ -86,16 +84,21 @@ public class FreenetInterface extends AbstractService {
         * @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);
                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 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,9 +149,9 @@ 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());
+                                               sone.updateUris(key.suggestedEdition);
                                                soneDownloader.fetchSone(sone);
                                        }
                                }
@@ -182,6 +185,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);