X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=68cf4b2ae731817131f50ee43d435bc457dd0f30;hb=2ef163831826acdb2113f04278d90fa0a60d3f8e;hp=da9bd830c0d58717fb0f9a526aa85bf9bc7a8ea7;hpb=9fea8628dd505e8dafa09c2dd995e43b7199a892;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 da9bd83..68cf4b2 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -27,6 +27,7 @@ import static java.util.logging.Logger.getLogger;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -98,6 +99,7 @@ import net.pterodactylus.util.thread.NamedThreadFactory;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -154,6 +156,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	/** The trust updater. */
 	private final WebOfTrustUpdater webOfTrustUpdater;
 
+	private final Set<CompatibilityMode> compatibilityModes = EnumSet.noneOf(CompatibilityMode.class);
+
 	/** The times Sones were followed. */
 	private final Map<String, Long> soneFollowingTimes = new HashMap<String, Long>();
 
@@ -273,6 +277,18 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		return updateChecker;
 	}
 
+	public boolean isCompatibilityMode(CompatibilityMode compatibilityMode) {
+		return compatibilityModes.contains(compatibilityMode);
+	}
+
+	public void setCompatibilityMode(CompatibilityMode compatibilityMode) {
+		compatibilityModes.add(compatibilityMode);
+	}
+
+	public void clearCompatibilityMod(CompatibilityMode compatibilityMode) {
+		compatibilityModes.remove(compatibilityMode);
+	}
+
 	/**
 	 * Returns the Sone rescuer for the given local Sone.
 	 *
@@ -420,8 +436,17 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Optional<Post> getPost(String postId) {
-		return database.getPost(postId);
+	public Optional<Post> getPost(final String postId) {
+		Optional<Post> post = database.getPost(postId);
+		if (post.isPresent() || !isCompatibilityMode(CompatibilityMode.oldElementIds)) {
+			return post;
+		}
+		return FluentIterable.from(getSones()).transformAndConcat(Sone.toAllPosts).filter(new Predicate<Post>() {
+			@Override
+			public boolean apply(Post input) {
+				return (input != null) && input.getInternalId().equals(postId);
+			}
+		}).first();
 	}
 
 	/**
@@ -651,6 +676,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			soneInserters.put(sone, soneInserter);
 		}
 		loadSone(sone);
+		database.storeSone(sone);
 		sone.setStatus(SoneStatus.idle);
 		soneInserter.start();
 		return sone;
@@ -687,8 +713,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			logger.log(Level.WARNING, "Given Identity is null!");
 			return null;
 		}
-		final Long latestEdition = tryParse(fromNullable(
-				identity.getProperty("Sone.LatestEdition")).or("0"));
+		String property = fromNullable(identity.getProperty("Sone.LatestEdition")).or("0");
+		long latestEdition = fromNullable(tryParse(property)).or(0L);
 		Optional<Sone> existingSone = getSone(identity.getId());
 		if (existingSone.isPresent() && existingSone.get().isLocal()) {
 			return existingSone.get();
@@ -1085,7 +1111,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			for (Album album : topLevelAlbums) {
 				sone.getRootAlbum().addAlbum(album);
 			}
-			database.storeSone(sone);
 			synchronized (soneInserters) {
 				soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
 			}
@@ -1476,7 +1501,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			int postCounter = 0;
 			for (Post post : sone.getPosts()) {
 				String postPrefix = sonePrefix + "/Posts/" + postCounter++;
-				configuration.getStringValue(postPrefix + "/ID").setValue(post.getId());
+				configuration.getStringValue(postPrefix + "/ID").setValue(post.getInternalId());
 				configuration.getStringValue(postPrefix + "/Recipient").setValue(post.getRecipientId().orNull());
 				configuration.getLongValue(postPrefix + "/Time").setValue(post.getTime());
 				configuration.getStringValue(postPrefix + "/Text").setValue(post.getText());
@@ -1487,7 +1512,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			int replyCounter = 0;
 			for (PostReply reply : sone.getReplies()) {
 				String replyPrefix = sonePrefix + "/Replies/" + replyCounter++;
-				configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId());
+				configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getInternalId());
 				configuration.getStringValue(replyPrefix + "/Post/ID").setValue(reply.getPostId());
 				configuration.getLongValue(replyPrefix + "/Time").setValue(reply.getTime());
 				configuration.getStringValue(replyPrefix + "/Text").setValue(reply.getText());
@@ -1514,7 +1539,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			int albumCounter = 0;
 			for (Album album : albums) {
 				String albumPrefix = sonePrefix + "/Albums/" + albumCounter++;
-				configuration.getStringValue(albumPrefix + "/ID").setValue(album.getId());
+				configuration.getStringValue(albumPrefix + "/ID").setValue(album.getInternalId());
 				configuration.getStringValue(albumPrefix + "/Title").setValue(album.getTitle());
 				configuration.getStringValue(albumPrefix + "/Description").setValue(album.getDescription());
 				configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent().equals(sone.getRootAlbum()) ? null : album.getParent().getId());
@@ -1530,8 +1555,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 						continue;
 					}
 					String imagePrefix = sonePrefix + "/Images/" + imageCounter++;
-					configuration.getStringValue(imagePrefix + "/ID").setValue(image.getId());
-					configuration.getStringValue(imagePrefix + "/Album").setValue(album.getId());
+					configuration.getStringValue(imagePrefix + "/ID").setValue(image.getInternalId());
+					configuration.getStringValue(imagePrefix + "/Album").setValue(album.getInternalId());
 					configuration.getStringValue(imagePrefix + "/Key").setValue(image.getKey());
 					configuration.getStringValue(imagePrefix + "/Title").setValue(image.getTitle());
 					configuration.getStringValue(imagePrefix + "/Description").setValue(image.getDescription());