🔥 Remove IMAGES from Album interface

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / data / Albums.kt

diff --git a/src/main/kotlin/net/pterodactylus/sone/data/Albums.kt b/src/main/kotlin/net/pterodactylus/sone/data/Albums.kt
index 0c79a84..a38e9dd 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/data/Albums.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/data/Albums.kt
@@ -20,4 +20,19 @@ package net.pterodactylus.sone.data
 /** Returns all images contained in this album and all its albums. */
 val Album.allImages: Collection<Image>
        get() =
-               images + albums.flatMap { it.allImages }
+               images + albums.flatMap(Album::allImages)
+
+/**
+ *  Returns this album and all albums contained in this album (recursively).
+ * A child album is always listed after its parent.
+ */
+val Album.allAlbums: List<Album>
+       get() =
+               listOf(this) + albums.flatMap(Album::allAlbums)
+
+@get:JvmName("notEmpty")
+val notEmpty: (Album) -> Boolean = { album ->
+       album.allImages.let { images ->
+               images.isNotEmpty() && images.any(Image::isInserted)
+       }
+}