X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=87add90bf26568d0b54020cd6cb433d47dd2b5cb;hb=11f3457415c9122b5d11840d24186971af28add9;hp=5564c37f22510157db5f22cf57cb3ed01c865058;hpb=045fc6957de36dc6c35af39fe79c559b6cec62d1;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 5564c37..87add90 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -38,6 +38,7 @@ 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.Options.DefaultOption;
 import net.pterodactylus.sone.core.SoneInserter.SetInsertionDelay;
 import net.pterodactylus.sone.core.event.ImageInsertFinishedEvent;
@@ -1108,45 +1109,16 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		String lastInsertFingerprint = configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").getValue("");
 
 		/* load profile. */
-		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);
-		}
+		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. */