X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=8ce908b700aa8b4eb86a0bc81c1a645676200895;hb=3d6e9664c7f0eb1ff37111b7cbd1bfdca2798567;hp=5018b258b1305d3aa5e37ae323cd871249e89e20;hpb=4850adf910f409f122e3df9cd0be1d0dad9e19e5;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 5018b25..8ce908b 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -52,6 +52,7 @@ import net.pterodactylus.sone.core.event.SoneLockedEvent;
 import net.pterodactylus.sone.core.event.SoneRemovedEvent;
 import net.pterodactylus.sone.core.event.SoneUnlockedEvent;
 import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.AlbumImpl;
 import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
@@ -187,9 +188,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	/** Trusted identities, sorted by own identities. */
 	private final Multimap<OwnIdentity, Identity> trustedIdentities = Multimaps.synchronizedSetMultimap(HashMultimap.<OwnIdentity, Identity>create());
 
-	/** All known albums. */
-	private final Map<String, Album> albums = new HashMap<String, Album>();
-
 	/** All known images. */
 	private final Map<String, Image> images = new HashMap<String, Image>();
 
@@ -636,14 +634,16 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *         given ID exists and {@code create} is {@code false}
 	 */
 	public Album getAlbum(String albumId, boolean create) {
-		synchronized (albums) {
-			Album album = albums.get(albumId);
-			if (create && (album == null)) {
-				album = new Album(albumId);
-				albums.put(albumId, album);
-			}
-			return album;
+		Optional<Album> album = database.getAlbum(albumId);
+		if (album.isPresent()) {
+			return album.get();
+		}
+		if (!create) {
+			return null;
 		}
+		Album newAlbum = new AlbumImpl(albumId);
+		database.storeAlbum(newAlbum);
+		return newAlbum;
 	}
 
 	/**
@@ -1033,19 +1033,17 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				}
 			}
 			database.storePostReplies(sone, sone.getReplies());
-			synchronized (albums) {
-				synchronized (images) {
-					for (Album album : storedSone.get().getAlbums()) {
-						albums.remove(album.getId());
-						for (Image image : album.getImages()) {
-							images.remove(image.getId());
-						}
+			synchronized (images) {
+				for (Album album : storedSone.get().getRootAlbum().getAlbums()) {
+					database.removeAlbum(album);
+					for (Image image : album.getImages()) {
+						images.remove(image.getId());
 					}
-					for (Album album : sone.getAlbums()) {
-						albums.put(album.getId(), album);
-						for (Image image : album.getImages()) {
-							images.put(image.getId(), image);
-						}
+				}
+				for (Album album : sone.getRootAlbum().getAlbums()) {
+					database.storeAlbum(album);
+					for (Image image : album.getImages()) {
+						images.put(image.getId(), image);
 					}
 				}
 			}
@@ -1054,10 +1052,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				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();
+					soneInserters.get(storedSone.get()).setSone(sone);
 					touchConfiguration();
 				}
 				sones.put(sone.getId(), sone);
@@ -1322,7 +1317,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			for (String friendId : friends) {
 				followSone(sone, friendId);
 			}
-			sone.setAlbums(topLevelAlbums);
+			for (Album album : sone.getRootAlbum().getAlbums()) {
+				sone.getRootAlbum().removeAlbum(album);
+			}
+			for (Album album : topLevelAlbums) {
+				sone.getRootAlbum().addAlbum(album);
+			}
 			soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
 		}
 		synchronized (knownSones) {
@@ -1587,7 +1587,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return The new album
 	 */
 	public Album createAlbum(Sone sone) {
-		return createAlbum(sone, null);
+		return createAlbum(sone, sone.getRootAlbum());
 	}
 
 	/**
@@ -1601,16 +1601,10 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return The new album
 	 */
 	public Album createAlbum(Sone sone, Album parent) {
-		Album album = new Album();
-		synchronized (albums) {
-			albums.put(album.getId(), album);
-		}
+		AlbumImpl album = new AlbumImpl();
+		database.storeAlbum(album);
 		album.setSone(sone);
-		if (parent != null) {
-			parent.addAlbum(album);
-		} else {
-			sone.addAlbum(album);
-		}
+		parent.addAlbum(album);
 		return album;
 	}
 
@@ -1627,14 +1621,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		if (!album.isEmpty()) {
 			return;
 		}
-		if (album.getParent() == null) {
-			album.getSone().removeAlbum(album);
-		} else {
-			album.getParent().removeAlbum(album);
-		}
-		synchronized (albums) {
-			albums.remove(album.getId());
-		}
+		album.getParent().removeAlbum(album);
+		database.removeAlbum(album);
 		touchConfiguration();
 	}
 
@@ -1886,7 +1874,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
 
 			/* save albums. first, collect in a flat structure, top-level first. */
-			List<Album> albums = FluentIterable.from(sone.getAlbums()).transformAndConcat(Album.FLATTENER).toList();
+			List<Album> albums = FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).toList();
 
 			int albumCounter = 0;
 			for (Album album : albums) {
@@ -1894,7 +1882,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				configuration.getStringValue(albumPrefix + "/ID").setValue(album.getId());
 				configuration.getStringValue(albumPrefix + "/Title").setValue(album.getTitle());
 				configuration.getStringValue(albumPrefix + "/Description").setValue(album.getDescription());
-				configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent() == null ? null : album.getParent().getId());
+				configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent().equals(sone.getRootAlbum()) ? null : album.getParent().getId());
 				configuration.getStringValue(albumPrefix + "/AlbumImage").setValue(album.getAlbumImage() == null ? null : album.getAlbumImage().getId());
 			}
 			configuration.getStringValue(sonePrefix + "/Albums/" + albumCounter + "/ID").setValue(null);