X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FConfigurationSoneParser.java;h=aa387e924635f1bd9c9d8f88e61b704a31584d4d;hp=3d384c1b5260cd3aba484cdb06052cd07101417f;hb=62573c314957b1851f4fbe693b8746686caa940a;hpb=f90d92147c4cff4abe4ae904c6e89d7382b5921e
diff --git a/src/main/java/net/pterodactylus/sone/core/ConfigurationSoneParser.java b/src/main/java/net/pterodactylus/sone/core/ConfigurationSoneParser.java
index 3d384c1..aa387e9 100644
--- a/src/main/java/net/pterodactylus/sone/core/ConfigurationSoneParser.java
+++ b/src/main/java/net/pterodactylus/sone/core/ConfigurationSoneParser.java
@@ -27,8 +27,6 @@ import net.pterodactylus.util.config.Configuration;
/**
* Parses a {@link Sone}âs data from a {@link Configuration}.
- *
- * @author David âBombeâ Roden
*/
public class ConfigurationSoneParser {
@@ -37,6 +35,7 @@ public class ConfigurationSoneParser {
private final String sonePrefix;
private final Map albums = new HashMap();
private final List topLevelAlbums = new ArrayList();
+ private final Map images = new HashMap();
public ConfigurationSoneParser(Configuration configuration, Sone sone) {
this.configuration = configuration;
@@ -200,8 +199,6 @@ public class ConfigurationSoneParser {
String albumDescription =
getString(albumPrefix + "/Description", null);
String albumParentId = getString(albumPrefix + "/Parent", null);
- String albumImageId =
- getString(albumPrefix + "/AlbumImage", null);
if ((albumTitle == null) || (albumDescription == null)) {
throw new InvalidAlbumFound();
}
@@ -212,7 +209,6 @@ public class ConfigurationSoneParser {
.modify()
.setTitle(albumTitle)
.setDescription(albumDescription)
- .setAlbumImage(albumImageId)
.update();
if (albumParentId != null) {
Album parentAlbum = albums.get(albumParentId);
@@ -270,9 +266,14 @@ public class ConfigurationSoneParser {
.setHeight(height)
.update();
album.addImage(image);
+ images.put(image.getId(), image);
}
}
+ public Map getImages() {
+ return images;
+ }
+
private boolean albumAttributesAreInvalid(String albumId, String key,
String title, String description, Long creationTime,
Integer width, Integer height) {