X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=b085ade983b5ea13c96aab1309092a2191d03d03;hb=f2a93c6c489570578a564fa3f4fa262d21b171a2;hp=8d0d1f29ffa715586c9ea7b4e742cdb6d996dd15;hpb=bd7db46eadcf5ec44550722966b04bb77a32fd76;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 8d0d1f2..b085ade 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -26,14 +26,13 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.pterodactylus.sone.core.Core.Preferences;
 import net.pterodactylus.sone.core.Core.SoneStatus;
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Profile;
-import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.util.collection.Pair;
 import net.pterodactylus.util.io.Closer;
@@ -122,13 +121,12 @@ public class SoneDownloader extends AbstractService {
 	 *            The Sone to fetch
 	 */
 	public void fetchSone(Sone sone) {
-		fetchSone(sone, sone.getRequestUri());
+		fetchSone(sone, sone.getRequestUri().sskForUSK());
 	}
 
 	/**
 	 * Fetches the updated Sone. This method can be used to fetch a Sone from a
-	 * specific URI (which happens when {@link Preferences#isSoneRescueMode()
-	 * „Sone rescue mode“} is active).
+	 * specific URI.
 	 *
 	 * @param sone
 	 *            The Sone to fetch
@@ -136,6 +134,23 @@ public class SoneDownloader extends AbstractService {
 	 *            The URI to fetch the Sone from
 	 */
 	public void fetchSone(Sone sone, FreenetURI soneUri) {
+		fetchSone(sone, soneUri, false);
+	}
+
+	/**
+	 * Fetches the Sone from the given URI.
+	 *
+	 * @param sone
+	 *            The Sone to fetch
+	 * @param soneUri
+	 *            The URI of the Sone to fetch
+	 * @param fetchOnly
+	 *            {@code true} to only fetch and parse the Sone, {@code false}
+	 *            to {@link Core#updateSone(Sone) update} it in the core
+	 * @return The downloaded Sone, or {@code null} if the Sone could not be
+	 *         downloaded
+	 */
+	public Sone fetchSone(Sone sone, FreenetURI soneUri, boolean fetchOnly) {
 		logger.log(Level.FINE, "Starting fetch for Sone “%s” from %s…", new Object[] { sone, soneUri });
 		FreenetURI requestUri = soneUri.setMetaString(new String[] { "sone.xml" });
 		core.setSoneStatus(sone, SoneStatus.downloading);
@@ -143,14 +158,17 @@ public class SoneDownloader extends AbstractService {
 			Pair<FreenetURI, FetchResult> fetchResults = freenetInterface.fetchUri(requestUri);
 			if (fetchResults == null) {
 				/* TODO - mark Sone as bad. */
-				return;
+				return null;
 			}
 			logger.log(Level.FINEST, "Got %d bytes back.", fetchResults.getRight().size());
 			Sone parsedSone = parseSone(sone, fetchResults.getRight(), fetchResults.getLeft());
 			if (parsedSone != null) {
-				addSone(parsedSone);
-				core.updateSone(parsedSone);
+				if (!fetchOnly) {
+					core.updateSone(parsedSone);
+					addSone(parsedSone);
+				}
 			}
+			return parsedSone;
 		} finally {
 			core.setSoneStatus(sone, (sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
 		}
@@ -201,8 +219,10 @@ public class SoneDownloader extends AbstractService {
 	 * @param soneInputStream
 	 *            The input stream to parse the Sone from
 	 * @return The parsed Sone
+	 * @throws SoneException
+	 *             if a parse error occurs, or the protocol is invalid
 	 */
-	public Sone parseSone(Sone originalSone, InputStream soneInputStream) {
+	public Sone parseSone(Sone originalSone, InputStream soneInputStream) throws SoneException {
 		/* TODO - impose a size limit? */
 
 		Document document;
@@ -318,8 +338,8 @@ public class SoneDownloader extends AbstractService {
 		if (profileFieldsXml != null) {
 			for (SimpleXML fieldXml : profileFieldsXml.getNodes("field")) {
 				String fieldName = fieldXml.getValue("field-name", null);
-				String fieldValue = fieldXml.getValue("field-value", null);
-				if ((fieldName == null) || (fieldValue == null)) {
+				String fieldValue = fieldXml.getValue("field-value", "");
+				if (fieldName == null) {
 					logger.log(Level.WARNING, "Downloaded profile field for Sone %s with missing data! Name: %s, Value: %s", new Object[] { sone, fieldName, fieldValue });
 					return null;
 				}
@@ -365,7 +385,7 @@ public class SoneDownloader extends AbstractService {
 
 		/* parse replies. */
 		SimpleXML repliesXml = soneXml.getNode("replies");
-		Set<Reply> replies = new HashSet<Reply>();
+		Set<PostReply> replies = new HashSet<PostReply>();
 		if (repliesXml == null) {
 			/* TODO - mark Sone as bad. */
 			logger.log(Level.WARNING, "Downloaded Sone %s has no replies!", new Object[] { sone });
@@ -424,7 +444,8 @@ public class SoneDownloader extends AbstractService {
 				String id = albumXml.getValue("id", null);
 				String parentId = albumXml.getValue("parent", null);
 				String title = albumXml.getValue("title", null);
-				String description = albumXml.getValue("description", null);
+				String description = albumXml.getValue("description", "");
+				String albumImageId = albumXml.getValue("album-image", null);
 				if ((id == null) || (title == null) || (description == null)) {
 					logger.log(Level.WARNING, "Downloaded Sone %s contains invalid album!", new Object[] { sone });
 					return null;
@@ -470,6 +491,7 @@ public class SoneDownloader extends AbstractService {
 						album.addImage(image);
 					}
 				}
+				album.setAlbumImage(albumImageId);
 			}
 		}