X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=46d8540a60ec5c238f9b2aaff57899b4191ba737;hb=fcaabe0a9b8bb09aabe0e2a1451c3cb00d5cfbf4;hp=c5f4816203af692e92375444c3a5a7499df3ac22;hpb=3cb9b01a360dbdb51512ae0055056167988b9ff3;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 c5f4816..46d8540 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -26,6 +26,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.Core.SoneStatus;
+import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Reply;
@@ -113,11 +114,25 @@ public class SoneDownloader extends AbstractService {
 	 *            The Sone to fetch
 	 */
 	public void fetchSone(Sone sone) {
+		fetchSone(sone, sone.getRequestUri());
+	}
+
+	/**
+	 * Fetches the updated Sone. This method can be used to fetch a Sone from a
+	 * specific URI (which happens when {@link Core#isSoneRescueMode() „Sone
+	 * rescue mode“} is active).
+	 *
+	 * @param sone
+	 *            The Sone to fetch
+	 * @param soneUri
+	 *            The URI to fetch the Sone from
+	 */
+	public void fetchSone(Sone sone, FreenetURI soneUri) {
 		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" });
+		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);
 		try {
 			Pair<FreenetURI, FetchResult> fetchResults = freenetInterface.fetchUri(requestUri);
@@ -154,7 +169,11 @@ public class SoneDownloader extends AbstractService {
 			soneInputStream = soneBucket.getInputStream();
 			Sone parsedSone = parseSone(originalSone, soneInputStream);
 			if (parsedSone != null) {
-				parsedSone.setRequestUri(requestUri.setMetaString(new String[0]));
+				if (requestUri.getKeyType().equals("USK")) {
+					parsedSone.setRequestUri(requestUri.setMetaString(new String[0]));
+				} else {
+					parsedSone.setRequestUri(requestUri.setKeyType("USK").setDocName("Sone").setMetaString(new String[0]));
+				}
 			}
 			return parsedSone;
 		} catch (IOException ioe1) {
@@ -215,6 +234,17 @@ public class SoneDownloader extends AbstractService {
 			return null;
 		}
 
+		SimpleXML clientXml = soneXml.getNode("client");
+		if (clientXml != null) {
+			String clientName = clientXml.getValue("name", null);
+			String clientVersion = clientXml.getValue("version", null);
+			if ((clientName == null) || (clientVersion == null)) {
+				logger.log(Level.WARNING, "Download Sone %s with client XML but missing name or version!", sone);
+				return null;
+			}
+			sone.setClient(new Client(clientName, clientVersion));
+		}
+
 		String soneRequestUri = soneXml.getValue("request-uri", null);
 		if (soneRequestUri != null) {
 			try {
@@ -341,7 +371,6 @@ public class SoneDownloader extends AbstractService {
 			sone.setPosts(posts);
 			sone.setReplies(replies);
 			sone.setLikePostIds(likedPostIds);
-			sone.setModificationCounter(0);
 		}
 
 		return sone;