X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=9beeac4df5deb5b667b72eb5e4e4eb95be217a94;hb=2b47186b72e30460a6710f95a76e4a99c305909a;hp=5fa330b175dec903f277559160d53b80fc4d23e2;hpb=d50ceb969ffc7187d48127c14f8cd22ba135b137;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 5fa330b..9beeac4 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -346,9 +346,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Override
 	public Collection<Sone> getSones() {
-		synchronized (sones) {
-			return ImmutableSet.copyOf(sones.values());
-		}
+		return database.getSones();
 	}
 
 	/**
@@ -362,9 +360,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Override
 	public Optional<Sone> getSone(String id) {
-		synchronized (sones) {
-			return Optional.fromNullable(sones.get(id));
-		}
+		return database.getSone(id);
 	}
 
 	/**
@@ -372,9 +368,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Override
 	public Collection<Sone> getLocalSones() {
-		synchronized (sones) {
-			return FluentIterable.from(sones.values()).filter(LOCAL_SONE_FILTER).toSet();
-		}
+		return database.getLocalSones();
 	}
 
 	/**
@@ -407,9 +401,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Override
 	public Collection<Sone> getRemoteSones() {
-		synchronized (sones) {
-			return FluentIterable.from(sones.values()).filter(not(LOCAL_SONE_FILTER)).toSet();
-		}
+		return database.getRemoteSones();
 	}
 
 	/**
@@ -728,7 +720,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			sone.setKnown(true);
 			/* TODO - load posts ’n stuff */
 			sones.put(ownIdentity.getId(), sone);
-			final SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, sone);
+			SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, ownIdentity.getId());
 			soneInserters.put(sone, soneInserter);
 			sone.setStatus(SoneStatus.idle);
 			loadSone(sone);
@@ -768,8 +760,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			logger.log(Level.WARNING, "Given Identity is null!");
 			return null;
 		}
-		final Long latestEdition = fromNullable(tryParse(
-				identity.getProperty("Sone.LatestEdition"))).or(0L);
+		final Long latestEdition = tryParse(fromNullable(
+				identity.getProperty("Sone.LatestEdition")).or("0"));
 		synchronized (sones) {
 			final Sone sone = getRemoteSone(identity.getId(), true);
 			if (sone.isLocal()) {
@@ -990,27 +982,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				}
 			});
 			soneChangeDetector.detectChanges(sone);
-			/* store posts. */
-			database.storePosts(sone, sone.getPosts());
-			database.storePostReplies(sone, sone.getReplies());
-			for (Album album : storedSone.get().getRootAlbum().getAlbums()) {
-				database.removeAlbum(album);
-				for (Image image : album.getImages()) {
-					database.removeImage(image);
-				}
-			}
-			for (Album album : toAllAlbums.apply(sone)) {
-				database.storeAlbum(album);
-				for (Image image : album.getImages()) {
-					database.storeImage(image);
-				}
-			}
+			database.storeSone(sone);
 			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.get(storedSone.get()).setSone(sone);
 					touchConfiguration();
 				}
 				sones.put(sone.getId(), sone);