X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=a6b4c96b03161aa314900323f7d0560c79d206fb;hb=ec06ae64c86f0b06bb0cf9f8b289e7907e81dffa;hp=1541066e927ab54836775aba379530316d19613b;hpb=fdc519da8a4d5c994c3b2233fc049e3be728bb76;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 1541066..a6b4c96 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -67,6 +67,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 +585,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 +595,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();
 	}
 
 	/**
@@ -1132,34 +1113,15 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		}
 
 		/* load post likes. */
-		Set<String> likedPostIds = new HashSet<String>();
-		while (true) {
-			String likedPostId = configuration.getStringValue(sonePrefix + "/Likes/Post/" + likedPostIds.size() + "/ID").getValue(null);
-			if (likedPostId == null) {
-				break;
-			}
-			likedPostIds.add(likedPostId);
-		}
+		Set<String> likedPostIds =
+				configurationSoneParser.parseLikedPostIds();
 
 		/* load reply likes. */
-		Set<String> likedReplyIds = new HashSet<String>();
-		while (true) {
-			String likedReplyId = configuration.getStringValue(sonePrefix + "/Likes/Reply/" + likedReplyIds.size() + "/ID").getValue(null);
-			if (likedReplyId == null) {
-				break;
-			}
-			likedReplyIds.add(likedReplyId);
-		}
+		Set<String> likedReplyIds =
+				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>();
@@ -1178,9 +1140,17 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				logger.log(Level.WARNING, "Invalid album found, aborting load!");
 				return;
 			}
-			Album album = getOrCreateAlbum(albumId).setSone(sone).modify().setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId).update();
+			Album album = database.newAlbumBuilder()
+					.withId(albumId)
+					.by(sone)
+					.build()
+					.modify()
+					.setTitle(albumTitle)
+					.setDescription(albumDescription)
+					.setAlbumImage(albumImageId)
+					.update();
 			if (albumParentId != null) {
-				Album parentAlbum = getAlbum(albumParentId, false);
+				Album parentAlbum = getAlbum(albumParentId);
 				if (parentAlbum == null) {
 					logger.log(Level.WARNING, String.format("Invalid parent album ID: %s", albumParentId));
 					return;
@@ -1212,7 +1182,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				logger.log(Level.WARNING, "Invalid image found, aborting load!");
 				return;
 			}
-			Album album = getAlbum(albumId, false);
+			Album album = getAlbum(albumId);
 			if (album == null) {
 				logger.log(Level.WARNING, "Invalid album image encountered, aborting load!");
 				return;
@@ -1463,9 +1433,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;
 	}