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=1ec4d7b6f7482a1d5b3e1e943ccf6d656111d693;hpb=c2f9f5293a81bdf2606f56f3822779a4639a1356;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 1ec4d7b..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; @@ -187,9 +188,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, /** Trusted identities, sorted by own identities. */ private final Multimap trustedIdentities = Multimaps.synchronizedSetMultimap(HashMultimap.create()); - /** All known images. */ - private final Map images = new HashMap(); - /** All temporary images. */ private final Map temporaryImages = new HashMap(); @@ -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; @@ -645,38 +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) { - synchronized (images) { - Image image = images.get(imageId); - if (create && (image == null)) { - image = new Image(imageId); - images.put(imageId, image); - } - return image; - } + public Optional getImage(String imageId) { + return database.getImage(imageId); } /** @@ -1032,18 +1000,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) { @@ -1286,15 +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).setSone(sone).setCreationTime(creationTime).setKey(key); - image.setTitle(title).setDescription(description).setWidth(width).setHeight(height); - 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. */ @@ -1642,11 +1606,8 @@ 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()); - album.addImage(image); - synchronized (images) { - images.put(image.getId(), 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; } @@ -1664,9 +1625,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(); } @@ -1679,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); } @@ -1710,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 = getImage(imageId); + if (image.isPresent()) { + imageInserter.cancelImageInsert(image.get()); } } @@ -2223,7 +2181,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(); }