X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=70478f34f3e112a55abe9337e5da70bd6a0cfd3b;hb=7df20dec7dcc9aa6d1aa657d24f273e1a82c60fc;hp=aa14edef2f2f128d9ae5067faaa675736281ac29;hpb=c2e868714435ac7c75d77d1911d0dfb00393d051;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java
index aa14ede..70478f3 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -21,13 +21,16 @@ 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 static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import javax.annotation.Nonnull;
import com.google.common.base.Function;
import com.google.common.base.Optional;
@@ -44,7 +47,7 @@ import com.google.common.hash.Hashing;
*
* @author David âBombeâ Roden
*/
-public class Album implements Fingerprintable {
+public class Album implements Identified, Fingerprintable {
/** Compares two {@link Album}s by {@link #getTitle()}. */
public static final Comparator TITLE_COMPARATOR = new Comparator() {
@@ -59,7 +62,11 @@ public class Album implements Fingerprintable {
public static final Function> FLATTENER = new Function>() {
@Override
+ @Nonnull
public List apply(Album album) {
+ if (album == null) {
+ return emptyList();
+ }
List albums = new ArrayList();
albums.add(album);
for (Album subAlbum : album.getAlbums()) {
@@ -73,8 +80,9 @@ public class Album implements Fingerprintable {
public static final Function> IMAGES = new Function>() {
@Override
+ @Nonnull
public List apply(Album album) {
- return album.getImages();
+ return (album != null) ? album.getImages() : Collections.emptyList();
}
};
@@ -86,11 +94,19 @@ public class Album implements Fingerprintable {
@Override
public boolean apply(Album album) {
+ /* so, we flatten all albums below the given one and check whether at least one album⦠*/
return FluentIterable.from(asList(album)).transformAndConcat(FLATTENER).anyMatch(new Predicate() {
@Override
public boolean apply(Album album) {
- return !album.getImages().isEmpty();
+ /* â¦contains any inserted images. */
+ return !album.getImages().isEmpty() && FluentIterable.from(album.getImages()).allMatch(new Predicate() {
+
+ @Override
+ public boolean apply(Image input) {
+ return input.isInserted();
+ }
+ });
}
});
}
@@ -400,6 +416,16 @@ public class Album implements Fingerprintable {
}
/**
+ * Returns whether this album is an identitiyâs root album.
+ *
+ * @return {@code true} if this album is an identityâs root album, {@code
+ * false} otherwise
+ */
+ public boolean isRoot() {
+ return parent == null;
+ }
+
+ /**
* Returns the parent album of this album.
*
* @return The parent album of this album, or {@code null} if this album