X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=ac3929191828c2775223da1b768723ea4b8fc695;hb=bf6da11210fb439f2cdc8fcb8755589d04b4db3b;hp=b7663e5886e2b79a2310b2997ce289d8d11cfbd0;hpb=21c4819261de874652e7c8be37bde5923758cf4b;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 b7663e5..ac39291 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -19,6 +19,7 @@ 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;
@@ -69,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;
 	}
@@ -110,6 +111,9 @@ public class SoneDownloader extends AbstractService {
 	 *            The Sone to fetch
 	 */
 	public void fetchSone(Sone sone) {
+		if (core.getSoneStatus(sone) == SoneStatus.downloading) {
+			return;
+		}
 		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" });
 		core.setSoneStatus(sone, SoneStatus.downloading);
@@ -149,7 +153,16 @@ public class SoneDownloader extends AbstractService {
 		try {
 			xmlBucket = fetchResult.asBucket();
 			xmlInputStream = xmlBucket.getInputStream();
-			Document document = XML.transformToDocument(xmlInputStream);
+			Document document;
+			/* XML parsing is not thread-safe. */
+			synchronized (this) {
+				document = XML.transformToDocument(xmlInputStream);
+			}
+			if (document == null) {
+				/* TODO - mark Sone as bad. */
+				logger.log(Level.WARNING, "Could not parse XML for Sone %s at %s!", new Object[] { originalSone, requestUri });
+				return null;
+			}
 			SimpleXML soneXml;
 			try {
 				soneXml = SimpleXML.fromDocument(document);
@@ -263,14 +276,76 @@ public class SoneDownloader extends AbstractService {
 				}
 			}
 
+			/* parse liked post IDs. */
+			SimpleXML likePostIdsXml = soneXml.getNode("post-likes");
+			if (likePostIdsXml == null) {
+				/* TODO - mark Sone as bad. */
+				logger.log(Level.WARNING, "Downloaded Sone %s has no known Sones!", new Object[] { sone });
+				return null;
+			}
+
+			Set<String> likedPostIds = new HashSet<String>();
+			for (SimpleXML likedPostIdXml : likePostIdsXml.getNodes("post-like")) {
+				String postId = likedPostIdXml.getValue();
+				likedPostIds.add(postId);
+			}
+
+			/* parse liked reply IDs. */
+			SimpleXML likeReplyIdsXml = soneXml.getNode("reply-likes");
+			if (likeReplyIdsXml == null) {
+				/* TODO - mark Sone as bad. */
+				logger.log(Level.WARNING, "Downloaded Sone %s has no reply likes!", new Object[] { sone });
+				return null;
+			}
+
+			Set<String> likedReplyIds = new HashSet<String>();
+			for (SimpleXML likedReplyIdXml : likeReplyIdsXml.getNodes("reply-like")) {
+				String replyId = likedReplyIdXml.getValue();
+				likedReplyIds.add(replyId);
+			}
+
+			/* parse known Sones. */
+			SimpleXML knownSonesXml = soneXml.getNode("known-sones");
+			if (knownSonesXml == null) {
+				/* TODO - mark Sone as bad. */
+				logger.log(Level.WARNING, "Downloaded Sone %s has no known Sones!", new Object[] { sone });
+				return null;
+			}
+
+			Set<Sone> knownSones = new HashSet<Sone>();
+			for (SimpleXML knownSoneXml : knownSonesXml.getNodes("known-sone")) {
+				String knownSoneId = knownSoneXml.getValue("sone-id", null);
+				String knownSoneKey = knownSoneXml.getValue("sone-key", null);
+				String knownSoneName = knownSoneXml.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.setLikePostIds(likedPostIds);
 				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;