X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=06a1467b1364c8a353932927388c1f3cfa22e2c2;hp=699d5b77121ba8321d49c9f91e50991662e45198;hb=7dfc9c778882083632f916b178a241f06c2a08fe;hpb=2c3e2e6f9f651cddf73912b0eaf21e13408642e3

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 699d5b7..06a1467 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -1319,6 +1319,38 @@ public class Core implements IdentityListener, UpdateListener {
 			friends.add(friendId);
 		}
 
+		/* load albums. */
+		List<Album> topLevelAlbums = new ArrayList<Album>();
+		while (true) {
+			String albumPrefix = sonePrefix + "/Albums/" + albums.size();
+			String albumId = configuration.getStringValue(albumPrefix + "/ID").getValue(null);
+			if (albumId == null) {
+				break;
+			}
+			String albumTitle = configuration.getStringValue(albumPrefix + "/Title").getValue(null);
+			String albumDescription = configuration.getStringValue(albumPrefix + "/Description").getValue(null);
+			String albumParentId = configuration.getStringValue(albumPrefix + "/Parent").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);
+			if (albumParentId != null) {
+				Album parentAlbum = getAlbum(albumParentId, false);
+				if (parentAlbum == null) {
+					logger.log(Level.WARNING, "Invalid parent album ID: " + albumParentId);
+					return;
+				}
+				parentAlbum.addAlbum(album);
+			} else {
+				topLevelAlbums.add(album);
+			}
+		}
+
+		/* load options. */
+		sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption<Boolean>(false));
+		sone.getOptions().getBooleanOption("AutoFollow").set(configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").getValue(null));
+
 		/* if we’re still here, Sone was loaded successfully. */
 		synchronized (sone) {
 			sone.setTime(soneTime);
@@ -1328,6 +1360,7 @@ public class Core implements IdentityListener, UpdateListener {
 			sone.setLikePostIds(likedPostIds);
 			sone.setLikeReplyIds(likedReplyIds);
 			sone.setFriends(friends);
+			sone.setAlbums(topLevelAlbums);
 			soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
 		}
 		synchronized (newSones) {
@@ -1450,10 +1483,11 @@ public class Core implements IdentityListener, UpdateListener {
 			for (Album album : albums) {
 				String albumPrefix = sonePrefix + "/Albums/" + albumCounter++;
 				configuration.getStringValue(albumPrefix + "/ID").setValue(album.getId());
-				configuration.getStringValue(albumPrefix + "/Name").setValue(album.getName());
+				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(sonePrefix + "/Albums/" + albumCounter + "/ID").setValue(null);
 
 			/* save options. */
 			configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").setValue(sone.getOptions().getBooleanOption("AutoFollow").getReal());