X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FDefaultAlbum.java;h=0006dc454558d0b12aae497ee4da1802fb6e696f;hb=115487bc44d755f1ae836bafc610fb49a04d9d02;hp=70fac0d9382d8d26a3411ba2c3e77f16364b9b95;hpb=20033c2725145859c3a4d8d75a3008b9fc099b3c;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java b/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java
index 70fac0d..0006dc4 100644
--- a/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/DefaultAlbum.java
@@ -1,5 +1,5 @@
/*
- * Sone - Album.java - Copyright © 2011â2013 David Roden
+ * Sone - MemoryAlbum.java - Copyright © 2013 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,86 +17,35 @@
package net.pterodactylus.sone.data.impl;
-import static com.google.common.base.Optional.absent;
-import static com.google.common.base.Optional.fromNullable;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.UUID;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.database.AlbumBuilder;
+import net.pterodactylus.sone.database.Database;
import net.pterodactylus.sone.database.ImageBuilder;
-import com.google.common.base.Function;
import com.google.common.base.Optional;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
-import com.google.common.hash.Hasher;
-import com.google.common.hash.Hashing;
/**
- * Container for images that can also contain nested {@link Album}s.
+ * TODO
*
* @author David âBombeâ Roden
*/
-public class DefaultAlbum implements Album {
+public class DefaultAlbum extends AbstractAlbum {
- /** The ID of this album. */
- private final String id;
+ private final Database database;
+ private final Sone sone; /* TODO - only store sone ID. */
+ private final String parentId;
- /** The Sone this album belongs to. */
- private Sone sone;
-
- /** Nested albums. */
- private final List albums = new ArrayList();
-
- /** The image IDs in order. */
- private final List imageIds = new ArrayList();
-
- /** The images in this album. */
- private final Map images = new HashMap();
-
- /** The parent album. */
- private Album parent;
-
- /** The title of this album. */
- private String title;
-
- /** The description of this album. */
- private String description;
-
- /** The ID of the album picture. */
- private String albumImage;
-
- /** Creates a new album with a random ID. */
- public DefaultAlbum() {
- this(UUID.randomUUID().toString());
- }
-
- /**
- * Creates a new album with the given ID.
- *
- * @param id
- * The ID of the album
- */
- public DefaultAlbum(String id) {
- this.id = checkNotNull(id, "id must not be null");
- }
-
- //
- // ACCESSORS
- //
-
- @Override
- public String getId() {
- return id;
+ protected DefaultAlbum(Database database, String id, Sone sone, String parentId) {
+ super(id);
+ this.database = database;
+ this.sone = sone;
+ this.parentId = parentId;
}
@Override
@@ -105,279 +54,74 @@ public class DefaultAlbum implements Album {
}
@Override
- public Album setSone(Sone sone) {
- checkNotNull(sone, "sone must not be null");
- checkState((this.sone == null) || (this.sone.equals(sone)), "album owner must not already be set to some other Sone");
- this.sone = sone;
- return this;
- }
-
- @Override
public List getAlbums() {
- return new ArrayList(albums);
- }
-
- @Override
- public void addAlbum(Album album) {
- checkNotNull(album, "album must not be null");
- checkArgument(album.getSone().equals(sone), "album must belong to the same Sone as this album");
- album.setParent(this);
- if (!albums.contains(album)) {
- albums.add(album);
- }
- }
-
- @Override
- public void removeAlbum(Album album) {
- checkNotNull(album, "album must not be null");
- checkArgument(album.getSone().equals(sone), "album must belong this albumâs Sone");
- checkArgument(equals(album.getParent()), "album must belong to this album");
- albums.remove(album);
- album.removeParent();
- }
-
- @Override
- public Album moveAlbumUp(Album album) {
- checkNotNull(album, "album must not be null");
- checkArgument(album.getSone().equals(sone), "album must belong to the same Sone as this album");
- checkArgument(equals(album.getParent()), "album must belong to this album");
- int oldIndex = albums.indexOf(album);
- if (oldIndex <= 0) {
- return null;
- }
- albums.remove(oldIndex);
- albums.add(oldIndex - 1, album);
- return albums.get(oldIndex);
- }
-
- @Override
- public Album moveAlbumDown(Album album) {
- checkNotNull(album, "album must not be null");
- checkArgument(album.getSone().equals(sone), "album must belong to the same Sone as this album");
- checkArgument(equals(album.getParent()), "album must belong to this album");
- int oldIndex = albums.indexOf(album);
- if ((oldIndex < 0) || (oldIndex >= (albums.size() - 1))) {
- return null;
- }
- albums.remove(oldIndex);
- albums.add(oldIndex + 1, album);
- return albums.get(oldIndex);
+ return database.getAlbums(this);
}
@Override
public List getImages() {
- return new ArrayList(Collections2.filter(Collections2.transform(imageIds, new Function() {
-
- @Override
- @SuppressWarnings("synthetic-access")
- public Image apply(String imageId) {
- return images.get(imageId);
- }
- }), Predicates.notNull()));
- }
-
- @Override
- public void removeImage(Image image) {
- checkNotNull(image, "image must not be null");
- checkNotNull(image.getSone(), "image must have an owner");
- checkArgument(image.getSone().equals(sone), "image must belong to the same Sone as this album");
- imageIds.remove(image.getId());
- images.remove(image.getId());
- if (image.getId().equals(albumImage)) {
- if (images.isEmpty()) {
- albumImage = null;
- } else {
- albumImage = images.values().iterator().next().getId();
- }
- }
- }
-
- @Override
- public Image moveImageUp(Image image) {
- checkNotNull(image, "image must not be null");
- checkNotNull(image.getSone(), "image must have an owner");
- checkArgument(image.getSone().equals(sone), "image must belong to the same Sone as this album");
- checkArgument(image.getAlbum().equals(this), "image must belong to this album");
- int oldIndex = imageIds.indexOf(image.getId());
- if (oldIndex <= 0) {
- return null;
- }
- imageIds.remove(image.getId());
- imageIds.add(oldIndex - 1, image.getId());
- return images.get(imageIds.get(oldIndex));
- }
-
- @Override
- public Image moveImageDown(Image image) {
- checkNotNull(image, "image must not be null");
- checkNotNull(image.getSone(), "image must have an owner");
- checkArgument(image.getSone().equals(sone), "image must belong to the same Sone as this album");
- checkArgument(image.getAlbum().equals(this), "image must belong to this album");
- int oldIndex = imageIds.indexOf(image.getId());
- if ((oldIndex == -1) || (oldIndex >= (imageIds.size() - 1))) {
- return null;
- }
- imageIds.remove(image.getId());
- imageIds.add(oldIndex + 1, image.getId());
- return images.get(imageIds.get(oldIndex));
+ return database.getImages(this);
}
@Override
- public Image getAlbumImage() {
- if (albumImage == null) {
- return null;
- }
- return Optional.fromNullable(images.get(albumImage)).or(images.values().iterator().next());
- }
-
- @Override
- public boolean isEmpty() {
- return albums.isEmpty() && images.isEmpty();
- }
-
- @Override
- public boolean isRoot() {
- return parent == null;
+ public Optional getAlbumImage() {
+ return database.getImage(albumImage);
}
@Override
public Album getParent() {
- return parent;
- }
-
- @Override
- public Album setParent(Album parent) {
- this.parent = checkNotNull(parent, "parent must not be null");
- return this;
- }
-
- @Override
- public Album removeParent() {
- this.parent = null;
- return this;
+ return database.getAlbum(parentId).get();
}
@Override
- public String getTitle() {
- return title;
- }
-
- @Override
- public String getDescription() {
- return description;
- }
-
- @Override
- public ImageBuilder newImageBuilder() throws IllegalStateException {
- return new DefaultImageBuilder(this) {
+ public AlbumBuilder newAlbumBuilder() throws IllegalStateException {
+ return new AbstractAlbumBuilder() {
@Override
- public Image build() throws IllegalStateException {
- Image image = super.build();
- if (images.isEmpty() && (albumImage == null)) {
- albumImage = image.getId();
- }
- images.put(image.getId(), image);
- imageIds.add(image.getId());
- return image;
+ public Album build() throws IllegalStateException {
+ validate();
+ DefaultAlbum memoryAlbum = new DefaultAlbum(database, getId(), sone, DefaultAlbum.this.id);
+ database.storeAlbum(memoryAlbum);
+ return memoryAlbum;
}
};
}
@Override
- public Modifier modify() throws IllegalStateException {
- // TODO: reenable check for local Sones
- return new Modifier() {
- private Optional title = absent();
-
- private Optional description = absent();
-
- private Optional albumImage = absent();
-
- @Override
- public Modifier setTitle(String title) {
- this.title = fromNullable(title);
- return this;
- }
-
- @Override
- public Modifier setDescription(String description) {
- this.description = fromNullable(description);
- return this;
- }
-
- @Override
- public Modifier setAlbumImage(String imageId) {
- this.albumImage = fromNullable(imageId);
- return this;
- }
-
+ public ImageBuilder newImageBuilder() throws IllegalStateException {
+ return new AbstractImageBuilder() {
@Override
- public Album update() throws IllegalStateException {
- if (title.isPresent()) {
- DefaultAlbum.this.title = title.get();
+ public Image build(Optional imageCreated) throws IllegalStateException {
+ validate();
+ DefaultImage image = new DefaultImage(database, getId(), sone, DefaultAlbum.this.id, key, getCreationTime(), width, height);
+ database.storeImage(image);
+ if (imageCreated.isPresent()) {
+ imageCreated.get().imageCreated(image);
}
- if (description.isPresent()) {
- DefaultAlbum.this.description = description.get();
- }
- if (albumImage.isPresent()) {
- DefaultAlbum.this.albumImage = albumImage.get();
- }
- return DefaultAlbum.this;
+ return image;
}
};
}
- //
- // FINGERPRINTABLE METHODS
- //
-
@Override
- public String getFingerprint() {
- Hasher hash = Hashing.sha256().newHasher();
- hash.putString("Album(");
- hash.putString("ID(").putString(id).putString(")");
- hash.putString("Title(").putString(title).putString(")");
- hash.putString("Description(").putString(description).putString(")");
- if (albumImage != null) {
- hash.putString("AlbumImage(").putString(albumImage).putString(")");
- }
-
- /* add nested albums. */
- hash.putString("Albums(");
- for (Album album : albums) {
- hash.putString(album.getFingerprint());
- }
- hash.putString(")");
-
- /* add images. */
- hash.putString("Images(");
- for (Image image : getImages()) {
- if (image.isInserted()) {
- hash.putString(image.getFingerprint());
- }
- }
- hash.putString(")");
-
- hash.putString(")");
- return hash.hash().toString();
+ public void moveUp() {
+ database.moveUp(this);
}
- //
- // OBJECT METHODS
- //
-
@Override
- public int hashCode() {
- return id.hashCode();
+ public void moveDown() {
+ database.moveDown(this);
}
@Override
- public boolean equals(Object object) {
- if (!(object instanceof DefaultAlbum)) {
- return false;
+ public void remove() throws IllegalStateException {
+ checkState(!isRoot(), "can not remove root album");
+ for (Album album : getAlbums()) {
+ album.remove();
+ }
+ for (Image image : getImages()) {
+ image.remove();
}
- DefaultAlbum album = (DefaultAlbum) object;
- return id.equals(album.id);
+ database.removeAlbum(this);
}
}