X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FConfigurationSoneParser.java;h=37e0ed52ea428de941426ab79a26b100785712a3;hb=d127c36ae1d62d93c718117506966ced68854d87;hp=3d384c1b5260cd3aba484cdb06052cd07101417f;hpb=f90d92147c4cff4abe4ae904c6e89d7382b5921e;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/core/ConfigurationSoneParser.java b/src/main/java/net/pterodactylus/sone/core/ConfigurationSoneParser.java index 3d384c1..37e0ed5 100644 --- a/src/main/java/net/pterodactylus/sone/core/ConfigurationSoneParser.java +++ b/src/main/java/net/pterodactylus/sone/core/ConfigurationSoneParser.java @@ -37,6 +37,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 +201,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 +211,6 @@ public class ConfigurationSoneParser { .modify() .setTitle(albumTitle) .setDescription(albumDescription) - .setAlbumImage(albumImageId) .update(); if (albumParentId != null) { Album parentAlbum = albums.get(albumParentId); @@ -270,9 +268,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) {