X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=7e934106292f6018e276d329133ed0a3471e29c6;hp=0f0b6d3f2451b75232cab055d4af68f1a0da247f;hb=3d888e800617335535c1a4b2cbac3e02acfdde34;hpb=91c4f73f647aabe99e44bc3d2fadb4c494d3b621

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 0f0b6d3..7e93410 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -62,6 +62,7 @@ import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
+import net.pterodactylus.sone.data.SoneImpl;
 import net.pterodactylus.sone.data.TemporaryImage;
 import net.pterodactylus.sone.database.Database;
 import net.pterodactylus.sone.database.DatabaseException;
@@ -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 images. */
-	private final Map<String, Image> images = new HashMap<String, Image>();
-
 	/** All temporary images. */
 	private final Map<String, TemporaryImage> temporaryImages = new HashMap<String, TemporaryImage>();
 
@@ -381,11 +379,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		synchronized (sones) {
 			Sone sone = sones.get(id);
 			if ((sone == null) && create) {
-				sone = new Sone(id, true);
+				sone = new SoneImpl(id, true);
 				sones.put(id, sone);
 			}
 			if ((sone != null) && !sone.isLocal()) {
-				sone = new Sone(id, true);
+				sone = new SoneImpl(id, true);
 				sones.put(id, sone);
 			}
 			return sone;
@@ -422,7 +420,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		synchronized (sones) {
 			Sone sone = sones.get(id);
 			if ((sone == null) && create && (id != null) && (id.length() == 43)) {
-				sone = new Sone(id, false);
+				sone = new SoneImpl(id, false);
 				sones.put(id, sone);
 			}
 			return sone;
@@ -669,14 +667,16 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *         none was created
 	 */
 	public Image getImage(String imageId, boolean create) {
-		synchronized (images) {
-			Image image = images.get(imageId);
-			if (create && (image == null)) {
-				image = new Image(imageId);
-				images.put(imageId, image);
-			}
-			return image;
+		Optional<Image> image = database.getImage(imageId);
+		if (image.isPresent()) {
+			return image.get();
 		}
+		if (!create) {
+			return null;
+		}
+		Image newImage = database.newImageBuilder().withId(imageId).build();
+		database.storeImage(newImage);
+		return newImage;
 	}
 
 	/**
@@ -1032,18 +1032,16 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				}
 			}
 			database.storePostReplies(sone, sone.getReplies());
-			synchronized (images) {
-				for (Album album : storedSone.get().getRootAlbum().getAlbums()) {
-					database.removeAlbum(album);
-					for (Image image : album.getImages()) {
-						images.remove(image.getId());
-					}
+			for (Album album : storedSone.get().getRootAlbum().getAlbums()) {
+				database.removeAlbum(album);
+				for (Image image : album.getImages()) {
+					database.removeImage(image);
 				}
-				for (Album album : sone.getRootAlbum().getAlbums()) {
-					database.storeAlbum(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()) {
+					database.storeImage(image);
 				}
 			}
 			synchronized (sones) {
@@ -1247,7 +1245,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				logger.log(Level.WARNING, "Invalid album found, aborting load!");
 				return;
 			}
-			Album album = getAlbum(albumId).setSone(sone).setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId);
+			Album album = getAlbum(albumId).setSone(sone).modify().setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId).update();
 			if (albumParentId != null) {
 				Album parentAlbum = getAlbum(albumParentId, false);
 				if (parentAlbum == null) {
@@ -1286,8 +1284,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				logger.log(Level.WARNING, "Invalid album image encountered, aborting load!");
 				return;
 			}
-			Image image = getImage(imageId).setSone(sone).setCreationTime(creationTime).setKey(key);
-			image.setTitle(title).setDescription(description).setWidth(width).setHeight(height);
+			Image image = getImage(imageId).modify().setSone(sone).setCreationTime(creationTime).setKey(key).setTitle(title).setDescription(description).setWidth(width).setHeight(height).update();
 			album.addImage(image);
 		}
 
@@ -1642,11 +1639,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		checkNotNull(temporaryImage, "temporaryImage must not be null");
 		checkArgument(sone.isLocal(), "sone must be a local Sone");
 		checkArgument(sone.equals(album.getSone()), "album must belong to the given Sone");
-		Image image = new Image(temporaryImage.getId()).setSone(sone).setCreationTime(System.currentTimeMillis());
+		Image image = database.newImageBuilder().withId(temporaryImage.getId()).build().modify().setSone(sone).setCreationTime(System.currentTimeMillis()).update();
 		album.addImage(image);
-		synchronized (images) {
-			images.put(image.getId(), image);
-		}
+		database.storeImage(image);
 		imageInserter.insertImage(temporaryImage, image);
 		return image;
 	}
@@ -1664,9 +1659,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		checkArgument(image.getSone().isLocal(), "image must belong to a local Sone");
 		deleteTemporaryImage(image.getId());
 		image.getAlbum().removeImage(image);
-		synchronized (images) {
-			images.remove(image.getId());
-		}
+		database.removeImage(image);
 		touchConfiguration();
 	}
 
@@ -2223,7 +2216,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	@Subscribe
 	public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) {
 		logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", imageInsertFinishedEvent.image(), imageInsertFinishedEvent.resultingUri()));
-		imageInsertFinishedEvent.image().setKey(imageInsertFinishedEvent.resultingUri().toString());
+		imageInsertFinishedEvent.image().modify().setKey(imageInsertFinishedEvent.resultingUri().toString()).update();
 		deleteTemporaryImage(imageInsertFinishedEvent.image().getId());
 		touchConfiguration();
 	}