X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=fd3b1d1a474eb297c757daaee7f03a8cc623b2fb;hb=58497297d2b9a18cd2877a226870acfe9e8837af;hp=0b9b08f8a47d0297b37e5a6f5cc577e6c31afb5c;hpb=9d32a0f70e14a764946ae29edcf07304f9e5f75e;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 0b9b08f..fd3b1d1 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;
@@ -378,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;
@@ -419,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;
@@ -642,40 +643,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		return newAlbum;
 	}
 
-	/**
-	 * Returns the image with the given ID, creating it if necessary.
-	 *
-	 * @param imageId
-	 *            The ID of the image
-	 * @return The image with the given ID
-	 */
-	public Image getImage(String imageId) {
-		return getImage(imageId, true);
-	}
-
-	/**
-	 * Returns the image with the given ID, optionally creating it if it does
-	 * not exist.
-	 *
-	 * @param imageId
-	 *            The ID of the image
-	 * @param create
-	 *            {@code true} to create an image if none exists with the given
-	 *            ID
-	 * @return The image with the given ID, or {@code null} if none exists and
-	 *         none was created
-	 */
-	public Image getImage(String imageId, boolean create) {
-		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;
+	public Optional<Image> getImage(String imageId) {
+		return database.getImage(imageId);
 	}
 
 	/**
@@ -1283,14 +1252,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				logger.log(Level.WARNING, "Invalid album image encountered, aborting load!");
 				return;
 			}
-			Image image = getImage(imageId).modify().setSone(sone).setCreationTime(creationTime).setKey(key).setTitle(title).setDescription(description).setWidth(width).setHeight(height).update();
-			album.addImage(image);
+			album.newImageBuilder().withId(imageId).by(sone).created(creationTime).at(key).sized(width, height).build().modify().setTitle(title).setDescription(description).update();
 		}
 
 		/* load avatar. */
 		String avatarId = configuration.getStringValue(sonePrefix + "/Profile/Avatar").getValue(null);
 		if (avatarId != null) {
-			profile.setAvatar(getImage(avatarId, false));
+			profile.setAvatar(getImage(avatarId).orNull());
 		}
 
 		/* load options. */
@@ -1638,8 +1606,7 @@ 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 = database.newImageBuilder().withId(temporaryImage.getId()).build().modify().setSone(sone).setCreationTime(System.currentTimeMillis()).update();
-		album.addImage(image);
+		Image image = album.newImageBuilder().withId(temporaryImage.getId()).by(sone).createdNow().sized(temporaryImage.getWidth(), temporaryImage.getHeight()).build();
 		database.storeImage(image);
 		imageInserter.insertImage(temporaryImage, image);
 		return image;
@@ -1671,9 +1638,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *            The encoded data of the image
 	 * @return The temporary image
 	 */
-	public TemporaryImage createTemporaryImage(String mimeType, byte[] imageData) {
-		TemporaryImage temporaryImage = new TemporaryImage();
-		temporaryImage.setMimeType(mimeType).setImageData(imageData);
+	public TemporaryImage createTemporaryImage(String mimeType, byte[] imageData, int width, int height) {
+		TemporaryImage temporaryImage = new TemporaryImage(mimeType, imageData, width, height);
 		synchronized (temporaryImages) {
 			temporaryImages.put(temporaryImage.getId(), temporaryImage);
 		}
@@ -1702,9 +1668,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		synchronized (temporaryImages) {
 			temporaryImages.remove(imageId);
 		}
-		Image image = getImage(imageId, false);
-		if (image != null) {
-			imageInserter.cancelImageInsert(image);
+		Optional<Image> image = getImage(imageId);
+		if (image.isPresent()) {
+			imageInserter.cancelImageInsert(image.get());
 		}
 	}