X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=699d5b77121ba8321d49c9f91e50991662e45198;hb=2c3e2e6f9f651cddf73912b0eaf21e13408642e3;hp=d61211d5b4001bd55486df923a0133a53aa1510b;hpb=33f333b35a73d3d4a4e79f41e9dd7b342db87b1a;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 d61211d..699d5b7 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -731,7 +731,6 @@ public class Core implements IdentityListener, UpdateListener {
 	}
 
 	/**
-	 * 	
 	 * Returns the album with the given ID, creating a new album if no album
 	 * with the given ID can be found.
 	 *
@@ -1435,6 +1434,30 @@ public class Core implements IdentityListener, UpdateListener {
 			}
 			configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
 
+			/* save albums. first, collect in a flat structure, top-level first. */
+			List<Album> albums = new ArrayList<Album>();
+			albums.addAll(sone.getAlbums());
+			int lastAlbumIndex = 0;
+			while (lastAlbumIndex < albums.size()) {
+				int previousAlbumCount = albums.size();
+				for (Album album : new ArrayList<Album>(albums.subList(lastAlbumIndex, albums.size()))) {
+					albums.addAll(album.getAlbums());
+				}
+				lastAlbumIndex = previousAlbumCount;
+			}
+
+			int albumCounter = 0;
+			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 + "/Description").setValue(album.getDescription());
+				configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent() == null ? null : album.getParent().getId());
+			}
+
+			/* save options. */
+			configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").setValue(sone.getOptions().getBooleanOption("AutoFollow").getReal());
+
 			configuration.save();
 			logger.log(Level.INFO, "Sone %s saved.", sone);
 		} catch (ConfigurationException ce1) {
@@ -1711,8 +1734,9 @@ public class Core implements IdentityListener, UpdateListener {
 		album.setSone(sone);
 		if (parent != null) {
 			parent.addAlbum(album);
+		} else {
+			sone.addAlbum(album);
 		}
-		sone.addAlbum(album);
 		return album;
 	}