X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloaderImpl.java;h=d4ed927f90ccc5600cb200a87c98c4de53457be2;hb=239f08e37721401290f43596e8a7e9aa83aae980;hp=1e1484d4112a53d178a6154d65d260007cf56209;hpb=fdffe49b10613e1d9caacdf62ab99bca06edf3e1;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java
index 1e1484d..d4ed927 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java
@@ -24,8 +24,10 @@ import static java.util.concurrent.TimeUnit.DAYS;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
@@ -43,6 +45,7 @@ import net.pterodactylus.sone.data.Sone.SoneStatus;
 import net.pterodactylus.sone.data.SoneImpl;
 import net.pterodactylus.sone.database.PostBuilder;
 import net.pterodactylus.sone.database.PostReplyBuilder;
+import net.pterodactylus.sone.database.SoneBuilder;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.number.Numbers;
@@ -233,11 +236,6 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 			Sone parsedSone = parseSone(originalSone, soneInputStream);
 			if (parsedSone != null) {
 				parsedSone.setLatestEdition(requestUri.getEdition());
-				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 (Exception e1) {
@@ -276,7 +274,11 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 			return null;
 		}
 
-		Sone sone = new SoneImpl(originalSone.getId(), originalSone.isLocal()).setIdentity(originalSone.getIdentity());
+		SoneBuilder soneBuilder = core.soneBuilder().from(originalSone.getIdentity());
+		if (originalSone.isLocal()) {
+			soneBuilder = soneBuilder.local();
+		}
+		Sone sone = soneBuilder.build();
 
 		SimpleXML soneXml;
 		try {
@@ -333,21 +335,6 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 			sone.setClient(new Client(clientName, clientVersion));
 		}
 
-		String soneRequestUri = soneXml.getValue("request-uri", null);
-		if (soneRequestUri != null) {
-			try {
-				sone.setRequestUri(new FreenetURI(soneRequestUri));
-			} catch (MalformedURLException mue1) {
-				/* TODO - mark Sone as bad. */
-				logger.log(Level.WARNING, String.format("Downloaded Sone %s has invalid request URI: %s", sone, soneRequestUri), mue1);
-				return null;
-			}
-		}
-
-		if (originalSone.getInsertUri() != null) {
-			sone.setInsertUri(originalSone.getInsertUri());
-		}
-
 		SimpleXML profileXml = soneXml.getNode("profile");
 		if (profileXml == null) {
 			/* TODO - mark Sone as bad. */
@@ -477,6 +464,7 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 
 		/* parse albums. */
 		SimpleXML albumsXml = soneXml.getNode("albums");
+		Map<String, Image> allImages = new HashMap<String, Image>();
 		List<Album> topLevelAlbums = new ArrayList<Album>();
 		if (albumsXml != null) {
 			for (SimpleXML albumXml : albumsXml.getNodes("album")) {
@@ -531,10 +519,11 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 							logger.log(Level.WARNING, String.format("Downloaded Sone %s contains image %s with invalid dimensions (%s, %s)!", sone, imageId, imageWidthString, imageHeightString));
 							return null;
 						}
-						Image image = core.getImage(imageId).modify().setSone(sone).setKey(imageKey).setCreationTime(creationTime).update();
+						Image image = core.imageBuilder().withId(imageId).build().modify().setSone(sone).setKey(imageKey).setCreationTime(creationTime).update();
 						image = image.modify().setTitle(imageTitle).setDescription(imageDescription).update();
 						image = image.modify().setWidth(imageWidth).setHeight(imageHeight).update();
 						album.addImage(image);
+						allImages.put(imageId, image);
 					}
 				}
 				album.modify().setAlbumImage(albumImageId).update();
@@ -543,7 +532,7 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade
 
 		/* process avatar. */
 		if (avatarId != null) {
-			profile.setAvatar(core.getImage(avatarId, false));
+			profile.setAvatar(allImages.get(avatarId));
 		}
 
 		/* okay, apparently everything was parsed correctly. Now import. */