X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=0b9b08f8a47d0297b37e5a6f5cc577e6c31afb5c;hb=9d32a0f70e14a764946ae29edcf07304f9e5f75e;hp=7b4bc4badfd4962c53c57838660b0348b6c1350d;hpb=78da2db8d883349c8509a4f4794b844e2e6c6b31;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 7b4bc4b..0b9b08f 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -187,12 +187,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 albums. */ - private final Map albums = new HashMap(); - - /** All known images. */ - private final Map images = new HashMap(); - /** All temporary images. */ private final Map temporaryImages = new HashMap(); @@ -636,14 +630,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 = database.getAlbum(albumId); + if (album.isPresent()) { + return album.get(); } + if (!create) { + return null; + } + Album newAlbum = database.newAlbumBuilder().withId(albumId).build(); + database.storeAlbum(newAlbum); + return newAlbum; } /** @@ -670,14 +666,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 = 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; } /** @@ -1033,25 +1031,26 @@ 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()); - } - } - for (Album album : sone.getAlbums()) { - albums.put(album.getId(), album); - for (Image image : album.getImages()) { - images.put(image.getId(), image); - } - } + 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()) { + database.storeImage(image); } } 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); } } @@ -1245,7 +1244,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) { @@ -1284,8 +1283,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); } @@ -1314,7 +1312,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) { @@ -1579,7 +1582,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()); } /** @@ -1593,16 +1596,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); - } + Album album = database.newAlbumBuilder().randomId().build(); + database.storeAlbum(album); album.setSone(sone); - if (parent != null) { - parent.addAlbum(album); - } else { - sone.addAlbum(album); - } + parent.addAlbum(album); return album; } @@ -1619,14 +1616,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(); } @@ -1647,11 +1638,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; } @@ -1669,9 +1658,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(); } @@ -1878,7 +1865,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 albums = FluentIterable.from(sone.getAlbums()).transformAndConcat(Album.FLATTENER).toList(); + List albums = FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).toList(); int albumCounter = 0; for (Album album : albums) { @@ -1886,7 +1873,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); @@ -2228,7 +2215,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(); }