Process albums and images during rescue mode, too.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / Core.java

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index a59c96c..8aac5d7 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -1223,6 +1223,22 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
                                        }
                                }
                        }
+                       synchronized (albums) {
+                               synchronized (images) {
+                                       for (Album album : storedSone.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);
+                                               }
+                                       }
+                               }
+                       }
                        synchronized (storedSone) {
                                if (!soneRescueMode || (sone.getTime() > storedSone.getTime())) {
                                        storedSone.setTime(sone.getTime());
@@ -1242,6 +1258,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
                                        for (String likedReplyId : sone.getLikedReplyIds()) {
                                                storedSone.addLikedReplyId(likedReplyId);
                                        }
+                                       for (Album album : sone.getAlbums()) {
+                                               storedSone.addAlbum(album);
+                                       }
                                } else {
                                        storedSone.setPosts(sone.getPosts());
                                        storedSone.setReplies(sone.getReplies());
@@ -1435,11 +1454,12 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
                        String albumTitle = configuration.getStringValue(albumPrefix + "/Title").getValue(null);
                        String albumDescription = configuration.getStringValue(albumPrefix + "/Description").getValue(null);
                        String albumParentId = configuration.getStringValue(albumPrefix + "/Parent").getValue(null);
+                       String albumImageId = configuration.getStringValue(albumPrefix + "/AlbumImage").getValue(null);
                        if ((albumTitle == null) || (albumDescription == null)) {
                                logger.log(Level.WARNING, "Invalid album found, aborting load!");
                                return;
                        }
-                       Album album = getAlbum(albumId).setSone(sone).setTitle(albumTitle).setDescription(albumDescription);
+                       Album album = getAlbum(albumId).setSone(sone).setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId);
                        if (albumParentId != null) {
                                Album parentAlbum = getAlbum(albumParentId, false);
                                if (parentAlbum == null) {
@@ -2086,6 +2106,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
                                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 + "/AlbumImage").setValue(album.getAlbumImage() == null ? null : album.getAlbumImage().getId());
                        }
                        configuration.getStringValue(sonePrefix + "/Albums/" + albumCounter + "/ID").setValue(null);