X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=9a5d983a96a15b0027fc48473d0cb63f9c64003c;hb=009798860b508cdddf0a3845742264e3ae4d8dc9;hp=a6d46c208da8d0ea3eaf6b45fd68faf14850dfe3;hpb=a4694502195ee6190d66236386d6813aa0b6f852;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 a6d46c2..9a5d983 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;
@@ -67,6 +74,7 @@ import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
 import net.pterodactylus.sone.data.SoneImpl;
 import net.pterodactylus.sone.data.TemporaryImage;
+import net.pterodactylus.sone.database.AlbumBuilder;
 import net.pterodactylus.sone.database.Database;
 import net.pterodactylus.sone.database.DatabaseException;
 import net.pterodactylus.sone.database.PostBuilder;
@@ -584,16 +592,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		return posts;
 	}
 
-	/**
-	 * Returns the album with the given ID, creating a new album if no album
-	 * with the given ID can be found.
-	 *
-	 * @param albumId
-	 *            The ID of the album
-	 * @return The album with the given ID
-	 */
-	public Album getOrCreateAlbum(String albumId) {
-		return getAlbum(albumId, true);
+	public AlbumBuilder albumBuilder() {
+		return database.newAlbumBuilder();
 	}
 
 	/**
@@ -602,23 +602,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *
 	 * @param albumId
 	 *            The ID of the album
-	 * @param create
-	 *            {@code true} to create a new album if none exists for the
-	 *            given ID
 	 * @return The album with the given ID, or {@code null} if no album with the
-	 *         given ID exists and {@code create} is {@code false}
+	 *         given ID exists
 	 */
-	public Album getAlbum(String albumId, boolean create) {
-		Optional<Album> album = database.getAlbum(albumId);
-		if (album.isPresent()) {
-			return album.get();
-		}
-		if (!create) {
-			return null;
-		}
-		Album newAlbum = database.newAlbumBuilder().withId(albumId).build();
-		database.storeAlbum(newAlbum);
-		return newAlbum;
+	public Album getAlbum(String albumId) {
+		return database.getAlbum(albumId).orNull();
 	}
 
 	/**
@@ -772,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()) {
@@ -780,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());
@@ -1140,73 +1130,33 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				configurationSoneParser.parseLikedPostReplyIds();
 
 		/* load friends. */
-		Set<String> friends = new HashSet<String>();
-		while (true) {
-			String friendId = configuration.getStringValue(sonePrefix + "/Friends/" + friends.size() + "/ID").getValue(null);
-			if (friendId == null) {
-				break;
-			}
-			friends.add(friendId);
-		}
+		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 = getOrCreateAlbum(albumId).setSone(sone).modify().setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId).update();
-			if (albumParentId != null) {
-				Album parentAlbum = getAlbum(albumParentId, false);
-				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, false);
-			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. */
@@ -1451,9 +1401,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return The new album
 	 */
 	public Album createAlbum(Sone sone, Album parent) {
-		Album album = database.newAlbumBuilder().randomId().build();
+		Album album = database.newAlbumBuilder().randomId().by(sone).build();
 		database.storeAlbum(album);
-		album.setSone(sone);
 		parent.addAlbum(album);
 		return album;
 	}