X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=e11ded88a1cec03c8239809e444991b390d3dbba;hp=da33b0b80435bf79ee2c28e212924975666a43cd;hb=ca4a41282673af46640e423473772444dea4f3c6;hpb=c28a1233dc8daf4713b53f688110e0332e7a7340

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index da33b0b..e11ded8 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -19,11 +19,13 @@ package net.pterodactylus.sone.core;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
 import java.util.HashSet;
 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;
@@ -68,7 +70,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;
 	}
@@ -111,11 +113,20 @@ 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" }) });
 		FreenetURI requestUri = sone.getRequestUri().setMetaString(new String[] { "sone.xml" });
-		FetchResult fetchResult = freenetInterface.fetchUri(requestUri);
-		logger.log(Level.FINEST, "Got %d bytes back.", fetchResult.size());
-		Sone parsedSone = parseSone(sone, fetchResult, requestUri);
-		if (parsedSone != null) {
-			core.addSone(parsedSone);
+		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);
 		}
 	}
 
@@ -171,6 +182,20 @@ public class SoneDownloader extends AbstractService {
 			}
 			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) {
 				/* TODO - mark Sone as bad. */
@@ -239,14 +264,67 @@ public class SoneDownloader extends AbstractService {
 				}
 			}
 
+			/* parse friends. */
+			SimpleXML friendsXml = soneXml.getNode("friends");
+			if (friendsXml == null) {
+				/* TODO - mark Sone as bad. */
+				logger.log(Level.WARNING, "Downloaded Sone %s has no friends!", new Object[] { sone });
+				return null;
+			}
+
+			Set<Sone> friends = new HashSet<Sone>();
+			for (SimpleXML friendXml : friendsXml.getNodes("friend")) {
+				String friendId = friendXml.getValue("sone-id", null);
+				String friendKey = friendXml.getValue("sone-key", null);
+				String friendName = friendXml.getValue("sone-name", null);
+				if ((friendId == null) || (friendKey == null) || (friendName == null)) {
+					/* TODO - mark Sone as bad. */
+					logger.log(Level.WARNING, "Downloaded friend for Sone %s with missing data! ID: %s, Key: %s, Name: %s", new Object[] { sone, friendId, friendKey, friendName });
+					return null;
+				}
+				try {
+					friends.add(core.getSone(friendId).setRequestUri(new FreenetURI(friendKey)).setName(friendName));
+				} catch (MalformedURLException mue1) {
+					/* TODO - mark Sone as bad. */
+					logger.log(Level.WARNING, "Downloaded friend for Sone %s with invalid key: %s", new Object[] { sone, friendKey });
+					return null;
+				}
+			}
+
+			Set<Sone> knownSones = new HashSet<Sone>();
+			for (SimpleXML friendXml : friendsXml.getNodes("friend")) {
+				String knownSoneId = friendXml.getValue("sone-id", null);
+				String knownSoneKey = friendXml.getValue("sone-key", null);
+				String knownSoneName = friendXml.getValue("sone-name", null);
+				if ((knownSoneId == null) || (knownSoneKey == null) || (knownSoneName == null)) {
+					/* TODO - mark Sone as bad. */
+					logger.log(Level.WARNING, "Downloaded known Sone for Sone %s with missing data! ID: %s, Key: %s, Name: %s", new Object[] { sone, knownSoneId, knownSoneKey, knownSoneName });
+					return null;
+				}
+				try {
+					knownSones.add(core.getSone(knownSoneId).setRequestUri(new FreenetURI(knownSoneKey)).setName(knownSoneName));
+				} catch (MalformedURLException mue1) {
+					/* TODO - mark Sone as bad. */
+					logger.log(Level.WARNING, "Downloaded known Sone for Sone %s with invalid key: %s", new Object[] { sone, knownSoneKey });
+					return null;
+				}
+			}
+
 			/* okay, apparently everything was parsed correctly. Now import. */
 			/* atomic setter operation on the Sone. */
 			synchronized (sone) {
 				sone.setProfile(profile);
 				sone.setPosts(posts);
 				sone.setReplies(replies);
+				sone.setFriends(friends);
 				sone.setModificationCounter(0);
 			}
+
+			/* add all known Sones to core for downloading. */
+			for (Sone knownSone : knownSones) {
+				core.addSone(knownSone);
+			}
+
 		} catch (IOException ioe1) {
 			logger.log(Level.WARNING, "Could not read XML file from " + originalSone + "!", ioe1);
 			return null;