X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=c27e8cc46bbdb7b0e2ab4a5f072639b31689744d;hp=166591f16be52ba5ff48dccac99703c7bbef4d8a;hb=2b47186b72e30460a6710f95a76e4a99c305909a;hpb=1deeb8285b1347baa98994b10322b548fd71a449

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index 166591f..c27e8cc 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -23,17 +23,22 @@ import static net.pterodactylus.sone.data.Album.FLATTENER;
 import static net.pterodactylus.sone.data.Album.IMAGES;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 
-import net.pterodactylus.sone.core.Options;
+import javax.annotation.Nonnegative;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.sone.template.SoneAccessor;
 
 import freenet.keys.FreenetURI;
 
+import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.primitives.Ints;
 
@@ -167,6 +172,34 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 		}
 	};
 
+	public static final Function<Sone, String> toSoneXmlUri =
+			new Function<Sone, String>() {
+				@Nonnull
+				@Override
+				public String apply(@Nullable Sone input) {
+					return input.getRequestUri()
+							.setMetaString(new String[] { "sone.xml" })
+							.toString();
+				}
+			};
+
+	public static final Function<Sone, List<Album>> toAllAlbums = new Function<Sone, List<Album>>() {
+		@Override
+		public List<Album> apply(@Nullable Sone sone) {
+			return (sone == null) ? Collections.<Album>emptyList() : FLATTENER.apply(
+					sone.getRootAlbum());
+		}
+	};
+
+	public static final Function<Sone, List<Image>> toAllImages = new Function<Sone, List<Image>>() {
+		@Override
+		public List<Image> apply(@Nullable Sone sone) {
+			return (sone == null) ? Collections.<Image>emptyList() :
+					from(FLATTENER.apply(sone.getRootAlbum()))
+							.transformAndConcat(IMAGES).toList();
+		}
+	};
+
 	/**
 	 * Returns the identity of this Sone.
 	 *
@@ -175,18 +208,6 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 	Identity getIdentity();
 
 	/**
-	 * Sets the identity of this Sone. The {@link Identity#getId() ID} of the
-	 * identity has to match this Sone’s {@link #getId()}.
-	 *
-	 * @param identity
-	 * 		The identity of this Sone
-	 * @return This Sone (for method chaining)
-	 * @throws IllegalArgumentException
-	 * 		if the ID of the identity does not match this Sone’s ID
-	 */
-	Sone setIdentity(Identity identity) throws IllegalArgumentException;
-
-	/**
 	 * Returns the name of this Sone.
 	 *
 	 * @return The name of this Sone
@@ -224,15 +245,6 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 	FreenetURI getInsertUri();
 
 	/**
-	 * Sets the insert URI of this Sone.
-	 *
-	 * @param insertUri
-	 * 		The insert URI of this Sone
-	 * @return This Sone (for method chaining)
-	 */
-	Sone setInsertUri(FreenetURI insertUri);
-
-	/**
 	 * Returns the latest edition of this Sone.
 	 *
 	 * @return The latest edition of this Sone
@@ -535,7 +547,7 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 	 *
 	 * @return The options of this Sone
 	 */
-	Options getOptions();
+	SoneOptions getOptions();
 
 	/**
 	 * Sets the options of this Sone.
@@ -544,6 +556,6 @@ public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
 	 * 		The options of this Sone
 	 */
 	/* TODO - remove this method again, maybe add an option provider */
-	void setOptions(Options options);
+	void setOptions(SoneOptions options);
 
 }