X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=34ca521c11d4147a10f9380134b2f72e83ee6a92;hb=2f995a29d8731dc3b3d20e78fd9382be542292ff;hp=cffc8d930615a23a91df97408862114f4654cb00;hpb=3d888e800617335535c1a4b2cbac3e02acfdde34;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 cffc8d9..34ca521 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -19,9 +19,8 @@ package net.pterodactylus.sone.core;
 
 import java.io.InputStream;
 import java.net.MalformedURLException;
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -35,7 +34,7 @@ import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
-import net.pterodactylus.sone.data.SoneImpl;
+import net.pterodactylus.sone.data.impl.DefaultSone;
 import net.pterodactylus.sone.database.PostBuilder;
 import net.pterodactylus.sone.database.PostReplyBuilder;
 import net.pterodactylus.util.io.Closer;
@@ -45,12 +44,13 @@ import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.xml.SimpleXML;
 import net.pterodactylus.util.xml.XML;
 
-import org.w3c.dom.Document;
-
 import freenet.client.FetchResult;
 import freenet.keys.FreenetURI;
 import freenet.support.api.Bucket;
 
+import com.google.common.collect.Maps;
+import org.w3c.dom.Document;
+
 /**
  * The Sone downloader is responsible for download Sones as they are updated.
  *
@@ -240,7 +240,7 @@ public class SoneDownloader extends AbstractService {
 			return null;
 		}
 
-		Sone sone = new SoneImpl(originalSone.getId(), originalSone.isLocal()).setIdentity(originalSone.getIdentity());
+		Sone sone = new DefaultSone(originalSone.getId(), originalSone.isLocal()).setIdentity(originalSone.getIdentity());
 
 		SimpleXML soneXml;
 		try {
@@ -308,16 +308,8 @@ public class SoneDownloader extends AbstractService {
 			}
 		}
 
-		String soneInsertUri = soneXml.getValue("insert-uri", null);
-		if ((soneInsertUri != null) && (sone.getInsertUri() == null)) {
-			try {
-				sone.setInsertUri(new FreenetURI(soneInsertUri));
-				sone.setLatestEdition(Math.max(sone.getRequestUri().getEdition(), sone.getInsertUri().getEdition()));
-			} catch (MalformedURLException mue1) {
-				/* TODO - mark Sone as bad. */
-				logger.log(Level.WARNING, String.format("Downloaded Sone %s has invalid insert URI: %s", sone, soneInsertUri), mue1);
-				return null;
-			}
+		if (originalSone.getInsertUri() != null) {
+			sone.setInsertUri(originalSone.getInsertUri());
 		}
 
 		SimpleXML profileXml = soneXml.getNode("profile");
@@ -449,7 +441,7 @@ public class SoneDownloader extends AbstractService {
 
 		/* parse albums. */
 		SimpleXML albumsXml = soneXml.getNode("albums");
-		List<Album> topLevelAlbums = new ArrayList<Album>();
+		Map<String, Album> albums = Maps.newHashMap();
 		if (albumsXml != null) {
 			for (SimpleXML albumXml : albumsXml.getNodes("album")) {
 				String id = albumXml.getValue("id", null);
@@ -461,20 +453,16 @@ public class SoneDownloader extends AbstractService {
 					logger.log(Level.WARNING, String.format("Downloaded Sone %s contains invalid album!", sone));
 					return null;
 				}
-				Album parent = null;
+				Album parent = sone.getRootAlbum();
 				if (parentId != null) {
-					parent = core.getAlbum(parentId, false);
+					parent = albums.get(parentId);
 					if (parent == null) {
 						logger.log(Level.WARNING, String.format("Downloaded Sone %s has album with invalid parent!", sone));
 						return null;
 					}
 				}
-				Album album = core.getAlbum(id).setSone(sone).modify().setTitle(title).setDescription(description).update();
-				if (parent != null) {
-					parent.addAlbum(album);
-				} else {
-					topLevelAlbums.add(album);
-				}
+				Album album = parent.newAlbumBuilder().withId(id).build().modify().setTitle(title).setDescription(description).update();
+				albums.put(album.getId(), album);
 				SimpleXML imagesXml = albumXml.getNode("images");
 				if (imagesXml != null) {
 					for (SimpleXML imageXml : imagesXml.getNodes("image")) {
@@ -496,10 +484,8 @@ public class SoneDownloader extends AbstractService {
 							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 = album.newImageBuilder().withId(imageId).at(imageKey).created(creationTime).sized(imageWidth, imageHeight).build();
 						image = image.modify().setTitle(imageTitle).setDescription(imageDescription).update();
-						image = image.modify().setWidth(imageWidth).setHeight(imageHeight).update();
-						album.addImage(image);
 					}
 				}
 				album.modify().setAlbumImage(albumImageId).update();
@@ -508,7 +494,7 @@ public class SoneDownloader extends AbstractService {
 
 		/* process avatar. */
 		if (avatarId != null) {
-			profile.setAvatar(core.getImage(avatarId, false));
+			profile.setAvatar(core.getImage(avatarId).orNull());
 		}
 
 		/* okay, apparently everything was parsed correctly. Now import. */
@@ -519,9 +505,6 @@ public class SoneDownloader extends AbstractService {
 			sone.setReplies(replies);
 			sone.setLikePostIds(likedPostIds);
 			sone.setLikeReplyIds(likedReplyIds);
-			for (Album album : topLevelAlbums) {
-				sone.getRootAlbum().addAlbum(album);
-			}
 		}
 
 		return sone;