X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=8c1aeedc2374259804743312639860b84e9162aa;hb=066c47675194a5295a9861b1c9c289c44219a740;hp=a6b4c96b03161aa314900323f7d0560c79d206fb;hpb=ec06ae64c86f0b06bb0cf9f8b289e7907e81dffa;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index a6b4c96..8c1aeed 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -17,9 +17,13 @@
 
 package net.pterodactylus.sone.core;
 
+import static com.google.common.base.Optional.fromNullable;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Predicates.not;
+import static com.google.common.primitives.Longs.tryParse;
+import static java.lang.String.format;
+import static java.util.logging.Level.WARNING;
 import static net.pterodactylus.sone.data.Sone.LOCAL_SONE_FILTER;
 
 import java.net.MalformedURLException;
@@ -38,6 +42,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidAlbumFound;
+import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidImageFound;
+import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidParentAlbumFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostReplyFound;
 import net.pterodactylus.sone.core.Options.DefaultOption;
@@ -753,6 +760,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			logger.log(Level.WARNING, "Given Identity is null!");
 			return null;
 		}
+		final Long latestEdition = fromNullable(tryParse(
+				identity.getProperty("Sone.LatestEdition"))).or(0L);
 		synchronized (sones) {
 			final Sone sone = getRemoteSone(identity.getId(), true);
 			if (sone.isLocal()) {
@@ -761,7 +770,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			sone.setIdentity(identity);
 			boolean newSone = sone.getRequestUri() == null;
 			sone.setRequestUri(SoneUri.create(identity.getRequestUri()));
-			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
+			sone.setLatestEdition(latestEdition);
 			if (newSone) {
 				synchronized (knownSones) {
 					newSone = !knownSones.contains(sone.getId());
@@ -1124,77 +1133,38 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		Set<String> friends = configurationSoneParser.parseFriends();
 
 		/* load albums. */
-		List<Album> topLevelAlbums = new ArrayList<Album>();
-		int albumCounter = 0;
-		while (true) {
-			String albumPrefix = sonePrefix + "/Albums/" + albumCounter++;
-			String albumId = configuration.getStringValue(albumPrefix + "/ID").getValue(null);
-			if (albumId == null) {
-				break;
-			}
-			String albumTitle = configuration.getStringValue(albumPrefix + "/Title").getValue(null);
-			String albumDescription = configuration.getStringValue(albumPrefix + "/Description").getValue(null);
-			String albumParentId = configuration.getStringValue(albumPrefix + "/Parent").getValue(null);
-			String albumImageId = configuration.getStringValue(albumPrefix + "/AlbumImage").getValue(null);
-			if ((albumTitle == null) || (albumDescription == null)) {
-				logger.log(Level.WARNING, "Invalid album found, aborting load!");
-				return;
-			}
-			Album album = database.newAlbumBuilder()
-					.withId(albumId)
-					.by(sone)
-					.build()
-					.modify()
-					.setTitle(albumTitle)
-					.setDescription(albumDescription)
-					.setAlbumImage(albumImageId)
-					.update();
-			if (albumParentId != null) {
-				Album parentAlbum = getAlbum(albumParentId);
-				if (parentAlbum == null) {
-					logger.log(Level.WARNING, String.format("Invalid parent album ID: %s", albumParentId));
-					return;
-				}
-				parentAlbum.addAlbum(album);
-			} else {
-				if (!topLevelAlbums.contains(album)) {
-					topLevelAlbums.add(album);
-				}
-			}
+		List<Album> topLevelAlbums;
+		try {
+			topLevelAlbums =
+					configurationSoneParser.parseTopLevelAlbums(database);
+		} catch (InvalidAlbumFound iaf) {
+			logger.log(Level.WARNING, "Invalid album found, aborting load!");
+			return;
+		} catch (InvalidParentAlbumFound ipaf) {
+			logger.log(Level.WARNING, format("Invalid parent album ID: %s",
+					ipaf.getAlbumParentId()));
+			return;
 		}
 
 		/* load images. */
-		int imageCounter = 0;
-		while (true) {
-			String imagePrefix = sonePrefix + "/Images/" + imageCounter++;
-			String imageId = configuration.getStringValue(imagePrefix + "/ID").getValue(null);
-			if (imageId == null) {
-				break;
-			}
-			String albumId = configuration.getStringValue(imagePrefix + "/Album").getValue(null);
-			String key = configuration.getStringValue(imagePrefix + "/Key").getValue(null);
-			String title = configuration.getStringValue(imagePrefix + "/Title").getValue(null);
-			String description = configuration.getStringValue(imagePrefix + "/Description").getValue(null);
-			Long creationTime = configuration.getLongValue(imagePrefix + "/CreationTime").getValue(null);
-			Integer width = configuration.getIntValue(imagePrefix + "/Width").getValue(null);
-			Integer height = configuration.getIntValue(imagePrefix + "/Height").getValue(null);
-			if ((albumId == null) || (key == null) || (title == null) || (description == null) || (creationTime == null) || (width == null) || (height == null)) {
-				logger.log(Level.WARNING, "Invalid image found, aborting load!");
-				return;
-			}
-			Album album = getAlbum(albumId);
-			if (album == null) {
-				logger.log(Level.WARNING, "Invalid album image encountered, aborting load!");
-				return;
-			}
-			Image image = getImage(imageId).modify().setSone(sone).setCreationTime(creationTime).setKey(key).setTitle(title).setDescription(description).setWidth(width).setHeight(height).update();
-			album.addImage(image);
+		try {
+			configurationSoneParser.parseImages(database);
+		} catch (InvalidImageFound iif) {
+			logger.log(WARNING, "Invalid image found, aborting load!");
+			return;
+		} catch (InvalidParentAlbumFound ipaf) {
+			logger.log(Level.WARNING,
+					format("Invalid album image (%s) encountered, aborting load!",
+							ipaf.getAlbumParentId()));
+			return;
 		}
 
 		/* load avatar. */
 		String avatarId = configuration.getStringValue(sonePrefix + "/Profile/Avatar").getValue(null);
 		if (avatarId != null) {
-			profile.setAvatar(getImage(avatarId, false));
+			final Map<String, Image> images =
+					configurationSoneParser.getImages();
+			profile.setAvatar(images.get(avatarId));
 		}
 
 		/* load options. */