Store request URI in yet unknown Sones when parsing.

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

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index b7871dd..a8d7deb 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -37,6 +37,7 @@ import net.pterodactylus.util.xml.XML;
 import org.w3c.dom.Document;
 
 import freenet.client.FetchResult;
+import freenet.keys.FreenetURI;
 import freenet.support.api.Bucket;
 
 /**
@@ -109,25 +110,32 @@ public class SoneDownloader extends AbstractService {
         */
        public void fetchSone(Sone sone) {
                logger.log(Level.FINE, "Starting fetch for Sone “%s” from %s…", new Object[] { sone, sone.getRequestUri().setMetaString(new String[] { "sone.xml" }) });
-               FetchResult fetchResult = freenetInterface.fetchUri(sone.getRequestUri().setMetaString(new String[] { "sone.xml" }));
+               FreenetURI requestUri = sone.getRequestUri().setMetaString(new String[] { "sone.xml" });
+               FetchResult fetchResult = freenetInterface.fetchUri(requestUri);
                logger.log(Level.FINEST, "Got %d bytes back.", fetchResult.size());
-               parseSone(sone, fetchResult);
+               Sone parsedSone = parseSone(sone, fetchResult, requestUri);
+               if (parsedSone != null) {
+                       core.addSone(parsedSone);
+               }
        }
 
        /**
         * Parses a Sone from a fetch result.
         *
-        * @param sone
+        * @param originalSone
         *            The sone to parse, or {@code null} if the Sone is yet unknown
         * @param fetchResult
         *            The fetch result
+        * @param requestUri
+        *            The requested URI
         * @return The parsed Sone, or {@code null} if the Sone could not be parsed
         */
-       public Sone parseSone(Sone sone, FetchResult fetchResult) {
-               logger.log(Level.FINEST, "Persing FetchResult (%d bytes, %s) for %s…", new Object[] { fetchResult.size(), fetchResult.getMimeType(), sone });
+       public Sone parseSone(Sone originalSone, FetchResult fetchResult, FreenetURI requestUri) {
+               logger.log(Level.FINEST, "Persing FetchResult (%d bytes, %s) for %s…", new Object[] { fetchResult.size(), fetchResult.getMimeType(), originalSone });
                /* TODO - impose a size limit? */
                InputStream xmlInputStream = null;
                Bucket xmlBucket = null;
+               Sone sone;
                try {
                        xmlBucket = fetchResult.asBucket();
                        xmlInputStream = xmlBucket.getInputStream();
@@ -137,21 +145,22 @@ public class SoneDownloader extends AbstractService {
                                soneXml = SimpleXML.fromDocument(document);
                        } catch (NullPointerException npe1) {
                                /* for some reason, invalid XML can cause NPEs. */
-                               logger.log(Level.WARNING, "XML for Sone " + sone + " can not be parsed!", npe1);
+                               logger.log(Level.WARNING, "XML for Sone " + originalSone + " can not be parsed!", npe1);
                                return null;
                        }
 
                        /* check ID. */
                        String soneId = soneXml.getValue("id", null);
-                       if ((sone != null) && !sone.getId().equals(soneId)) {
+                       if ((originalSone != null) && !originalSone.getId().equals(soneId)) {
                                /* TODO - mark Sone as bad. */
-                               logger.log(Level.WARNING, "Downloaded ID for Sone %s (%s) does not match known ID (%s)!", new Object[] { sone, sone.getId(), soneId });
+                               logger.log(Level.WARNING, "Downloaded ID for Sone %s (%s) does not match known ID (%s)!", new Object[] { originalSone, originalSone.getId(), soneId });
                                return null;
                        }
 
                        /* load Sone from core. */
+                       sone = originalSone;
                        if (sone == null) {
-                               sone = core.getSone(soneId);
+                               sone = core.getSone(soneId).setRequestUri(requestUri.setMetaString(new String[] {}));
                        }
 
                        String soneName = soneXml.getValue("name", null);
@@ -238,7 +247,7 @@ public class SoneDownloader extends AbstractService {
                                sone.setModificationCounter(0);
                        }
                } catch (IOException ioe1) {
-                       logger.log(Level.WARNING, "Could not read XML file from " + sone + "!", ioe1);
+                       logger.log(Level.WARNING, "Could not read XML file from " + originalSone + "!", ioe1);
                        return null;
                } finally {
                        if (xmlBucket != null) {