X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=5018b258b1305d3aa5e37ae323cd871249e89e20;hb=4850adf910f409f122e3df9cd0be1d0dad9e19e5;hp=941a5981acbf667a15fe7830b676d871e1cbef14;hpb=20c1feec0d9b6856245473283d3aad1c00076005;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 941a598..5018b25 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -92,7 +92,6 @@ import net.pterodactylus.util.thread.NamedThreadFactory;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableSet;
@@ -335,7 +334,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	@Override
 	public Collection<Sone> getSones() {
 		synchronized (sones) {
-			return Collections.unmodifiableCollection(sones.values());
+			return ImmutableSet.copyOf(sones.values());
 		}
 	}
 
@@ -361,13 +360,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	@Override
 	public Collection<Sone> getLocalSones() {
 		synchronized (sones) {
-			return Collections2.filter(sones.values(), new Predicate<Sone>() {
+			return FluentIterable.from(sones.values()).filter(new Predicate<Sone>() {
 
 				@Override
 				public boolean apply(Sone sone) {
 					return sone.isLocal();
 				}
-			});
+			}).toSet();
 		}
 	}
 
@@ -402,13 +401,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	@Override
 	public Collection<Sone> getRemoteSones() {
 		synchronized (sones) {
-			return Collections2.filter(sones.values(), new Predicate<Sone>() {
+			return FluentIterable.from(sones.values()).filter(new Predicate<Sone>() {
 
 				@Override
 				public boolean apply(Sone sone) {
 					return !sone.isLocal();
 				}
-			});
+			}).toSet();
 		}
 	}
 
@@ -604,7 +603,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		synchronized (bookmarkedPosts) {
 			for (String bookmarkedPostId : bookmarkedPosts) {
 				Optional<Post> post = getPost(bookmarkedPostId);
-				if (!post.isPresent()) {
+				if (post.isPresent()) {
 					posts.add(post.get());
 				}
 			}
@@ -742,6 +741,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			logger.log(Level.WARNING, "Given OwnIdentity is null!");
 			return null;
 		}
+		logger.info(String.format("Adding Sone from OwnIdentity: %s", ownIdentity));
 		synchronized (sones) {
 			final Sone sone;
 			try {
@@ -802,7 +802,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			return null;
 		}
 		synchronized (sones) {
-			final Sone sone = getRemoteSone(identity.getId(), true).setIdentity(identity);
+			final Sone sone = getRemoteSone(identity.getId(), true);
+			if (sone.isLocal()) {
+				return sone;
+			}
+			sone.setIdentity(identity);
 			boolean newSone = sone.getRequestUri() == null;
 			sone.setRequestUri(SoneUri.create(identity.getRequestUri()));
 			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
@@ -1047,6 +1051,15 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			}
 			synchronized (sones) {
 				sone.setOptions(storedSone.get().getOptions());
+				sone.setKnown(storedSone.get().isKnown());
+				sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
+				if (sone.isLocal()) {
+					soneInserters.remove(storedSone.get()).stop();
+					SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, sone);
+					soneInserters.put(sone, soneInserter);
+					soneInserter.start();
+					touchConfiguration();
+				}
 				sones.put(sone.getId(), sone);
 			}
 		}
@@ -1113,6 +1126,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			logger.log(Level.FINE, String.format("Tried to load non-local Sone: %s", sone));
 			return;
 		}
+		logger.info(String.format("Loading local Sone: %s", sone));
 
 		/* initialize options. */
 		sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption<Boolean>(false));
@@ -1324,6 +1338,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		for (PostReply reply : replies) {
 			reply.setKnown(true);
 		}
+
+		logger.info(String.format("Sone loaded successfully: %s", sone));
 	}
 
 	/**
@@ -2157,6 +2173,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			@SuppressWarnings("synthetic-access")
 			public void run() {
 				Sone sone = getRemoteSone(identity.getId(), false);
+				if (sone.isLocal()) {
+					return;
+				}
 				sone.setIdentity(identity);
 				sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.getLatestEdition()));
 				soneDownloader.addSone(sone);