X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=5dd1eb6b0fffcca41252392df309c88a54707567;hb=8d257d649b372ca1a240a8e26ce33205c7019d0d;hp=ec59c92f3eef4098c74d317775116de6f4506bdc;hpb=791ae7c17d02857541e10a5dd97af65f6f532056;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 ec59c92..5dd1eb6 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -38,6 +38,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostFound;
+import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostReplyFound;
 import net.pterodactylus.sone.core.Options.DefaultOption;
 import net.pterodactylus.sone.core.SoneInserter.SetInsertionDelay;
 import net.pterodactylus.sone.core.event.ImageInsertFinishedEvent;
@@ -1108,58 +1110,30 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		String lastInsertFingerprint = configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").getValue("");
 
 		/* load profile. */
-		Profile profile = parseProfileFromConfiguration(configuration, sone, sonePrefix);
+		ConfigurationSoneParser configurationSoneParser = new ConfigurationSoneParser(configuration, sone);
+		Profile profile = configurationSoneParser.parseProfile();
 
 		/* load posts. */
-		Set<Post> posts = new HashSet<Post>();
-		while (true) {
-			String postPrefix = sonePrefix + "/Posts/" + posts.size();
-			String postId = configuration.getStringValue(postPrefix + "/ID").getValue(null);
-			if (postId == null) {
-				break;
-			}
-			String postRecipientId = configuration.getStringValue(postPrefix + "/Recipient").getValue(null);
-			long postTime = configuration.getLongValue(postPrefix + "/Time").getValue((long) 0);
-			String postText = configuration.getStringValue(postPrefix + "/Text").getValue(null);
-			if ((postTime == 0) || (postText == null)) {
-				logger.log(Level.WARNING, "Invalid post found, aborting load!");
-				return;
-			}
-			PostBuilder postBuilder = postBuilder().withId(postId).from(sone.getId()).withTime(postTime).withText(postText);
-			if ((postRecipientId != null) && (postRecipientId.length() == 43)) {
-				postBuilder.to(postRecipientId);
-			}
-			posts.add(postBuilder.build());
+		Collection<Post> posts;
+		try {
+			posts = configurationSoneParser.parsePosts(database);
+		} catch (InvalidPostFound ipf) {
+			logger.log(Level.WARNING, "Invalid post found, aborting load!");
+			return;
 		}
 
 		/* load replies. */
-		Set<PostReply> replies = new HashSet<PostReply>();
-		while (true) {
-			String replyPrefix = sonePrefix + "/Replies/" + replies.size();
-			String replyId = configuration.getStringValue(replyPrefix + "/ID").getValue(null);
-			if (replyId == null) {
-				break;
-			}
-			String postId = configuration.getStringValue(replyPrefix + "/Post/ID").getValue(null);
-			long replyTime = configuration.getLongValue(replyPrefix + "/Time").getValue((long) 0);
-			String replyText = configuration.getStringValue(replyPrefix + "/Text").getValue(null);
-			if ((postId == null) || (replyTime == 0) || (replyText == null)) {
-				logger.log(Level.WARNING, "Invalid reply found, aborting load!");
-				return;
-			}
-			PostReplyBuilder postReplyBuilder = postReplyBuilder().withId(replyId).from(sone.getId()).to(postId).withTime(replyTime).withText(replyText);
-			replies.add(postReplyBuilder.build());
+		Collection<PostReply> replies;
+		try {
+			replies = configurationSoneParser.parsePostReplies(database);
+		} catch (InvalidPostReplyFound iprf) {
+			logger.log(Level.WARNING, "Invalid reply found, aborting load!");
+			return;
 		}
 
 		/* 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>();
@@ -1291,29 +1265,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		logger.info(String.format("Sone loaded successfully: %s", sone));
 	}
 
-	private static Profile parseProfileFromConfiguration(Configuration configuration, Sone sone, String sonePrefix) {
-		Profile profile = new Profile(sone);
-		profile.setFirstName(configuration.getStringValue(sonePrefix + "/Profile/FirstName").getValue(null));
-		profile.setMiddleName(configuration.getStringValue(sonePrefix + "/Profile/MiddleName").getValue(null));
-		profile.setLastName(configuration.getStringValue(sonePrefix + "/Profile/LastName").getValue(null));
-		profile.setBirthDay(configuration.getIntValue(sonePrefix + "/Profile/BirthDay").getValue(null));
-		profile.setBirthMonth(configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").getValue(null));
-		profile.setBirthYear(configuration.getIntValue(sonePrefix + "/Profile/BirthYear").getValue(null));
-
-		/* load profile fields. */
-		while (true) {
-			String fieldPrefix = sonePrefix + "/Profile/Fields/" + profile.getFields().size();
-			String fieldName = configuration.getStringValue(fieldPrefix + "/Name").getValue(null);
-			if (fieldName == null) {
-				break;
-			}
-			String fieldValue = configuration.getStringValue(fieldPrefix + "/Value").getValue("");
-			profile.addField(fieldName).setValue(fieldValue);
-		}
-
-		return profile;
-	}
-
 	/**
 	 * Creates a new post.
 	 *