X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=9b48d7d0fe569bb159c3ebf2fe635c3a99d546e3;hb=793370e43152d61ca04699fdfccf39fd73707806;hp=4d395688f177aa9a0d7992410adaabb557b7f37e;hpb=23beb35ac87fdb97382a59d5365dd83a5258897b;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index 4d39568..9b48d7d 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -24,6 +24,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.core.Core.SoneStatus;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Reply;
@@ -37,6 +38,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;
 
 /**
@@ -67,7 +69,7 @@ public class SoneDownloader extends AbstractService {
 	 *            The Freenet interface
 	 */
 	public SoneDownloader(Core core, FreenetInterface freenetInterface) {
-		super("Sone Downloader");
+		super("Sone Downloader", false);
 		this.core = core;
 		this.freenetInterface = freenetInterface;
 	}
@@ -109,16 +111,41 @@ 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" }));
-		logger.log(Level.FINEST, "Got %d bytes back.", fetchResult.size());
-		parseSone(sone, fetchResult);
+		FreenetURI requestUri = sone.getRequestUri().setMetaString(new String[] { "sone.xml" });
+		core.setSoneStatus(sone, SoneStatus.downloading);
+		try {
+			FetchResult fetchResult = freenetInterface.fetchUri(requestUri);
+			if (fetchResult == null) {
+				/* TODO - mark Sone as bad. */
+				return;
+			}
+			logger.log(Level.FINEST, "Got %d bytes back.", fetchResult.size());
+			Sone parsedSone = parseSone(sone, fetchResult, requestUri);
+			if (parsedSone != null) {
+				core.addSone(parsedSone);
+			}
+		} finally {
+			core.setSoneStatus(sone, (sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
+		}
 	}
 
-	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 });
+	/**
+	 * Parses a Sone from a fetch result.
+	 *
+	 * @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 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();
@@ -128,21 +155,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);
@@ -151,6 +179,21 @@ public class SoneDownloader extends AbstractService {
 				logger.log(Level.WARNING, "Downloaded name for Sone %s was null!", new Object[] { sone });
 				return null;
 			}
+			sone.setName(soneName);
+
+			String soneTime = soneXml.getValue("time", null);
+			if (soneTime == null) {
+				/* TODO - mark Sone as bad. */
+				logger.log(Level.WARNING, "Downloaded time for Sone %s was null!", new Object[] { sone });
+				return null;
+			}
+			try {
+				sone.setTime(Long.parseLong(soneTime));
+			} catch (NumberFormatException nfe1) {
+				/* TODO - mark Sone as bad. */
+				logger.log(Level.WARNING, "Downloaded Sone %s with invalid time: %s", new Object[] { sone, soneTime });
+				return null;
+			}
 
 			SimpleXML profileXml = soneXml.getNode("profile");
 			if (profileXml == null) {
@@ -229,7 +272,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) {