X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=db302b0584f703a116e272c068708f1f158847f4;hb=58497297d2b9a18cd2877a226870acfe9e8837af;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..db302b0 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -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");
@@ -496,10 +488,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).by(sone).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 +498,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. */